From d32560375bc734d6257d4d5aaf08b312806acdc6 Mon Sep 17 00:00:00 2001 From: Zikun Fan Date: Wed, 22 Apr 2020 01:46:51 +0800 Subject: [PATCH 1/2] upgrade to alpha.6 --- Cargo.lock | 1370 ++++++++++++++++--------------- cstrml/market/Cargo.toml | 12 +- cstrml/market/src/lib.rs | 2 + cstrml/staking/Cargo.toml | 28 +- cstrml/staking/src/inflation.rs | 2 +- cstrml/staking/src/lib.rs | 15 +- cstrml/staking/src/slashing.rs | 2 +- cstrml/tee/Cargo.toml | 16 +- cstrml/tee/src/lib.rs | 4 +- node/Cargo.toml | 41 +- node/build.rs | 8 +- node/src/chain_spec.rs | 149 ++-- node/src/command.rs | 58 +- node/src/main.rs | 13 +- node/src/service.rs | 62 +- primitives/Cargo.toml | 6 +- runtime/Cargo.toml | 64 +- runtime/src/lib.rs | 51 +- 18 files changed, 991 insertions(+), 912 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a384f50e..68a41f3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,7 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" dependencies = [ "block-cipher-trait", - "byteorder 1.3.4", + "byteorder", "opaque-debug", ] @@ -76,7 +76,7 @@ checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" dependencies = [ "approx", "num-complex", - "num-traits", + "num-traits 0.2.11", ] [[package]] @@ -121,7 +121,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" dependencies = [ - "num-traits", + "num-traits 0.2.11", ] [[package]] @@ -166,8 +166,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -214,14 +214,14 @@ dependencies = [ [[package]] name = "async-tls" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7" +checksum = "95fd83426b89b034bf4e9ceb9c533c2f2386b813fd3dcae0a425ec6f1837d78a" dependencies = [ "futures 0.3.4", - "rustls 0.16.0", + "rustls", "webpki", - "webpki-roots 0.17.0", + "webpki-roots 0.19.0", ] [[package]] @@ -261,9 +261,9 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118" +checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7" dependencies = [ "cc", "libc", @@ -275,15 +275,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder 1.3.4", -] - [[package]] name = "base64" version = "0.11.0" @@ -307,7 +298,7 @@ dependencies = [ "log", "peeking_take_while", "proc-macro2", - "quote", + "quote 1.0.3", "regex", "rustc-hash", "shlex", @@ -358,6 +349,28 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake2b_simd" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +dependencies = [ + "arrayref", + "arrayvec 0.5.1", + "constant_time_eq", +] + +[[package]] +name = "blake2s_simd" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" +dependencies = [ + "arrayref", + "arrayvec 0.5.1", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -366,7 +379,7 @@ checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ "block-padding", "byte-tools", - "byteorder 1.3.4", + "byteorder", "generic-array", ] @@ -398,15 +411,15 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "slab", ] [[package]] name = "bs58" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae" +checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" [[package]] name = "bstr" @@ -435,12 +448,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -[[package]] -name = "byteorder" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" - [[package]] name = "byteorder" version = "1.3.4" @@ -453,7 +460,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ - "byteorder 1.3.4", + "byteorder", "either", "iovec", ] @@ -510,7 +517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" dependencies = [ "num-integer", - "num-traits", + "num-traits 0.2.11", "time", ] @@ -703,7 +710,6 @@ dependencies = [ "sp-transaction-pool", "structopt", "substrate-build-script-utils", - "vergen", ] [[package]] @@ -725,6 +731,7 @@ dependencies = [ "pallet-finality-tracker", "pallet-grandpa", "pallet-im-online", + "pallet-indices", "pallet-randomness-collective-flip", "pallet-session", "pallet-staking-reward-curve", @@ -855,23 +862,13 @@ dependencies = [ "stream-cipher", ] -[[package]] -name = "cuckoofilter" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd43f7cfaffe0a386636a10baea2ee05cc50df3b77bea4a456c9572a939bf1f" -dependencies = [ - "byteorder 0.5.3", - "rand 0.3.23", -] - [[package]] name = "curve25519-dalek" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839" dependencies = [ - "byteorder 1.3.4", + "byteorder", "digest", "rand_core 0.5.1", "subtle 2.2.2", @@ -891,8 +888,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -910,7 +907,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ - "byteorder 1.3.4", + "byteorder", "quick-error", ] @@ -974,6 +971,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enum-primitive-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b90e520ec62c1864c8c78d637acbfe8baf5f63240f2fb8165b8325c07812dd" +dependencies = [ + "num-traits 0.1.43", + "quote 0.3.15", + "syn 0.11.11", +] + [[package]] name = "env_logger" version = "0.7.1" @@ -1055,8 +1063,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", "synstructure", ] @@ -1084,7 +1092,7 @@ dependencies = [ "futures 0.3.4", "futures-timer 2.0.2", "log", - "num-traits", + "num-traits 0.2.11", "parity-scale-codec", "parking_lot 0.9.0", ] @@ -1095,7 +1103,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32529fc42e86ec06e5047092082aab9ad459b070c5d2a76b14f4f5ce70bf2e84" dependencies = [ - "byteorder 1.3.4", + "byteorder", "rand 0.7.3", "rustc-hex", "static_assertions", @@ -1128,23 +1136,24 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fork-tree" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2b3ac9016db4aa757dcab0a52c6911e6c98820d29bc75092176b98e73582bb" +checksum = "40a4492b78f0aec7271d261e0f1025297012c7853c263e036d15790f9ca99e72" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712481345c6430a3a9a9369871d74e10c8afd64e5191b8d233f43aca5d9df955" +checksum = "4f2fc91a6a976ce87b105722d8d9cdc44d4cb03ad24493d34cbfb64bbaacb7ee" dependencies = [ "frame-support", "frame-system", "linregress", "parity-scale-codec", + "paste", "sp-api", "sp-io", "sp-runtime", @@ -1154,9 +1163,9 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2295259d727866604e46c9a24e1e4ba4b5800eb16932a04c3b1f266e122f9445" +checksum = "2941cd59682f596645d54b0e84c02e98f9be53a346841c720ead60cdbadb3463" dependencies = [ "frame-support", "frame-system", @@ -1168,9 +1177,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "11.0.0-alpha.5" +version = "11.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7083431304c527dea7559f6b262b186473f44d1c9819b7da74388d6487b2653f" +checksum = "8e5eaf1cd17755f099188d76995520a3179fedf0cb631264b8759dea0cd2e981" dependencies = [ "parity-scale-codec", "serde", @@ -1180,9 +1189,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390a1a495b50001f75a2f4fe0602734ce61890d7acbd6aa7ddce0b60d9145a82" +checksum = "a4058dce75ae1d45b469a8cbbe0c9dc3083e5546936b60e4647e73584e0f7ba7" dependencies = [ "bitmask", "frame-metadata", @@ -1205,45 +1214,45 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e509284ec2b06c24d28ba18fda0c21f6ad69545a3da5e9fcb7ba1817686ffa" +checksum = "eefa7eb42406f732f87f8331aaaa787a65abe0f5f681a59fac1737ba4e81d89e" dependencies = [ "frame-support-procedural-tools", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "frame-support-procedural-tools" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf920148acb725b9ac1a6238b57a010ba660ecae7cd125f4b146c4a7d43192d" +checksum = "0d0fce760be3b164dd44ba5826f6a504c485020f6813604d4c73b42b50797d71" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d277cb5e284309c165ac1cfd7e1077b0d66d4aa0a1043dd32329191b510c40" +checksum = "c453b69522957f835e3679e8a98a90a3859481423bf5a2c570397c416339dcf5" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "frame-system" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e525321245fb95648e49a22ab1e8a53abd86dcc71e0f9474a7945afe2d7f50" +checksum = "f9c97e7168ca4cd7b2358ca30da4c5aba4a2b9b5eef45df67ca85b3dd59069a5" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1394,8 +1403,8 @@ checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" dependencies = [ "proc-macro-hack", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -1440,7 +1449,6 @@ dependencies = [ "proc-macro-hack", "proc-macro-nested", "slab", - "tokio-io", ] [[package]] @@ -1540,7 +1548,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" dependencies = [ - "byteorder 1.3.4", + "byteorder", "bytes 0.4.12", "fnv", "futures 0.1.29", @@ -1567,7 +1575,7 @@ dependencies = [ "indexmap", "log", "slab", - "tokio 0.2.17", + "tokio 0.2.18", "tokio-util", ] @@ -1607,9 +1615,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e" +checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" dependencies = [ "libc", ] @@ -1751,9 +1759,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6081100e960d9d74734659ffc9cc91daf1c0fc7aceb8eaa94ee1a3f5046f2e" +checksum = "96816e1d921eca64d208a85aab4f7798455a8e34229ee5a88c935bdee1b78b14" dependencies = [ "bytes 0.5.4", "futures-channel", @@ -1768,7 +1776,7 @@ dependencies = [ "net2", "pin-project", "time", - "tokio 0.2.17", + "tokio 0.2.18", "tower-service", "want 0.3.0", ] @@ -1782,11 +1790,11 @@ dependencies = [ "bytes 0.5.4", "ct-logs", "futures-util", - "hyper 0.13.4", + "hyper 0.13.5", "log", - "rustls 0.17.0", + "rustls", "rustls-native-certs", - "tokio 0.2.17", + "tokio 0.2.18", "tokio-rustls", "webpki", ] @@ -1856,8 +1864,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -1881,6 +1889,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77" +[[package]] +name = "intervalier" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" +dependencies = [ + "futures 0.3.4", + "futures-timer 2.0.2", +] + [[package]] name = "iovec" version = "0.1.4" @@ -1931,9 +1949,9 @@ dependencies = [ [[package]] name = "jsonrpc-client-transports" -version = "14.0.5" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9ae166c4d1f702d297cd76d4b55758ace80272ffc6dbb139fdc1bf810de40b" +checksum = "2307a7e78cf969759e390a8a2151ea12e783849a45bb00aa871b468ba58ea79e" dependencies = [ "failure", "futures 0.1.29", @@ -1947,9 +1965,9 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "14.0.5" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3b688648f1ef5d5072229e2d672ecb92cbff7d1c79bcf3fd5898f3f3df0970" +checksum = "25525f6002338fb4debb5167a89a0b47f727a5a48418417545ad3429758b7fec" dependencies = [ "futures 0.1.29", "log", @@ -1960,9 +1978,9 @@ dependencies = [ [[package]] name = "jsonrpc-core-client" -version = "14.0.5" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080dc110be17701097df238fad3c816d4a478a1899dfbcf8ec8957dd40ec7304" +checksum = "87f9382e831a6d630c658df103aac3f971da096deb57c136ea2b760d3b4e3f9f" dependencies = [ "jsonrpc-client-transports", ] @@ -1975,42 +1993,42 @@ checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "jsonrpc-http-server" -version = "14.0.6" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816d63997ea45d3634608edbef83ddb35e661f7c0b27b5b72f237e321f0e9807" +checksum = "d52860f0549694aa4abb12766856f56952ab46d3fb9f0815131b2db3d9cc2f29" dependencies = [ "hyper 0.12.35", "jsonrpc-core", "jsonrpc-server-utils", "log", "net2", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "unicase", ] [[package]] name = "jsonrpc-pubsub" -version = "14.0.6" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b31c9b90731276fdd24d896f31bb10aecf2e5151733364ae81123186643d939" +checksum = "c4ca5e391d6c6a2261d4adca029f427fe63ea546ad6cef2957c654c08495ec16" dependencies = [ "jsonrpc-core", "log", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "serde", ] [[package]] name = "jsonrpc-server-utils" -version = "14.0.5" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22" +checksum = "1f06add502b48351e05dd95814835327fb115e4e9f834ca42fd522d3b769d4d2" dependencies = [ "bytes 0.4.12", "globset", @@ -2024,23 +2042,23 @@ dependencies = [ [[package]] name = "jsonrpc-ws-server" -version = "14.0.6" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94e5773b2ae66e0e02c80775ce6bbba6f15d5bb47c14ec36a36fcf94f8df851" +checksum = "017a7dd5083d9ed62c5e1dd3e317975c33c3115dac5447f4480fe05a8c354754" dependencies = [ "jsonrpc-core", "jsonrpc-server-utils", "log", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "slab", "ws", ] [[package]] name = "k256" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4407bc616f76afb6bccd8a813b86fe622752b15b43c5e60fec94d21af2393a72" +checksum = "0afa79ea8238df7a342756fbf971d4e3ba16f389eaaf730658f3e3f58cf47da4" dependencies = [ "elliptic-curve", ] @@ -2088,7 +2106,7 @@ checksum = "4aa954d12cfac958822dfd77aab34f3eec71f103b918c4ab79ab59a36ee594ea" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.10.0", + "parking_lot 0.10.2", ] [[package]] @@ -2104,7 +2122,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "regex", "rocksdb", "smallvec 1.3.0", @@ -2124,9 +2142,21 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" [[package]] name = "libc" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" +checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "libflate" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" +dependencies = [ + "adler32", + "crc32fast", + "rle-decode-fast", + "take_mut", +] [[package]] name = "libloading" @@ -2146,37 +2176,31 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.16.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba17ee9cac4bb89de5812159877d9b4f0a993bf41697a5a875940cd1eb71f24" +checksum = "32ea742c86405b659c358223a8f0f9f5a9eb27bb6083894c6340959b05269662" dependencies = [ "bytes 0.5.4", "futures 0.3.4", "lazy_static", "libp2p-core", "libp2p-core-derive", - "libp2p-deflate", "libp2p-dns", - "libp2p-floodsub", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-mdns", "libp2p-mplex", "libp2p-noise", "libp2p-ping", - "libp2p-plaintext", - "libp2p-pnet", "libp2p-secio", "libp2p-swarm", "libp2p-tcp", - "libp2p-uds", "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", - "parity-multiaddr", - "parity-multihash", - "parking_lot 0.10.0", + "multihash", + "parity-multiaddr 0.8.0", + "parking_lot 0.10.2", "pin-project", "smallvec 1.3.0", "wasm-timer", @@ -2184,23 +2208,24 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b874594c4b29de1a29f27871feba8e6cd13aa54a8a1e8f8c7cf3dfac5ca287c" +checksum = "a1d2c17158c4dca984a77a5927aac6f0862d7f50c013470a415f93be498b5739" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", + "either", "fnv", "futures 0.3.4", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", "log", + "multihash", "multistream-select", - "parity-multiaddr", - "parity-multihash", - "parking_lot 0.10.0", + "parity-multiaddr 0.8.0", + "parking_lot 0.10.2", "pin-project", "prost", "prost-build", @@ -2217,83 +2242,30 @@ dependencies = [ [[package]] name = "libp2p-core-derive" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d472e9d522f588805c77801de10b957be84e10f019ca5f869fa1825b15ea9b" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "libp2p-deflate" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e25004d4d9837b44b22c5f1a69be1724a5168fef6cff1716b5176a972c3aa62" +checksum = "329127858e4728db5ab60c33d5ae352a999325fdf190ed022ec7d3a4685ae2e6" dependencies = [ - "flate2", - "futures 0.3.4", - "libp2p-core", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "libp2p-dns" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99e552f9939b606eb4b59f7f64d9b01e3f96752f47e350fc3c5fc646ed3f649" -dependencies = [ - "futures 0.3.4", - "libp2p-core", - "log", -] - -[[package]] -name = "libp2p-floodsub" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3234f12e44f9a50351a9807b97fe7de11eb9ae4482370392ba10da6dc90722" -dependencies = [ - "cuckoofilter", - "fnv", - "futures 0.3.4", - "libp2p-core", - "libp2p-swarm", - "prost", - "prost-build", - "rand 0.7.3", - "smallvec 1.3.0", -] - -[[package]] -name = "libp2p-gossipsub" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d46cb3e0841bd951cbf4feae56cdc081e6347836a644fb260c3ec554149b4006" +checksum = "c0d0993481203d68e5ce2f787d033fb0cac6b850659ed6c784612db678977c71" dependencies = [ - "base64 0.11.0", - "byteorder 1.3.4", - "bytes 0.5.4", - "fnv", "futures 0.3.4", - "futures_codec", "libp2p-core", - "libp2p-swarm", "log", - "lru", - "prost", - "prost-build", - "rand 0.7.3", - "sha2", - "smallvec 1.3.0", - "unsigned-varint", - "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfeb935a9bd41263e4f3a24b988e9f4a044f3ae89ac284e83c17fe2f84e0d66b" +checksum = "a38ca3eb807789e26f41c82ca7cd2b3843c66c5587b8b5f709a2f421f3061414" dependencies = [ "futures 0.3.4", "libp2p-core", @@ -2307,9 +2279,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464dc8412978d40f0286be72ed9ab5e0e1386a4a06e7f174526739b5c3c1f041" +checksum = "a92cda1fb8149ea64d092a2b99d2bd7a2c309eee38ea322d02e4480bd6ee1759" dependencies = [ "arrayvec 0.5.1", "bytes 0.5.4", @@ -2320,7 +2292,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "parity-multihash", + "multihash", "prost", "prost-build", "rand 0.7.3", @@ -2334,9 +2306,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881fcfb360c2822db9f0e6bb6f89529621556ed9a8b038313414eda5107334de" +checksum = "41e908d2aaf8ff0ec6ad1f02fe1844fd777fb0b03a68a226423630750ab99471" dependencies = [ "async-std", "data-encoding", @@ -2356,9 +2328,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8507b37ad0eed275efcde67a023c3d85af6c80768b193845b9288e848e1af95" +checksum = "0832882b06619b2e81d74e71447753ea3c068164a0bca67847d272e856a04a02" dependencies = [ "bytes 0.5.4", "fnv", @@ -2366,15 +2338,15 @@ dependencies = [ "futures_codec", "libp2p-core", "log", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15a8a3d71f898beb6f854c8aae27aa1d198e0d1f2e49412261c2d90ef39675a" +checksum = "918e94a649e1139c24ee9f1f8c1f2adaba6d157b9471af787f2d9beac8c29c77" dependencies = [ "curve25519-dalek", "futures 0.3.4", @@ -2393,9 +2365,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d22f2f228b3a828dca1cb8aa9fa331e0bc9c36510cb2c1916956e20dc85e8c" +checksum = "f9bfbf87eebb492d040f9899c5c81c9738730465ac5e78d9b7a7d086d0f07230" dependencies = [ "futures 0.3.4", "libp2p-core", @@ -2406,43 +2378,11 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "libp2p-plaintext" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56126a204d7b3382bac163143ff4125a14570b3ba76ba979103d1ae1abed1923" -dependencies = [ - "bytes 0.5.4", - "futures 0.3.4", - "futures_codec", - "libp2p-core", - "log", - "prost", - "prost-build", - "rw-stream-sink", - "unsigned-varint", - "void", -] - -[[package]] -name = "libp2p-pnet" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b916938a8868f75180aeeffcc6a516a922d165e8fa2a90b57bad989d1ccbb57a" -dependencies = [ - "futures 0.3.4", - "log", - "pin-project", - "rand 0.7.3", - "salsa20", - "sha3", -] - [[package]] name = "libp2p-secio" -version = "0.16.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1219e9ecb4945d7331a05f5ffe96a1f6e28051bfa1223d4c60353c251de0354e" +checksum = "a7a0509a7e47245259954fef58b85b81bf4d29ae33a4365e38d718a866698774" dependencies = [ "aes-ctr", "ctr", @@ -2470,13 +2410,14 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "275471e7c0e88ae004660866cd54f603bd8bd1f4caef541a27f50dd8640c4d4c" +checksum = "44ab289ae44cc691da0a6fe96aefa43f26c86c6c7813998e203f6d80f1860f18" dependencies = [ "futures 0.3.4", "libp2p-core", "log", + "rand 0.7.3", "smallvec 1.3.0", "void", "wasm-timer", @@ -2484,9 +2425,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e80ad4e3535345f3d666554ce347d3100453775611c05c60786bf9a1747a10" +checksum = "b37ea44823d3ed223e4605da94b50177bc520f05ae2452286700549a32d81669" dependencies = [ "async-std", "futures 0.3.4", @@ -2497,23 +2438,11 @@ dependencies = [ "log", ] -[[package]] -name = "libp2p-uds" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d329564a43da9d0e055a5b938633c4a8ceab1f59cec133fbc4647917c07341" -dependencies = [ - "async-std", - "futures 0.3.4", - "libp2p-core", - "log", -] - [[package]] name = "libp2p-wasm-ext" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923581c055bc4b8c5f42d4ce5ef43e52fe5216f1ea4bc26476cb8a966ce6220b" +checksum = "e3ac7dbde0f88cad191dcdfd073b8bae28d01823e8ca313f117b6ecb914160c3" dependencies = [ "futures 0.3.4", "js-sys", @@ -2525,9 +2454,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5351ca9eea122081c1c0f9323164d2918cac29b5a6bfe5054d4ba8ec9447cf42" +checksum = "6874c9069ce93d899df9dc7b29f129c706b2a0fdc048f11d878935352b580190" dependencies = [ "async-tls", "bytes 0.5.4", @@ -2536,7 +2465,7 @@ dependencies = [ "libp2p-core", "log", "quicksink", - "rustls 0.16.0", + "rustls", "rw-stream-sink", "soketto", "url 2.1.1", @@ -2546,13 +2475,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dac30de24ccde0e67f363d71a125c587bbe6589503f664947e9b084b68a34f1" +checksum = "02f91aea50f6571e0bc6c058dc0e9b270afd41ec28dd94e9e4bf607e78b9ab87" dependencies = [ "futures 0.3.4", "libp2p-core", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "thiserror", "yamux", ] @@ -2625,9 +2554,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" +checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" dependencies = [ "scopeguard", ] @@ -2688,9 +2617,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58381b20ebe2c578e75dececd9da411414903415349548ccc46aac3209cdfbc" +checksum = "be512cb2ccb4ecbdca937fdd4a62ea5f09f8e7195466a85e4632b3d5bcce82e6" dependencies = [ "ahash", "hash-db", @@ -2710,7 +2639,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78" dependencies = [ - "byteorder 1.3.4", + "byteorder", "keccak", "rand_core 0.5.1", "zeroize", @@ -2779,6 +2708,21 @@ dependencies = [ "ws2_32-sys", ] +[[package]] +name = "multihash" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47fbc227f7e2b1cb701f95404579ecb2668abbdd3c7ef7a6cbb3cc0d3b236869" +dependencies = [ + "blake2b_simd", + "blake2s_simd", + "digest", + "sha-1", + "sha2", + "sha3", + "unsigned-varint", +] + [[package]] name = "multimap" version = "0.8.1" @@ -2787,15 +2731,15 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" [[package]] name = "multistream-select" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f938ffe420493e77c8b6cbcc3f282283f68fc889c5dcbc8e51668d5f3a01ad94" +checksum = "74cdcf7cfb3402881e15a1f95116cb033d69b33c83d481e1234777f5ef0c3d2c" dependencies = [ "bytes 0.5.4", - "futures 0.1.29", + "futures 0.3.4", "log", + "pin-project", "smallvec 1.3.0", - "tokio-io", "unsigned-varint", ] @@ -2811,7 +2755,7 @@ dependencies = [ "matrixmultiply", "num-complex", "num-rational", - "num-traits", + "num-traits 0.2.11", "rand 0.6.5", "typenum", ] @@ -2836,6 +2780,33 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "netstat2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29449d242064c48d3057a194b049a2bdcccadda16faa18a91468677b44e8d422" +dependencies = [ + "bitflags", + "byteorder", + "enum-primitive-derive", + "libc", + "num-traits 0.2.11", + "thiserror", +] + +[[package]] +name = "nix" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "void", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -2875,7 +2846,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.0", "num-integer", - "num-traits", + "num-traits 0.2.11", ] [[package]] @@ -2885,7 +2856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ "autocfg 1.0.0", - "num-traits", + "num-traits 0.2.11", ] [[package]] @@ -2895,7 +2866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" dependencies = [ "autocfg 1.0.0", - "num-traits", + "num-traits 0.2.11", ] [[package]] @@ -2907,7 +2878,16 @@ dependencies = [ "autocfg 1.0.0", "num-bigint", "num-integer", - "num-traits", + "num-traits 0.2.11", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.11", ] [[package]] @@ -2922,9 +2902,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ "hermit-abi", "libc", @@ -2990,9 +2970,9 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2211e5b3925151634f460c13c4db6a3a5cd34925f4603dd51e1dcebe1c4c3144" +checksum = "b64aa91fe50fd780435b8ae8b79a20a816e9387213b6983a4f6f4ee96be5d33a" dependencies = [ "frame-support", "frame-system", @@ -3009,9 +2989,9 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4fb04796937bc05f714d99fce4fc96ddbe173d76048688392ae742587f8425" +checksum = "dd47a7cd9fcec6380a05d7c862dce6ae938ecd5dea42d3f264371fa51293cb76" dependencies = [ "frame-support", "frame-system", @@ -3027,13 +3007,12 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1c20a4a47b4e1a8954fd2ef2c49f5040fcca21c8109efe45f75f82ae5f02e6" +checksum = "166dabc0bb0e4db44a4b0dd2489549d72a9549ec331a53028b7f5d19f12b2507" dependencies = [ "frame-support", "frame-system", - "hex-literal", "pallet-session", "pallet-timestamp", "parity-scale-codec", @@ -3050,9 +3029,9 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4190f97ea53bebe7a5ae2c089a43e72561d9166968d28d0911eed2cea878d5dd" +checksum = "b9ef08001886d3747220630337f7afbb8f1d7cbfacaa3a8a13317e1cb3e8e366" dependencies = [ "frame-benchmarking", "frame-support", @@ -3066,9 +3045,9 @@ dependencies = [ [[package]] name = "pallet-collective" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be65c5dfedc7faba7cc5092b8ec39c2d739f669fc839e9d294e796e2645a81c" +checksum = "74c02dc177c032c7198d5c3a31dfd27067312c9ff74a2ee227ba76aea6f3cb1d" dependencies = [ "frame-support", "frame-system", @@ -3082,9 +3061,9 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954b11ebb7de3f1ec5e23b37af4a2d1b7f04bc81b13cde2eb76abb4171300cfc" +checksum = "09d89d58fe723cc05bdfc5f237a51e275bf58dcafb493ad68211c27ecd8f1afd" dependencies = [ "frame-support", "frame-system", @@ -3099,9 +3078,9 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ede4c610644a485d9f78dfb4853a2b20efb752fe5ab0e75c78e239313304cb" +checksum = "6ed9f0fe5149552a1f1f26f4ed8999d692e0e209c54314c4f28a9bd8a1a1161d" dependencies = [ "frame-support", "frame-system", @@ -3118,9 +3097,9 @@ dependencies = [ [[package]] name = "pallet-im-online" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50d9c983a582eaa1c0997867cf960b691ed8ea7f999b5d5cf9c98290913dc34" +checksum = "37c4d45fa7cf88538da4b67db3e62985e7f8b3d2fe8258a34d8c55b2e680e787" dependencies = [ "frame-support", "frame-system", @@ -3136,11 +3115,28 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-indices" +version = "2.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d153675f7ac1d8490e2e7db46b376edee52936edfa082f4d29831e6a19470b2" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0901faf91fdec1afa1810bf6f07678482be066ba79fc9d80095360e2c53e2f03" +checksum = "1139a9bf489b947a677574ee8ade27c7b710ce25a07f1630b80c20af8f682f91" dependencies = [ "frame-support", "frame-system", @@ -3152,9 +3148,9 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c96ae32f6b03f10067ecd85eb1b686dff0217ac238bd93d2a0dd4460646b6c7" +checksum = "4fdeb41738a79d3247b2a7fd9ce8ae5a7d9e92ca2de198e006f891240c8dcacc" dependencies = [ "frame-support", "frame-system", @@ -3171,21 +3167,21 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075f077530137fd42832142273a28142b77fa0283723dc886c887ee55af472c3" +checksum = "4d486ea74ee0c3f4def382b499611785c38d2d11a5839c6751240d230b76d376" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "pallet-timestamp" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec68fe57dc24af2869f5447f406de1de4dc105b11fbab59ae94f580cd2787aa" +checksum = "4d9de9af5f5ed3377a6108eed436791bfe18bc3e4e2e416854d0074d31b1be00" dependencies = [ "frame-benchmarking", "frame-support", @@ -3201,9 +3197,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0384d314959975a758174982c17d88c021b227d6caf16c41e6810fd3dc39820f" +checksum = "54768f5959e0bef53218b91f289d6807c0786d93fb90a3c7e39ab7ff9f018f23" dependencies = [ "frame-support", "frame-system", @@ -3215,9 +3211,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac65e7676834aa6778e4a4dc476ee6838219f466d32eaa5e290ee39bb96c78c" +checksum = "7323ef565470b51bb79fc65d3c3a1bff0ecb317485acc66a64406309c25f1b77" dependencies = [ "frame-support", "parity-scale-codec", @@ -3235,7 +3231,7 @@ checksum = "f77055f9e81921a8cc7bebeb6cded3d128931d51f1e3dd6251f0770a6d431477" dependencies = [ "arrayref", "bs58", - "byteorder 1.3.4", + "byteorder", "data-encoding", "parity-multihash", "percent-encoding 2.1.0", @@ -3245,6 +3241,24 @@ dependencies = [ "url 2.1.1", ] +[[package]] +name = "parity-multiaddr" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db35e222f783ef4e6661873f6c165c4eb7b65e0c408349818517d5705c2d7d3" +dependencies = [ + "arrayref", + "bs58", + "byteorder", + "data-encoding", + "multihash", + "percent-encoding 2.1.0", + "serde", + "static_assertions", + "unsigned-varint", + "url 2.1.1", +] + [[package]] name = "parity-multihash" version = "0.2.3" @@ -3281,8 +3295,8 @@ checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -3293,9 +3307,9 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-util-mem" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e42755f26e5ea21a6a819d9e63cbd70713e9867a2b767ec2cc65ca7659532c5" +checksum = "2c6e2583649a3ca84894d1d71da249abcfda54d5aca24733d72ca10d0f02361c" dependencies = [ "cfg-if", "ethereum-types", @@ -3303,7 +3317,7 @@ dependencies = [ "impl-trait-for-tuples", "lru", "parity-util-mem-derive", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "primitive-types", "smallvec 1.3.0", "winapi 0.3.8", @@ -3316,7 +3330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.17", "synstructure", ] @@ -3339,12 +3353,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" +checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" dependencies = [ "lock_api", - "parking_lot_core 0.7.0", + "parking_lot_core 0.7.1", ] [[package]] @@ -3364,9 +3378,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" +checksum = "0e136c1904604defe99ce5fd71a28d473fa60a12255d511aa78a9ddf11237aeb" dependencies = [ "cfg-if", "cloudabi", @@ -3394,8 +3408,8 @@ checksum = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a" dependencies = [ "proc-macro-hack", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -3404,7 +3418,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" dependencies = [ - "byteorder 1.3.4", + "byteorder", "crypto-mac", ] @@ -3444,22 +3458,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7804a463a8d9572f13453c516a5faea534a2403d7ced2f0c7e100eeff072772c" +checksum = "6f6a7f5eee6292c559c793430c55c00aea9d3b3d1905e855806ca4d7253426a2" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385322a45f2ecf3410c68d2a549a4a2685e8051d0f278e39743ff4e451cb9b3f" +checksum = "8988430ce790d8682672117bc06dda364c0be32d3abd738234f19f3240bad99a" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -3480,6 +3494,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +[[package]] +name = "platforms" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" + [[package]] name = "ppv-lite86" version = "0.2.6" @@ -3516,8 +3536,8 @@ checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", "version_check", ] @@ -3528,8 +3548,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", "syn-mid", "version_check", ] @@ -3552,21 +3572,36 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" dependencies = [ - "unicode-xid", + "unicode-xid 0.2.0", +] + +[[package]] +name = "procfs" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe50036aa1b71e553a4a0c48ab7baabf8aa8c7a5a61aae06bf38c2eab7430475" +dependencies = [ + "bitflags", + "byteorder", + "chrono", + "hex", + "lazy_static", + "libc", + "libflate", ] [[package]] name = "prometheus" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5567486d5778e2c6455b1b90ff1c558f29e751fc018130fa182e15828e728af1" +checksum = "b0575e258dab62268e7236d7307caa38848acbda7ec7ab87bd9093791e999d20" dependencies = [ "cfg-if", "fnv", "lazy_static", "protobuf", - "quick-error", "spin", + "thiserror", ] [[package]] @@ -3606,8 +3641,8 @@ dependencies = [ "anyhow", "itertools", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -3622,9 +3657,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b869b619141004a542c9e585b40c1432e7b0d67a826f68cb5fa4c1ee9aff56" +checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" [[package]] name = "quick-error" @@ -3643,6 +3678,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + [[package]] name = "quote" version = "1.0.3" @@ -3888,9 +3929,9 @@ checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "regex" -version = "1.3.6" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" +checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" dependencies = [ "aho-corasick", "memchr", @@ -3928,6 +3969,12 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "rle-decode-fast" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" + [[package]] name = "rlp" version = "0.4.5" @@ -3984,26 +4031,13 @@ dependencies = [ "semver", ] -[[package]] -name = "rustls" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" -dependencies = [ - "base64 0.10.1", - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" dependencies = [ - "base64 0.11.0", + "base64", "log", "ring", "sct", @@ -4017,7 +4051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5" dependencies = [ "openssl-probe", - "rustls 0.17.0", + "rustls", "schannel", "security-framework", ] @@ -4048,31 +4082,11 @@ dependencies = [ "rustc_version", ] -[[package]] -name = "salsa20" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2324b0e8c3bb9a586a571fdb3136f70e7e2c748de00a78043f86e0cff91f91fe" -dependencies = [ - "byteorder 1.3.4", - "salsa20-core", - "stream-cipher", -] - -[[package]] -name = "salsa20-core" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe6cc1b9f5a5867853ade63099de70f042f7679e408d1ffe52821c9248e6e69" -dependencies = [ - "stream-cipher", -] - [[package]] name = "sc-authority-discovery" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1eaecb2b2fe821e346475a9271eacecdf7df1bd96599edaa83951a2c1f20a3" +checksum = "3a44583887b8da0707553f9a9c43f911b954b4da3c65cec2d2d17a6a608d0a98" dependencies = [ "bytes 0.5.4", "derive_more", @@ -4098,9 +4112,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19a4c2974771a4eeee60134001922a4aae9a8aa16058af440f7567d8b118c10" +checksum = "5eeea19615c22c30accd79ca751b7db8642a3a88572432624a88c6754b6c7d33" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -4121,9 +4135,9 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288d056ccb51111940a020cc4dda2b3ecd539ac680a20a7614b45b52615e1b62" +checksum = "bd7b45adef0526ef295a9b7da4af933322df7119385a78c2e96c99b5d54fcc35" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -4138,9 +4152,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2477e2a6eea2fbea0e7e6972e0e6cf3dc2e1f5f5c28cbeeed0928e1b1cc83f6d" +checksum = "7d37957c58cb0cf1fa9fe1187447d16e4708a7a0541ee2c1226b2536f4241742" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -4148,27 +4162,28 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", + "sp-chain-spec", "sp-core", "sp-runtime", ] [[package]] name = "sc-chain-spec-derive" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d9064a901dc1d4c6603e36f0e203b199dbe010b193ef59bf57f0de82d8009a" +checksum = "2703f02f31f53601ed0408df76939a2e1911ff64a146e7b15ed1be56193e91ba" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "sc-cli" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11afd1bf2f02ce51e3d0004035ca860f6b87b9880c9783f1be32d41ef9e0080f" +checksum = "46513d8e34913e19ffb8663ff211528f5590712c3c4e69bfa41ca748120a2001" dependencies = [ "ansi_term 0.12.1", "app_dirs", @@ -4182,6 +4197,7 @@ dependencies = [ "lazy_static", "log", "names", + "nix", "parity-util-mem", "regex", "rpassword", @@ -4198,17 +4214,19 @@ dependencies = [ "sp-panic-handler", "sp-runtime", "sp-state-machine", + "sp-utils", + "sp-version", "structopt", "substrate-prometheus-endpoint", "time", - "tokio 0.2.17", + "tokio 0.2.18", ] [[package]] name = "sc-client" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bc77d90c2647134251ed73494515106da17aeee66dd9f5ae067bfa061bb19c9" +checksum = "9908c438f8e60d07c97a7f1d4ea8c6d31a498f283373c533f2006c032b9a4971" dependencies = [ "derive_more", "fnv", @@ -4218,7 +4236,7 @@ dependencies = [ "kvdb", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-block-builder", "sc-client-api", "sc-executor", @@ -4234,6 +4252,7 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-trie", + "sp-utils", "sp-version", "substrate-prometheus-endpoint", "tracing", @@ -4241,9 +4260,9 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17aa33afbc6b4f8c64a17922dff034c7d430919fc0835319f6663c8f4deddc" +checksum = "b0a2271c80a792efffc4abfe9be8b87c9747721cfa4426f3b707283a431bbacd" dependencies = [ "derive_more", "fnv", @@ -4251,9 +4270,10 @@ dependencies = [ "hash-db", "hex-literal", "kvdb", + "lazy_static", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-executor", "sc-telemetry", "sp-api", @@ -4269,14 +4289,15 @@ dependencies = [ "sp-storage", "sp-transaction-pool", "sp-trie", + "sp-utils", "sp-version", ] [[package]] name = "sc-client-db" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2593615d3b8e2dd9942d333bc7f70c5736d539212c86969eae2edf4dbade0a" +checksum = "5b1ae5b4c8333cb751cd9bbc7ecf0eb1c55d4865fca6651066844febcec71618" dependencies = [ "hash-db", "kvdb", @@ -4286,8 +4307,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.10.0", - "rand 0.7.3", + "parking_lot 0.10.2", "sc-client", "sc-client-api", "sc-executor", @@ -4303,9 +4323,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e28524f494b2424f28324f5ebd32fb1ee1f470d280a250bd7a026695bbce59" +checksum = "48c656cb92d387f3c402118b44113de78c04d090a931638da29c8af4aeca1ca5" dependencies = [ "derive_more", "fork-tree", @@ -4315,9 +4335,9 @@ dependencies = [ "merlin", "num-bigint", "num-rational", - "num-traits", + "num-traits 0.2.11", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "pdqselect", "rand 0.7.3", "sc-client", @@ -4346,13 +4366,13 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d93feddc8bbed1f5c64370829612e99963fa38d117a87c83656cbb17f4462f" +checksum = "97ba501b3709df95d511377ad6e91d490678a7bcea73a359a3d2f72630793f4c" dependencies = [ "fork-tree", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-client-api", "sp-blockchain", "sp-runtime", @@ -4360,15 +4380,15 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e84cf67d0330f4ba843577475dddff55f2db0199d55c94a972640e44afcdce" +checksum = "7ec4ede5a5b469f5cc1ac9fd304c7683f1e57638e5d9f8f23df6a98758b9cc24" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-client-api", "sc-telemetry", "sp-api", @@ -4382,9 +4402,9 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fe6eab5d45198dd7bb81177755b183fe5fcaac53655a395ecf27983f653ede" +checksum = "54cd8315b774db6c11b8efb43686a68243e9a100b8f48d2f1b537a8d42925399" dependencies = [ "log", "sc-client-api", @@ -4397,9 +4417,9 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ab992ed677c0d18c30a5a13f7a03af29a59cc74501c60e2e45eb35dc9467e5" +checksum = "f238a411de5e1cfe3b104f287aad0a48e4a39d9157171b7761d91d6d4a76610a" dependencies = [ "derive_more", "lazy_static", @@ -4407,7 +4427,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-wasm", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-executor-common", "sc-executor-wasmi", "sp-core", @@ -4424,13 +4444,14 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859a874cc47a01fb44bd53b172773629abb2c0d155b4e6505c1ec438103ffe5b" +checksum = "549d94ce1316c168a72c26abf0bf3390ae76b1645030e2aac9ecf0542b04fa85" dependencies = [ "derive_more", "log", "parity-scale-codec", + "parity-wasm", "sp-allocator", "sp-core", "sp-runtime-interface", @@ -4441,13 +4462,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af5cb944a100efd2c117846b1f42da4e303c2a9e48d5231922315861775c558" +checksum = "0c7efc6978b59884e1593ec172fe5b1a909c980b0e495897c904da50616c3a7a" dependencies = [ "log", "parity-scale-codec", - "parity-wasm", "sc-executor-common", "sp-allocator", "sp-core", @@ -4458,9 +4478,9 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad8a1f0d03e8a7c3b1d8cd74050960365e347f739c131715f84f588dd051a4" +checksum = "8bcf9e6787b6b421c2152e3d876105dec0c4cfa9fdac6bca54bec404d79a8593" dependencies = [ "assert_matches", "finality-grandpa", @@ -4469,7 +4489,7 @@ dependencies = [ "futures-timer 3.0.2", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "pin-project", "rand 0.7.3", "sc-block-builder", @@ -4489,14 +4509,15 @@ dependencies = [ "sp-finality-tracker", "sp-inherents", "sp-runtime", + "sp-utils", "substrate-prometheus-endpoint", ] [[package]] name = "sc-informant" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b52d147f0dcb8de59e842418056cf3c166828567357cf2dd99040d52bf8a406" +checksum = "a03ec9890c64668809ac230921c504f18dc79bec75addf02da197b437d740dda" dependencies = [ "ansi_term 0.12.1", "futures 0.3.4", @@ -4512,13 +4533,13 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c17c8aa8cb9fa4aa710379dc4e119b848cd65fa0a4e2209b6c0f97ee7c2c8a" +checksum = "4fd2f3cb18368d58af4946e277b9e4bea605feb65872116130c1dd0905f341e3" dependencies = [ "derive_more", "hex", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "rand 0.7.3", "serde_json", "sp-application-crypto", @@ -4528,9 +4549,9 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df01faa65b22aca751910a417f5a6ea28cefd9d3349c17fbc2ad8b7f190d390" +checksum = "fda92d4930bd77f3d215504ce16a3715585d8fc7c3d7be3c6f6891ee841f5686" dependencies = [ "bitflags", "bytes 0.5.4", @@ -4542,6 +4563,7 @@ dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", "futures_codec", + "hex", "libp2p", "linked-hash-map", "linked_hash_set", @@ -4549,12 +4571,11 @@ dependencies = [ "lru", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "pin-project", "prost", "prost-build", "rand 0.7.3", - "rustc-hex", "sc-block-builder", "sc-client", "sc-client-api", @@ -4570,6 +4591,7 @@ dependencies = [ "sp-consensus-babe", "sp-core", "sp-runtime", + "sp-utils", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -4580,9 +4602,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb8906bfd2d54f84fad8aba2f4303cff30f5596e7d4b90f97008d5477ea9ce4" +checksum = "a61f954d0ce6279fe48df2d3d20d3e5589964d501509f85b323cb0fde37b1b90" dependencies = [ "futures 0.3.4", "futures-timer 3.0.2", @@ -4591,25 +4613,26 @@ dependencies = [ "lru", "sc-network", "sp-runtime", + "sp-utils", "wasm-timer", ] [[package]] name = "sc-offchain" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d375d60dc8b4b1ffc76508b4fae912dd4aad2105bc20a8377d67e132cd96b2" +checksum = "3544cf74f21323eac40c965a3ccda06d828875127e7966c0a05db9686460bf34" dependencies = [ "bytes 0.5.4", "fnv", "futures 0.3.4", "futures-timer 3.0.2", - "hyper 0.13.4", + "hyper 0.13.5", "hyper-rustls", "log", "num_cpus", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "rand 0.7.3", "sc-client-api", "sc-keystore", @@ -4618,27 +4641,29 @@ dependencies = [ "sp-core", "sp-offchain", "sp-runtime", + "sp-utils", "threadpool", ] [[package]] name = "sc-peerset" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61bec2c8ace0c65c0cbd306b57a81eff12c92686b2988066d0ac49570944095" +checksum = "17b85bec68c3c1b4495b6eabdf14d1c4140a6d569b61af9c4f721f23eae42ed7" dependencies = [ "futures 0.3.4", "libp2p", "log", "serde_json", + "sp-utils", "wasm-timer", ] [[package]] name = "sc-rpc" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b46516c3bce1ac3bf82001e71e1bf371881ab25bf90c8adefd39311089a34" +checksum = "86f8136a2d703b2f4aeb970707ec83d55ae584c3c0af7aa10b3bd93b227a6fd0" dependencies = [ "futures 0.3.4", "hash-db", @@ -4646,7 +4671,7 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-block-builder", "sc-client", "sc-client-api", @@ -4656,6 +4681,7 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", + "sp-chain-spec", "sp-core", "sp-offchain", "sp-rpc", @@ -4663,14 +4689,15 @@ dependencies = [ "sp-session", "sp-state-machine", "sp-transaction-pool", + "sp-utils", "sp-version", ] [[package]] name = "sc-rpc-api" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f413b451cfd4440787262b6ae642d1f3003dc368ebd02d9cfe55cd66dc2cb0d" +checksum = "0c681fed8a6aab250f1fbb0848dee73c199bbcf94dc03f27edb57d2c50f0cff3" dependencies = [ "derive_more", "futures 0.3.4", @@ -4680,9 +4707,10 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "serde", "serde_json", + "sp-chain-spec", "sp-core", "sp-rpc", "sp-runtime", @@ -4692,9 +4720,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab710c3b4687a868d86d238b17d33457d83a8d8a2e168c9e8d141724b3b7d45" +checksum = "29d090ab799eaf3e41f36cdd9c79c2f5d1b0eeefc5f3422bc273084badd7ff62" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -4708,9 +4736,9 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e93f1aa0656625fe1477d67cf2806a2880fd763e17495d680224e4600b33065" +checksum = "0b6863666dc415a261bb21dfe599403fb977720feb5bc6ebacf078f5f78c165b" dependencies = [ "derive_more", "exit-future", @@ -4720,10 +4748,12 @@ dependencies = [ "futures-timer 3.0.2", "lazy_static", "log", - "parity-multiaddr", + "netstat2", + "parity-multiaddr 0.7.3", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.10.0", + "parking_lot 0.10.2", + "procfs", "sc-chain-spec", "sc-client", "sc-client-api", @@ -4749,40 +4779,40 @@ dependencies = [ "sp-runtime", "sp-session", "sp-transaction-pool", + "sp-utils", "substrate-prometheus-endpoint", "sysinfo", - "target_info", "tracing", "wasm-timer", ] [[package]] name = "sc-state-db" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1db2344b4ebe75dfbaa2f658ee66db81648db3304dc9613c7cb28391861e283" +checksum = "f31877c85414ed8e19a480940d7ae340832e7616208072cb43982fdcdd176021" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-client-api", "sp-core", ] [[package]] name = "sc-telemetry" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f358814b6fe2f2c726f708870d98d07f10d6ebb7d06dcf7f8f2781a868d24eb2" +checksum = "fdaddc5a9aaeabbe68599ae2bfa4f247fa1617e8a119f4665884757052697035" dependencies = [ "bytes 0.5.4", "futures 0.3.4", "futures-timer 3.0.2", "libp2p", "log", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "pin-project", "rand 0.7.3", "serde", @@ -4796,13 +4826,13 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9621e030cf432e067cfce76369f80e766c2bb60cd13c7213e3c4aea1c11b92" +checksum = "75a0c0eecadf7c89b09e4e7290b301ffd8c3b30af4d1aa47d147f32f9d9e0b33" dependencies = [ "erased-serde", "log", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-telemetry", "serde", "serde_json", @@ -4812,38 +4842,39 @@ dependencies = [ [[package]] name = "sc-transaction-graph" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba2ba64a7fcdb70b747a3c6590f97c5f721100167629ae5d1617b5dff9072af" +checksum = "7b7f1ad6be774288fd73818271d3041442956a149a461de22f97f12210fdc776" dependencies = [ "derive_more", "futures 0.3.4", "linked-hash-map", "log", "parity-util-mem", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "serde", "sp-blockchain", "sp-core", "sp-runtime", "sp-transaction-pool", + "sp-utils", "wasm-timer", ] [[package]] name = "sc-transaction-pool" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f131fa840ee75820fef3e3658c81d6d13b1bfe086ef21aac53b9661ae6e11ce" +checksum = "ca9c7db165344a2d45dc1b7d0a52e1028198b25adba8406e05055f4c5e5626b8" dependencies = [ "derive_more", "futures 0.3.4", "futures-diagnose", - "futures-timer 2.0.2", + "intervalier", "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sc-client-api", "sc-transaction-graph", "sp-api", @@ -4851,6 +4882,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-transaction-pool", + "sp-utils", "wasm-timer", ] @@ -4958,8 +4990,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -5121,8 +5153,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -5164,7 +5196,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c9dab3f95c9ebdf3a88268c19af668f637a3c5039c2c56ff2d40b1b2d64a25b" dependencies = [ - "base64 0.11.0", + "base64", "bytes 0.5.4", "flate2", "futures 0.3.4", @@ -5180,9 +5212,9 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb6b190d2b48dcfc0641760ed0164df8ac8807a50afcb7c1da7641c8c13591b" +checksum = "6532c396c2d6727d9b0d3eee3edbcaf939e78a6ce944fa34c2b98d6a02a2485e" dependencies = [ "derive_more", "log", @@ -5193,9 +5225,9 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4312c5081652e14f9c87fe6f8c765bbe63ac0ae69daeba48c2e5f7e7b7b25b" +checksum = "f6a4df52a0c56d742fc75f4da486627c1b050be2ac87cc042c2c0246756f22d2" dependencies = [ "hash-db", "parity-scale-codec", @@ -5209,22 +5241,22 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a94ac1f228f99fb5279d7983f6bcde83bf1fe5824f9a56e5f7a81cc8a7069c" +checksum = "ff834a833fd8beda20cd588341cdae52336f02f60aa6f0a34d9fd4d91975b369" dependencies = [ "blake2-rfc", "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "sp-application-crypto" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed68f0c283a01b5a8c768965b160fb4aa0a637a7e1b5e0d1168cba2f2310b348" +checksum = "3e5dec618ed8ea85fd767358185a412440c02a0adce569c2aa92ee355550d678" dependencies = [ "parity-scale-codec", "serde", @@ -5235,13 +5267,14 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d1e32dfcd4c87069d6e48d7d4a873221a8c27161a0ef5ad6ff683b591e6f97" +checksum = "b413966b541aadf8725dddc29daeefa950f45b17208f33302890484c56009bd3" dependencies = [ "integer-sqrt", - "num-traits", + "num-traits 0.2.11", "parity-scale-codec", + "primitive-types", "serde", "sp-debug-derive", "sp-std", @@ -5249,9 +5282,9 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94643ef41d86b3e29c68df10116725556c80d6074cb33b17363ed30e5fbc4eb8" +checksum = "f1e7a0270f96bc92e333e139fdaf61eb3ae7cdcb4d26d4d028f6a0c6c766a715" dependencies = [ "parity-scale-codec", "sp-api", @@ -5262,9 +5295,9 @@ dependencies = [ [[package]] name = "sp-authorship" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eedf7f76374a18f539f23f6367933ee402137d5bc145f7cb4fd681bb3f7898b" +checksum = "8d686e832e745c3aa2d55e303d46ccd41d64c02916bb40c64cfbb7456840664d" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -5274,9 +5307,9 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb168416f8724c89877bfea4fece91087855760b6fc2957d982de5c168575b5" +checksum = "70049c389c66c4c9207149e2579ce6d752788dee8c596fbda76059f2ddde968f" dependencies = [ "parity-scale-codec", "sp-api", @@ -5287,26 +5320,36 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789cf456c266dfb7d26a08f590b6e4d7644121e0d7fc3a2cd01636e1d3cef512" +checksum = "3db268602314a0f3a028ef6073185a6a5e0b8e7703da306e72e8a1fcbd2a0c05" dependencies = [ "derive_more", "log", "lru", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sp-block-builder", "sp-consensus", "sp-runtime", "sp-state-machine", ] +[[package]] +name = "sp-chain-spec" +version = "2.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0d73d557c214577b64a396e54f337403e251339a6599387747ae3570a19bb27" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "sp-consensus" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece2291dcf8ee851df66ea0096a5301e18921e8208782ccf484694d4e50aae98" +checksum = "6a4eec34198eb14fc2ef129df522e28df5ce6aeea886369ef2eafaaec6bc4fc7" dependencies = [ "derive_more", "futures 0.3.4", @@ -5315,21 +5358,22 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "serde", "sp-core", "sp-inherents", "sp-runtime", "sp-state-machine", "sp-std", + "sp-utils", "sp-version", ] [[package]] name = "sp-consensus-babe" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3341004b1ed8ae1487dc28b5ba9e3ece95c23c318d427fa598bb0084630ea822" +checksum = "ac6108fbecddd95ce8151f09e8ecb0941b3eddcfeefb4c996f27a8a8b4827abd" dependencies = [ "parity-scale-codec", "sp-api", @@ -5344,9 +5388,9 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7749e59ef895203554a9fca6a5d24e49f079f44f2dddc9306fe50faae783f5a0" +checksum = "6ba3eef8ab960eb88307f1c4eda1c36dfd95dc933bd6a277d2e26a503a6e5a71" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -5357,13 +5401,13 @@ dependencies = [ [[package]] name = "sp-core" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7a2938aefa827fbf6dbf5c3e8eea5cc6dedafe97a28bbfb733258ee99c82c67" +checksum = "0589a2e394a3dcd5dfd258c5f5bf22e6d0f28ffbd5e6d3a09ad702a6dc1c0152" dependencies = [ "base58", "blake2-rfc", - "byteorder 1.3.4", + "byteorder", "ed25519-dalek", "futures 0.3.4", "hash-db", @@ -5373,14 +5417,13 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "num-traits", + "num-traits 0.2.11", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "primitive-types", "rand 0.7.3", "regex", - "rustc-hex", "schnorrkel", "serde", "sha2", @@ -5399,20 +5442,20 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "124f3ffa2d897139864715cc624811ca997ca92be8880229143c6dee801b5ab2" +checksum = "df968a922a9d3b3f65d37e91e30904876efce88d017d4448c4babc990a738134" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "sp-externalities" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3aa6665b2a1a9df50a5514597e96a7d08d69e0e7ff90d238380fb266e14622" +checksum = "b06b8ac80a03205205426ae9ef3200133a8ffab4f4f0eeecd3b858034f9e5b02" dependencies = [ "environmental", "sp-std", @@ -5421,9 +5464,9 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b4d96f0aa94da01d3110a20b54d8c35c419b193df6e9fa9127b2aa912afecb" +checksum = "9e7107d11f07fb400a0d71838225865e2bf27f79241751ef9ff1501980dd63b3" dependencies = [ "parity-scale-codec", "serde", @@ -5435,9 +5478,9 @@ dependencies = [ [[package]] name = "sp-finality-tracker" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be49e587e5667f747ca743ef468949535fae5640d26c236ac35e44abe595b15" +checksum = "a5f718fb1e75fd137b01b539a200cf5e3cd1e0f1d21dc55a03341d7e25c81624" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -5446,22 +5489,22 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5ea2312969d929d617f852f9728644b98591b503a641106ee444acea4394fc" +checksum = "a14f699ab5cac6c9e80197774f06a4aa38211cb8acdb8660e328775efa2599e1" dependencies = [ "derive_more", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "sp-core", "sp-std", ] [[package]] name = "sp-io" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ed12cd1b0eddf5250703fff43da9e76be6cce32c492b2e2a71b4f6d9a12f49" +checksum = "20758b1831f75d58c20ca735d34b96dc792ef8264bf4d4a8c476964d90a6aea7" dependencies = [ "hash-db", "libsecp256k1", @@ -5478,9 +5521,9 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efcad50ccf03fa69c14f1b4a48b14cbb8f17afbbb53b81c34f4e0b4a3101d82" +checksum = "9f71e65eb13d8a4d320d3785558ac8fc12f8b2bdbfc5268c0e8a5a143d68686e" dependencies = [ "lazy_static", "sp-core", @@ -5490,9 +5533,9 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272f17953e7e64092f12ee2cea98f516d32689027a572565b272107bf7bcbafa" +checksum = "6dfc02ea51f7abe7e8999658a8a41693426f14e66cff6cc5af989888289ad0fc" dependencies = [ "sp-api", "sp-runtime", @@ -5500,9 +5543,9 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643ae9f2dc119551342422394cdfa8bfe0a230d1adc9891fcb08cf15fdf0f703" +checksum = "ef909e5ea664bce0bca723baf352c75125e4ed017843240e91d718df4720e1e4" dependencies = [ "backtrace", "log", @@ -5510,20 +5553,34 @@ dependencies = [ [[package]] name = "sp-phragmen" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2f9adde68d24b9ef2db13a01a77532d806f377da4cce4341c043d7e8bb1cdb" +checksum = "2a152f2be5434451c7299c622f8f94943653e4b49e4e2ed586817448a79f86c7" dependencies = [ + "parity-scale-codec", "serde", + "sp-phragmen-compact", "sp-runtime", "sp-std", ] +[[package]] +name = "sp-phragmen-compact" +version = "2.0.0-dev.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71340d9a66d5e617b3bf00df5d56625c2d504f16f3f66614b5294a2ff49de0ba" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote 1.0.3", + "syn 1.0.17", +] + [[package]] name = "sp-rpc" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69c98a453e22bfab61ad6a1e71984a73ac4b42ac2203d997e1a390195ff4e1f5" +checksum = "9d29a58ef51317f96eec408b40c604ccfe8c7c3b9ecc2636e2a9c84a79fae53a" dependencies = [ "serde", "sp-core", @@ -5531,9 +5588,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2eb5d07f847c7420070d9dc28d810d405dc6316cd58f58548a41f0aeeca84e8" +checksum = "cb1f98caf8bb20c7d69ba3097f3283ebc615f4a33e79ae0ca5934364be5776ac" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -5553,9 +5610,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d25229ba01740b13368f743e866d8ee155826932c9f2c4390e4ceb7730df214" +checksum = "289491386162a8d867d219f4f4dd3a7c11181c8ee9957e41b8747b555a9f4433" dependencies = [ "parity-scale-codec", "primitive-types", @@ -5568,22 +5625,22 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1d9e32fa5db2f3dd89affbd3c97959432272c9e52e4e2610dad32dd4705784" +checksum = "609529717f6c9cdd5bb6329c4ca9ddb1d36f698bd1f5dd2bdf0e94c064d7cc5b" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] name = "sp-serializer" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91abe1611fb9ad68cc2be724580710c5824a256d6aa92d88b181cb0d4819f8d1" +checksum = "f7b306e15eb54af25aef9d752c22778da3fa115945e47bf047545be2847cf814" dependencies = [ "serde", "serde_json", @@ -5591,9 +5648,9 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8e48c0f293408a073609b7274a0ff9388802ae2482de094e36b0609cb38bf5" +checksum = "6fca3ff8ddd14c5928536483d4b393bb795d55dcb5b576b1dceb3f5829216c76" dependencies = [ "sp-api", "sp-core", @@ -5603,9 +5660,9 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e9996147f5b2572995e7377f2257e8ce207065e135115c3d3845838c1cbaa2" +checksum = "61d7105e78848b8a8f6af3539a0cf7d9627b78a8776f61f43769da6406937ea9" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -5614,15 +5671,15 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52a17e293be8e7a518ac6aebfc7fdafbe531b6c808a83a754e4a8730f139521" +checksum = "bd5de28eb08ce52f45ed32257b324766183dfe4d74a29242b934365ff80911ca" dependencies = [ "hash-db", "log", - "num-traits", + "num-traits 0.2.11", "parity-scale-codec", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "rand 0.7.3", "sp-core", "sp-externalities", @@ -5634,15 +5691,15 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752e038359704226bb5737531fb91df2e4ab33214e0be6eb6f32ad688a71b411" +checksum = "eca806523d5df8082c89da042e31292f0c8f6e6ad9c3cfc312edfffde6a08490" [[package]] name = "sp-storage" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c389a75ddd45ba771b20c4caed1011d23004069e436b73eca058d2f894585069" +checksum = "e2cb515df8b37fbdbb6769d2e992748b6134d592ec3b795b8e672621d754f94b" dependencies = [ "impl-serde 0.2.3", "serde", @@ -5652,9 +5709,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990bc28e4e7fd31a13f5e61fd30ef0aa3ba5747b64ab3560df5285abbd879f6c" +checksum = "bd289fc7dbbae54cfe4db93a204df6371d6f3b5b8d5819fa7287e7d44a83eb86" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5667,9 +5724,9 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7e374dd4c0831fa118728656c5d295a3ebd3da9c7ead45451ad4a5801a77e4" +checksum = "f62c89a439db3f248980da189811e45666b758bc3cb8a9eb587d73d2e91b3403" dependencies = [ "derive_more", "futures 0.3.4", @@ -5678,13 +5735,14 @@ dependencies = [ "serde", "sp-api", "sp-runtime", + "sp-utils", ] [[package]] name = "sp-trie" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f417a60d0d1222f92733deef4dffc73b21180b0cf44ec335ac73fc871198721" +checksum = "4194817027eb92525e9279ec651160d709340d74b707f7648654c8eb2a626be3" dependencies = [ "hash-db", "memory-db", @@ -5695,11 +5753,23 @@ dependencies = [ "trie-root", ] +[[package]] +name = "sp-utils" +version = "2.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3cd7ac8f6d105dd1d9483f7d2d20e0e77cecdfe0a7fe6d0bd0616cebb80ce3" +dependencies = [ + "futures 0.3.4", + "futures-core", + "lazy_static", + "prometheus", +] + [[package]] name = "sp-version" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f7ded62b3fd6346dc7e96dcfc55f8137653809e09cfa3f0da8052efd35c875" +checksum = "319c37fa4aa91ee9ee9c20a3fab0d5b6b1bbe1dea997319c303f28a62f49765d" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -5710,9 +5780,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9dec817ad8e5eed83a3579da8638703d7559be5da5342312c8effee6a70aa" +checksum = "7584168f2785f6676727545a31a3cd97159d7023d968540b4881a98d73991900" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5791,8 +5861,8 @@ dependencies = [ "heck", "proc-macro-error", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -5812,8 +5882,8 @@ checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" dependencies = [ "heck", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -5830,23 +5900,26 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" -version = "2.0.0-alpha.5" +version = "2.0.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc616006b44902a803b566592ef11d03a22ba3e1e0a6d1115a0859c105620f4" +checksum = "a0abd8ab46d560d0d5cffd8d016c6b75eb5df91885b1b226b819ab600f02237c" +dependencies = [ + "platforms", +] [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0-alpha.5" +version = "0.8.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79926ded24e276de08eba7880c173e90eae37dc748f47eabefca9bda2cb296" +checksum = "61cad984ef1fec55fe46843630566f98cde0ad3de07efbbf8a4f857b36fedf30" dependencies = [ "async-std", "derive_more", "futures-util", - "hyper 0.13.4", + "hyper 0.13.5", "log", "prometheus", - "tokio 0.2.17", + "tokio 0.2.18", ] [[package]] @@ -5881,6 +5954,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ + "quote 0.3.15", + "synom", + "unicode-xid 0.0.4", +] + [[package]] name = "syn" version = "1.0.17" @@ -5888,8 +5972,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" dependencies = [ "proc-macro2", - "quote", - "unicode-xid", + "quote 1.0.3", + "unicode-xid 0.2.0", ] [[package]] @@ -5899,8 +5983,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ + "unicode-xid 0.0.4", ] [[package]] @@ -5910,9 +6003,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ "proc-macro2", - "quote", - "syn", - "unicode-xid", + "quote 1.0.3", + "syn 1.0.17", + "unicode-xid 0.2.0", ] [[package]] @@ -5936,12 +6029,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" -[[package]] -name = "target_info" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" - [[package]] name = "tempfile" version = "3.1.0" @@ -5976,22 +6063,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0570dc61221295909abdb95c739f2e74325e14293b2026b0a7e195091ec54ae" +checksum = "54b3d3d2ff68104100ab257bb6bb0cb26c901abe4bd4ba15961f3bf867924012" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227362df41d566be41a28f64401e07a043157c21c14b9785a0d8e256f940a8fd" +checksum = "ca972988113b7715266f91250ddb98070d033c62a011fa0fcc57434a649310dd" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -6014,12 +6101,11 @@ dependencies = [ [[package]] name = "time" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "redox_syscall", "winapi 0.3.8", ] @@ -6074,9 +6160,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fb9142eb6e9cc37f4f29144e62618440b149a138eee01a7bbe9b9226aaf17c" +checksum = "34ef16d072d2b6dc8b4a56c70f5c5ced1a37752116f8e7c1e80c659aa7cb6713" dependencies = [ "bytes 0.5.4", "fnv", @@ -6195,8 +6281,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a" dependencies = [ "futures-core", - "rustls 0.17.0", - "tokio 0.2.17", + "rustls", + "tokio 0.2.18", "webpki", ] @@ -6308,7 +6394,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite", - "tokio 0.2.17", + "tokio 0.2.18", ] [[package]] @@ -6343,8 +6429,8 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbad39da2f9af1cae3016339ad7f2c7a9e870f12e8fd04c4fd7ef35b30c0d2b" dependencies = [ - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", ] [[package]] @@ -6358,9 +6444,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9222c50cc325855621271157c973da27a0dcd26fa06f8edf81020bd2333df0" +checksum = "bcc309f34008563989045a4c4dbcc5770467f3a3785ee80a9b5cc0d83362475f" dependencies = [ "hash-db", "hashbrown", @@ -6391,7 +6477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1" dependencies = [ "block-cipher-trait", - "byteorder 1.3.4", + "byteorder", "opaque-debug", ] @@ -6406,9 +6492,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.11.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" +checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" [[package]] name = "uint" @@ -6416,7 +6502,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e75a4cdd7b87b28840dba13c483b9a88ee6bbf16ba5c951ee1ecfcf723078e0d" dependencies = [ - "byteorder 1.3.4", + "byteorder", "crunchy", "rustc-hex", "static_assertions", @@ -6461,6 +6547,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + [[package]] name = "unicode-xid" version = "0.2.0" @@ -6469,9 +6561,9 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "unsigned-varint" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38e01ad4b98f042e166c1bf9a13f9873a99d79eaa171ce7ca81e6dd0f895d8a" +checksum = "f67332660eb59a6f1eb24ff1220c9e8d01738a8503c6002e30bcfe4bd9f2b4a9" dependencies = [ "bytes 0.5.4", "futures-io", @@ -6519,16 +6611,6 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -[[package]] -name = "vergen" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" -dependencies = [ - "bitflags", - "chrono", -] - [[package]] name = "version_check" version = "0.9.1" @@ -6588,8 +6670,8 @@ dependencies = [ "lazy_static", "log", "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", "wasm-bindgen-shared", ] @@ -6611,7 +6693,7 @@ version = "0.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4" dependencies = [ - "quote", + "quote 1.0.3", "wasm-bindgen-macro-support", ] @@ -6622,8 +6704,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6659,7 +6741,7 @@ dependencies = [ "libc", "memory_units", "num-rational", - "num-traits", + "num-traits 0.2.11", "parity-wasm", "wasmi-validation", ] @@ -6695,18 +6777,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" +checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" dependencies = [ "webpki", ] [[package]] name = "webpki-roots" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" +checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" dependencies = [ "webpki", ] @@ -6750,9 +6832,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi 0.3.8", ] @@ -6769,7 +6851,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94" dependencies = [ - "byteorder 1.3.4", + "byteorder", "bytes 0.4.12", "httparse", "log", @@ -6817,7 +6899,7 @@ dependencies = [ "futures 0.3.4", "log", "nohash-hasher", - "parking_lot 0.10.0", + "parking_lot 0.10.2", "rand 0.7.3", "static_assertions", ] @@ -6838,7 +6920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ "proc-macro2", - "quote", - "syn", + "quote 1.0.3", + "syn 1.0.17", "synstructure", ] diff --git a/cstrml/market/Cargo.toml b/cstrml/market/Cargo.toml index cbca9b11..d9d8ea9a 100644 --- a/cstrml/market/Cargo.toml +++ b/cstrml/market/Cargo.toml @@ -14,14 +14,14 @@ serde = { optional = true, version = '1.0.106' } serde_json = "1.0.51" # substrate frames -system = { package = 'frame-system', default-features = false, version = '2.0.0-alpha.5' } -frame-support = { default-features = false, version = '2.0.0-alpha.5' } +system = { package = 'frame-system', default-features = false, version = '2.0.0-alpha.6' } +frame-support = { default-features = false, version = '2.0.0-alpha.6' } # substrate primitives -sp-core = { default-features = false, version = '2.0.0-alpha.5' } -sp-io = { default-features = false, version = '2.0.0-alpha.5' } -sp-runtime = { default-features = false, version = '2.0.0-alpha.5' } -sp-std = { default-features = false, version = '2.0.0-alpha.5' } +sp-core = { default-features = false, version = '2.0.0-alpha.6' } +sp-io = { default-features = false, version = '2.0.0-alpha.6' } +sp-runtime = { default-features = false, version = '2.0.0-alpha.6' } +sp-std = { default-features = false, version = '2.0.0-alpha.6' } # crust runtime modules primitives = { package = 'cst-primitives', path = '../../primitives', default-features = false } diff --git a/cstrml/market/src/lib.rs b/cstrml/market/src/lib.rs index 6ea302d1..26c9387d 100644 --- a/cstrml/market/src/lib.rs +++ b/cstrml/market/src/lib.rs @@ -68,7 +68,9 @@ decl_module! { // Initializing events // this is needed only if you are using events in your module fn deposit_event() = default; + /// TODO: organize these parameters into a struct. + #[weight = frame_support::weights::SimpleDispatchInfo::default()] fn store_storage_order( origin, dest: ::Source, diff --git a/cstrml/staking/Cargo.toml b/cstrml/staking/Cargo.toml index fc304c44..59896f9f 100644 --- a/cstrml/staking/Cargo.toml +++ b/cstrml/staking/Cargo.toml @@ -14,28 +14,28 @@ safe-mix = { version = "1.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } # substrate frame dependencies -frame-support = { version = '2.0.0-alpha.5', default-features = false } -frame-system = { version = '2.0.0-alpha.5', default-features = false } -pallet-session = { version = '2.0.0-alpha.5', features = ["historical"], default-features = false } -pallet-authorship = { version = '2.0.0-alpha.5', default-features = false } +frame-support = { version = '2.0.0-alpha.6', default-features = false } +frame-system = { version = '2.0.0-alpha.6', default-features = false } +pallet-session = { version = '2.0.0-alpha.6', features = ["historical"], default-features = false } +pallet-authorship = { version = '2.0.0-alpha.6', default-features = false } # substrate primitives -sp-keyring = { optional = true, version = '2.0.0-alpha.5' } -sp-std = { version = '2.0.0-alpha.5', default-features = false } -sp-phragmen = { version = '2.0.0-alpha.5', default-features = false } -sp-io ={ version = '2.0.0-alpha.5', default-features = false } -sp-runtime = { version = '2.0.0-alpha.5', default-features = false } -sp-staking = { version = '2.0.0-alpha.5', default-features = false } +sp-keyring = { optional = true, version = '2.0.0-alpha.6' } +sp-std = { version = '2.0.0-alpha.6', default-features = false } +sp-phragmen = { version = '2.0.0-alpha.6', default-features = false } +sp-io ={ version = '2.0.0-alpha.6', default-features = false } +sp-runtime = { version = '2.0.0-alpha.6', default-features = false } +sp-staking = { version = '2.0.0-alpha.6', default-features = false } # crust runtime modules tee = { package = "cstrml-tee", path = "../tee", default-features = false } primitives = { package = 'cst-primitives', path = '../../primitives', default-features = false } [dev-dependencies] -sp-core = '2.0.0-alpha.5' -pallet-balances = '2.0.0-alpha.5' -pallet-timestamp = '2.0.0-alpha.5' -pallet-staking-reward-curve = '2.0.0-alpha.5' +sp-core = '2.0.0-alpha.6' +pallet-balances = '2.0.0-alpha.6' +pallet-timestamp = '2.0.0-alpha.6' +pallet-staking-reward-curve = '2.0.0-alpha.6' # private crate inside substrate substrate-test-utils = { version = '2.0.0-alpha.5', git = 'https://github.com/paritytech/substrate.git', rev = 'd1b9ccad107e4899978858de5ddd2868b9777aab'} diff --git a/cstrml/staking/src/inflation.rs b/cstrml/staking/src/inflation.rs index 8d3d8113..7f20a4f1 100644 --- a/cstrml/staking/src/inflation.rs +++ b/cstrml/staking/src/inflation.rs @@ -20,7 +20,7 @@ //! The staking rate in NPoS is the total amount of tokens staked by nominators and validators, //! divided by the total token supply. -use sp_runtime::{Perbill, PerThing, traits::AtLeast32Bit, curve::PiecewiseLinear}; +use sp_runtime::{Perbill, traits::AtLeast32Bit, curve::PiecewiseLinear}; /// The total payout to all validators (and their nominators) per era. /// diff --git a/cstrml/staking/src/lib.rs b/cstrml/staking/src/lib.rs index 88fbe3b7..da278f5c 100644 --- a/cstrml/staking/src/lib.rs +++ b/cstrml/staking/src/lib.rs @@ -17,15 +17,15 @@ use frame_support::{ storage::IterableStorageMap, traits::{ Currency, LockIdentifier, LockableCurrency, WithdrawReasons, OnUnbalanced, Imbalance, Get, - Time, + Time, EnsureOrigin } }; use pallet_session::historical; use sp_runtime::{ - Perbill, PerThing, RuntimeDebug, + Perbill, RuntimeDebug, traits::{ Convert, Zero, One, StaticLookup, CheckedSub, Saturating, AtLeast32Bit, - EnsureOrigin, CheckedAdd + CheckedAdd }, }; use sp_staking::{ @@ -1891,7 +1891,7 @@ impl OnOffenceHandler], slash_fraction: &[Perbill], slash_session: SessionIndex, - ) { + ) -> Result<(), ()> { let reward_proportion = SlashRewardFraction::get(); let era_now = Self::current_era().unwrap_or(0); @@ -1911,7 +1911,7 @@ impl OnOffenceHandler return, // before bonding period. defensive - should be filtered out. + None => return Ok(()), // before bonding period. defensive - should be filtered out. Some(&(ref slash_era, _)) => *slash_era, } }; @@ -1956,6 +1956,11 @@ impl OnOffenceHandler bool { + true } } diff --git a/cstrml/staking/src/slashing.rs b/cstrml/staking/src/slashing.rs index 02aa0530..632e8c78 100644 --- a/cstrml/staking/src/slashing.rs +++ b/cstrml/staking/src/slashing.rs @@ -52,7 +52,7 @@ use super::{ EraIndex, Trait, Module, Store, BalanceOf, Exposure, Perbill, SessionInterface, NegativeImbalanceOf, UnappliedSlash, }; -use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug, PerThing}; +use sp_runtime::{traits::{Zero, Saturating}, RuntimeDebug}; use frame_support::{ StorageMap, StorageDoubleMap, traits::{Currency, OnUnbalanced, Imbalance}, diff --git a/cstrml/tee/Cargo.toml b/cstrml/tee/Cargo.toml index 6ec59574..47d76811 100644 --- a/cstrml/tee/Cargo.toml +++ b/cstrml/tee/Cargo.toml @@ -16,21 +16,21 @@ signatory = "0.18.0" signatory-ring = "0.18.0" # substrate frame dependencies -frame-support = { default-features = false, version = '2.0.0-alpha.5' } -system = { package = 'frame-system', default-features = false, version = '2.0.0-alpha.5' } +frame-support = { default-features = false, version = '2.0.0-alpha.6' } +system = { package = 'frame-system', default-features = false, version = '2.0.0-alpha.6' } # substrate primitives -sp-core = { default-features = false, version = '2.0.0-alpha.5' } -sp-io = { default-features = false, version = '2.0.0-alpha.5' } -sp-runtime = { default-features = false, version = '2.0.0-alpha.5' } -sp-runtime-interface = { default-features = false, version = '2.0.0-alpha.5' } -sp-std = { default-features = false, version = '2.0.0-alpha.5' } +sp-core = { default-features = false, version = '2.0.0-alpha.6' } +sp-io = { default-features = false, version = '2.0.0-alpha.6' } +sp-runtime = { default-features = false, version = '2.0.0-alpha.6' } +sp-runtime-interface = { default-features = false, version = '2.0.0-alpha.6' } +sp-std = { default-features = false, version = '2.0.0-alpha.6' } # crust runtime modules primitives = { package = 'cst-primitives', path = '../../primitives', default-features = false } [dev-dependencies] -keyring = { package = "sp-keyring", version = '2.0.0-alpha.5' } +keyring = { package = "sp-keyring", version = '2.0.0-alpha.6' } hex = '0.4.2' [features] diff --git a/cstrml/tee/src/lib.rs b/cstrml/tee/src/lib.rs index aa8c8fb1..c26402c8 100644 --- a/cstrml/tee/src/lib.rs +++ b/cstrml/tee/src/lib.rs @@ -111,7 +111,8 @@ decl_module! { // this is needed only if you are using events in your module fn deposit_event() = default; - fn register_identity(origin, identity: Identity) -> DispatchResult { + #[weight = frame_support::weights::SimpleDispatchInfo::default()] + pub fn register_identity(origin, identity: Identity) -> DispatchResult { let who = ensure_signed(origin)?; // 0. Genesis validators have rights to register themselves @@ -154,6 +155,7 @@ decl_module! { Ok(()) } + #[weight = frame_support::weights::SimpleDispatchInfo::default()] fn report_works(origin, work_report: WorkReport) -> DispatchResult { let who = ensure_signed(origin)?; diff --git a/node/Cargo.toml b/node/Cargo.toml index 298fcf36..4352da66 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -18,27 +18,27 @@ log = "0.4.8" structopt = "0.3.8" # substrate client dependencies -babe = { version = '0.8.0-alpha.5', package = 'sc-consensus-babe' } -grandpa = { version = "0.8.0-alpha.5", package = "sc-finality-grandpa" } -sc-basic-authorship = '0.8.0-alpha.5' -authority-discovery = { version = '0.8.0-alpha.5', package= 'sc-authority-discovery' } -sc-client = '0.8.0-alpha.5' -sc-client-api = '2.0.0-alpha.5' -sc-cli = '0.8.0-alpha.5' -sc-executor = '0.8.0-alpha.5' -sc-network = '0.8.0-alpha.5' -sc-service = '0.8.0-alpha.5' -sc-transaction-pool = '2.0.0-alpha.5' +babe = { version = '0.8.0-alpha.6', package = 'sc-consensus-babe' } +grandpa = { version = "0.8.0-alpha.6", package = "sc-finality-grandpa" } +sc-basic-authorship = '0.8.0-alpha.6' +authority-discovery = { version = '0.8.0-alpha.6', package= 'sc-authority-discovery' } +sc-client = '0.8.0-alpha.6' +sc-client-api = '2.0.0-alpha.6' +sc-cli = '0.8.0-alpha.6' +sc-executor = '0.8.0-alpha.6' +sc-network = '0.8.0-alpha.6' +sc-service = '0.8.0-alpha.6' +sc-transaction-pool = '2.0.0-alpha.6' # substrate primitives -sp-transaction-pool = '2.0.0-alpha.5' -sp-core = '2.0.0-alpha.5' -sp-consensus = '0.8.0-alpha.5' -sp-consensus-babe = '0.8.0-alpha.5' -sp-inherents = '2.0.0-alpha.5' -sp-io = '2.0.0-alpha.5' -sp-runtime = '2.0.0-alpha.5' -grandpa-primitives = { package = 'sp-finality-grandpa', version = '2.0.0-alpha.5' } +sp-transaction-pool = '2.0.0-alpha.6' +sp-core = '2.0.0-alpha.6' +sp-consensus = '0.8.0-alpha.6' +sp-consensus-babe = '0.8.0-alpha.6' +sp-inherents = '2.0.0-alpha.6' +sp-io = '2.0.0-alpha.6' +sp-runtime = '2.0.0-alpha.6' +grandpa-primitives = { package = 'sp-finality-grandpa', version = '2.0.0-alpha.6' } # crust runtime modules crust-runtime = { path = '../runtime', version = '0.3.0' } @@ -47,5 +47,4 @@ cstrml-tee = { path = '../cstrml/tee', version = '0.3.0' } primitives = { package = 'cst-primitives', path = '../primitives', version = '0.3.0' } [build-dependencies] -vergen = '3.0.4' -build-script-utils = { version = "2.0.0-alpha.5", package = "substrate-build-script-utils" } +build-script-utils = { version = "2.0.0-alpha.6", package = "substrate-build-script-utils" } diff --git a/node/build.rs b/node/build.rs index 5899d5b4..3d074587 100644 --- a/node/build.rs +++ b/node/build.rs @@ -1,9 +1,7 @@ -use vergen::{generate_cargo_keys, ConstantsFlags}; - -const ERROR_MSG: &str = "Failed to generate metadata files"; +use build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed}; fn main() { - generate_cargo_keys(ConstantsFlags::SHA_SHORT).expect(ERROR_MSG); + generate_cargo_keys(); - build_script_utils::rerun_if_git_head_changed(); + rerun_if_git_head_changed(); } \ No newline at end of file diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 1b01fb41..09b691d1 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -2,14 +2,14 @@ use sp_core::{Pair, Public, sr25519}; use crust_runtime::{ AuthorityDiscoveryId, BalancesConfig, GenesisConfig, ImOnlineId, AuthorityDiscoveryConfig, SessionConfig, SessionKeys, StakerStatus, - StakingConfig, SystemConfig, TeeConfig, WASM_BINARY + StakingConfig, IndicesConfig, SystemConfig, TeeConfig, WASM_BINARY }; use cstrml_staking::Forcing; use cstrml_tee::WorkReport; use grandpa_primitives::AuthorityId as GrandpaId; use sp_consensus_babe::AuthorityId as BabeId; use primitives::{constants::currency::CRUS, *}; -use sc_service; +use sc_service::ChainType; use sp_runtime::{traits::{Verify, IdentifyAccount}, Perbill}; const DEFAULT_PROTOCOL_ID: &str = "cru"; @@ -19,17 +19,6 @@ const DEFAULT_PROTOCOL_ID: &str = "cru"; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. pub type ChainSpec = sc_service::GenericChainSpec; -/// The chain specification option. This is expected to come in from the CLI and -/// is little more than one of a number of alternatives which can easily be converted -/// from a string (`--chain=...`) into a `ChainSpec`. -#[derive(Clone, Debug)] -pub enum Alternative { - /// Whatever the current runtime is, with just Alice as an auth. - Development, - /// Whatever the current runtime is, with simple Alice/Bob auths. - LocalTestnet, -} - /// Helper function to generate a crypto pair from seed pub fn get_from_seed(seed: &str) -> ::Public { TPublic::Pair::from_string(&format!("//{}", seed), None) @@ -79,73 +68,65 @@ fn session_keys( } } -impl Alternative { - /// Get an actual chain config from one of the alternatives. - pub(crate) fn load(self) -> Result { - Ok(match self { - Alternative::Development => ChainSpec::from_genesis( - "Development", - "dev", - || testnet_genesis( - vec![get_authority_keys_from_seed("Alice")], - get_account_id_from_seed::("Alice"), - vec![ - get_account_id_from_seed::("Alice"), - get_account_id_from_seed::("Bob"), - get_account_id_from_seed::("Charlie"), - get_account_id_from_seed::("Alice//stash"), - get_account_id_from_seed::("Bob//stash"), - get_account_id_from_seed::("Charlie//stash"), - ], - true, - ), - vec![], - None, - Some(DEFAULT_PROTOCOL_ID), - None, - Default::default(), - ), - Alternative::LocalTestnet => ChainSpec::from_genesis( - "Local Testnet", - "local_testnet", - || testnet_genesis( - vec![ - get_authority_keys_from_seed("Alice"), - get_authority_keys_from_seed("Bob"), - ], - get_account_id_from_seed::("Alice"), - vec![ - get_account_id_from_seed::("Alice"), - get_account_id_from_seed::("Bob"), - get_account_id_from_seed::("Charlie"), - get_account_id_from_seed::("Dave"), - get_account_id_from_seed::("Eve"), - get_account_id_from_seed::("Ferdie"), - get_account_id_from_seed::("Alice//stash"), - get_account_id_from_seed::("Bob//stash"), - get_account_id_from_seed::("Charlie//stash"), - get_account_id_from_seed::("Dave//stash"), - get_account_id_from_seed::("Eve//stash"), - get_account_id_from_seed::("Ferdie//stash"), - ], - true, - ), - vec![], - None, - Some(DEFAULT_PROTOCOL_ID), - None, - Default::default(), - ), - }) - } +pub fn development_config() -> ChainSpec { + ChainSpec::from_genesis( + "Development", + "dev", + ChainType::Development, + || testnet_genesis( + vec![get_authority_keys_from_seed("Alice")], + get_account_id_from_seed::("Alice"), + vec![ + get_account_id_from_seed::("Alice"), + get_account_id_from_seed::("Bob"), + get_account_id_from_seed::("Charlie"), + get_account_id_from_seed::("Alice//stash"), + get_account_id_from_seed::("Bob//stash"), + get_account_id_from_seed::("Charlie//stash"), + ], + true, + ), + vec![], + None, + Some(DEFAULT_PROTOCOL_ID), + None, + Default::default() + ) +} - pub(crate) fn from(s: &str) -> Option { - match s { - "dev" => Some(Alternative::Development), - "" | "local" => Some(Alternative::LocalTestnet), - _ => None, - } - } +pub fn local_testnet_config() -> ChainSpec { + ChainSpec::from_genesis( + "Local Testnet", + "local_testnet", + ChainType::Local, + || testnet_genesis( + vec![ + get_authority_keys_from_seed("Alice"), + get_authority_keys_from_seed("Bob"), + ], + get_account_id_from_seed::("Alice"), + vec![ + get_account_id_from_seed::("Alice"), + get_account_id_from_seed::("Bob"), + get_account_id_from_seed::("Charlie"), + get_account_id_from_seed::("Dave"), + get_account_id_from_seed::("Eve"), + get_account_id_from_seed::("Ferdie"), + get_account_id_from_seed::("Alice//stash"), + get_account_id_from_seed::("Bob//stash"), + get_account_id_from_seed::("Charlie//stash"), + get_account_id_from_seed::("Dave//stash"), + get_account_id_from_seed::("Eve//stash"), + get_account_id_from_seed::("Ferdie//stash"), + ], + true, + ), + vec![], + None, + Some(DEFAULT_PROTOCOL_ID), + None, + Default::default() + ) } fn testnet_genesis( @@ -177,6 +158,9 @@ fn testnet_genesis( .map(|k| (k, ENDOWMENT)) .collect(), }), + indices: Some(IndicesConfig { + indices: vec![], + }), session: Some(SessionConfig { keys: initial_authorities .iter() @@ -232,11 +216,4 @@ fn testnet_genesis( .collect(), }), } -} - -pub fn load_spec(id: &str) -> Result, String> { - Ok(match Alternative::from(id) { - Some(spec) => Box::new(spec.load()?), - None => Box::new(ChainSpec::from_json_file(std::path::PathBuf::from(id))?), - }) } \ No newline at end of file diff --git a/node/src/command.rs b/node/src/command.rs index 7394a421..483aa46e 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -3,35 +3,53 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -use sc_cli::VersionInfo; -use crate::service; use crate::chain_spec; use crate::cli::Cli; +use crate::service; +use sc_cli::SubstrateCli; -/// Parse and run command line arguments -pub fn run(version: VersionInfo) -> sc_cli::Result<()> { - let opt = sc_cli::from_args::(&version); +impl SubstrateCli for Cli { + fn impl_name() -> &'static str { "Crust Node" } + + fn impl_version() -> &'static str { env!("SUBSTRATE_CLI_IMPL_VERSION") } + + fn executable_name() -> &'static str { "crust" } + + fn description() -> &'static str { env!("CARGO_PKG_DESCRIPTION") } + + fn author() -> &'static str { env!("CARGO_PKG_AUTHORS") } - let mut config = sc_service::Configuration::from_version(&version); + fn support_url() -> &'static str { "https://github.com/crustio/crust/issues/new" } - match opt.subcommand { + fn copyright_start_year() -> i32 { 2019 } + + fn load_spec(&self, id: &str) -> Result, String> { + Ok(match id { + "dev" => Box::new(chain_spec::development_config()), + "" | "local" => Box::new(chain_spec::local_testnet_config()), + path => Box::new(chain_spec::ChainSpec::from_json_file( + std::path::PathBuf::from(path), + )?), + }) + } +} + +/// Parse and run command line arguments +pub fn run() -> sc_cli::Result<()> { + let cli = Cli::from_args(); + + match &cli.subcommand { Some(subcommand) => { - subcommand.init(&version)?; - subcommand.update_config(&mut config, chain_spec::load_spec, &version)?; - subcommand.run( - config, - |config: _| Ok(new_full_start!(config).0), - ) - }, + let runner = cli.create_runner(subcommand)?; + runner.run_subcommand(subcommand, |config| Ok(new_full_start!(config).0)) + } None => { - opt.run.init(&version)?; - opt.run.update_config(&mut config, chain_spec::load_spec, &version)?; - opt.run.run( - config, + let runner = cli.create_runner(&cli.run)?; + runner.run_node( service::new_light, service::new_full, - &version, + crust_runtime::VERSION ) - }, + } } } \ No newline at end of file diff --git a/node/src/main.rs b/node/src/main.rs index 04277ed1..0e4e82f5 100644 --- a/node/src/main.rs +++ b/node/src/main.rs @@ -8,16 +8,5 @@ mod cli; mod command; fn main() -> sc_cli::Result<()> { - let version = sc_cli::VersionInfo { - name: "Crust ALPHA Node", - commit: env!("VERGEN_SHA_SHORT"), - version: env!("CARGO_PKG_VERSION"), - executable_name: "crust", - author: "Crustio", - description: "Crust alpha testnet node", - support_url: "https://github.com/crustio/crust/issues/new", - copyright_start_year: 2019, - }; - - command::run(version) + command::run() } diff --git a/node/src/service.rs b/node/src/service.rs index 875e6c9c..b1b1929d 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -5,7 +5,7 @@ use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, Stora use sc_client::LongestChain; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; -use sc_service::{error::Error as ServiceError, AbstractService, Configuration, ServiceBuilder}; +use sc_service::{error::Error as ServiceError, AbstractService, Configuration, ServiceBuilder, Role}; use sp_inherents::InherentDataProviders; use std::sync::Arc; use std::time::Duration; @@ -78,22 +78,13 @@ pub fn new_full(config: Configuration) use sc_client_api::ExecutorProvider; use futures::stream::StreamExt; - let is_authority = config.roles.is_authority(); + let role = config.role.clone(); let force_authoring = config.force_authoring; - let name = config.name.clone(); + let name = config.network.node_name.clone(); let disable_grandpa = config.disable_grandpa; - let sentry_nodes = config.network.sentry_nodes.clone(); - - // sentry nodes announce themselves as authorities to the network - // and should run the same protocols authorities do, but it should - // never actively participate in any consensus process. - let participates_in_consensus = is_authority && !config.sentry_mode; let (builder, mut import_setup, inherent_data_providers) = new_full_start!(config); - let (block_import, grandpa_link, babe_link) = import_setup.take() - .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); - let service = builder .with_finality_proof_provider(|client, backend| { // GenesisAuthoritySetProvider is implemented for StorageAndProofProvider @@ -102,7 +93,10 @@ pub fn new_full(config: Configuration) })? .build()?; - if participates_in_consensus { + let (block_import, grandpa_link, babe_link) = import_setup.take() + .expect("Link Half and Block Import are present for Full Services or setup failed before. qed"); + + if let Role::Authority { sentry_nodes } = &role { let proposer = sc_basic_authorship::ProposerFactory::new( service.client(), @@ -133,30 +127,34 @@ pub fn new_full(config: Configuration) // the BABE authoring task is considered essential, i.e. if it // fails we take down the service with it. - service.spawn_essential_task("babe", babe); + service.spawn_essential_task("babe-proposer", babe); // Authority discovery: this module runs to promise authorities' connection - // TODO: 2 modes? enable or not? - let network = service.network(); - let network_event_stream = network.event_stream(); - let dht_event_stream = network_event_stream.filter_map(|e| async move { match e { - Event::Dht(e) => Some(e), - _ => None, - }}).boxed(); - let authority_discovery = authority_discovery::AuthorityDiscovery::new( - service.client(), - network, - sentry_nodes.clone(), - service.keystore(), - dht_event_stream, - service.prometheus_registry(), - ); - service.spawn_task("authority-discovery", authority_discovery); + // TODO: refine sentry mode using updated substrate code + if matches!(role, Role::Authority{..} | Role::Sentry{..}) { + let network = service.network(); + let network_event_stream = network.event_stream("authority-discovery"); + let dht_event_stream = network_event_stream.filter_map(|e| async move { + match e { + Event::Dht(e) => Some(e), + _ => None, + } + }).boxed(); + let authority_discovery = authority_discovery::AuthorityDiscovery::new( + service.client(), + network, + sentry_nodes.clone(), + service.keystore(), + dht_event_stream, + service.prometheus_registry(), + ); + service.spawn_task("authority-discovery", authority_discovery); + } } // 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 participates_in_consensus { + let keystore = if role.is_authority() { Some(service.keystore()) } else { None @@ -169,7 +167,7 @@ pub fn new_full(config: Configuration) name: Some(name), observer_enabled: false, keystore, - is_authority, + is_authority: role.is_network_authority(), }; let enable_grandpa = !disable_grandpa; diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 2a7836f6..cbf91bf1 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -13,9 +13,9 @@ serde = { version = "1.0.106", optional = true, features = ["derive"] } parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] } # substrate primitives -sp-runtime = { version = '2.0.0-alpha.5', default-features = false } -sp-core = { version = '2.0.0-alpha.5', default-features = false } -sp-std = { version = '2.0.0-alpha.5', default-features = false } +sp-runtime = { version = '2.0.0-alpha.6', default-features = false } +sp-core = { version = '2.0.0-alpha.6', default-features = false } +sp-std = { version = '2.0.0-alpha.6', default-features = false } [features] default = ["std"] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index c076b7b6..2090a851 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -18,39 +18,40 @@ codec = { default-features = false, features = ['derive'], package = 'parity-sca serde = { features = ['derive'], optional = true, version = '1.0.106' } # substrate frame dependencies -authorship = { default-features = false, package = 'pallet-authorship', version = '2.0.0-alpha.5' } -authority-discovery = { default-features = false, package = 'pallet-authority-discovery', version = '2.0.0-alpha.5' } -babe = { default-features = false, package = 'pallet-babe', version = '2.0.0-alpha.5' } -balances = { default-features = false, package = 'pallet-balances', version = '2.0.0-alpha.5' } -collective = { default-features = false, package = 'pallet-collective', version = '2.0.0-alpha.5' } -frame-executive = { default-features = false, version = '2.0.0-alpha.5' } -frame-support = { default-features = false, version = "2.0.0-alpha.5" } -finality-tracker = { default-features = false, package = 'pallet-finality-tracker', version = '2.0.0-alpha.5' } -grandpa = { default-features = false, package = 'pallet-grandpa', version = '2.0.0-alpha.5' } -im-online = { default-features = false, package = 'pallet-im-online', version = '2.0.0-alpha.5' } -randomness-collective-flip = { default-features = false, package = 'pallet-randomness-collective-flip', version = '2.0.0-alpha.5' } -system = { default-features = false, package = 'frame-system', version = '2.0.0-alpha.5' } -session = { default-features = false, package = 'pallet-session', version = '2.0.0-alpha.5' } -pallet-staking-reward-curve = { default-features = false, version = '2.0.0-alpha.5' } -timestamp = { default-features = false, package = 'pallet-timestamp', version = '2.0.0-alpha.5' } -transaction-payment = { default-features = false, package = 'pallet-transaction-payment', version = '2.0.0-alpha.5' } +authorship = { default-features = false, package = 'pallet-authorship', version = '2.0.0-alpha.6' } +authority-discovery = { default-features = false, package = 'pallet-authority-discovery', version = '2.0.0-alpha.6' } +babe = { default-features = false, package = 'pallet-babe', version = '2.0.0-alpha.6' } +balances = { default-features = false, package = 'pallet-balances', version = '2.0.0-alpha.6' } +collective = { default-features = false, package = 'pallet-collective', version = '2.0.0-alpha.6' } +frame-executive = { default-features = false, version = '2.0.0-alpha.6' } +frame-support = { default-features = false, version = "2.0.0-alpha.6" } +finality-tracker = { default-features = false, package = 'pallet-finality-tracker', version = '2.0.0-alpha.6' } +grandpa = { default-features = false, package = 'pallet-grandpa', version = '2.0.0-alpha.6' } +indices = { package = "pallet-indices", version = '2.0.0-alpha.6', default-features = false } +im-online = { default-features = false, package = 'pallet-im-online', version = '2.0.0-alpha.6' } +randomness-collective-flip = { default-features = false, package = 'pallet-randomness-collective-flip', version = '2.0.0-alpha.6' } +system = { default-features = false, package = 'frame-system', version = '2.0.0-alpha.6' } +session = { default-features = false, package = 'pallet-session', version = '2.0.0-alpha.6' } +pallet-staking-reward-curve = { default-features = false, version = '2.0.0-alpha.6' } +timestamp = { default-features = false, package = 'pallet-timestamp', version = '2.0.0-alpha.6' } +transaction-payment = { default-features = false, package = 'pallet-transaction-payment', version = '2.0.0-alpha.6' } # substrate primitives -authority-discovery-primitives = { default-features = false, package = 'sp-authority-discovery', version = '2.0.0-alpha.5' } -babe-primitives = { default-features = false, package = 'sp-consensus-babe', version = '0.8.0-alpha.5' } -sp-api = { default-features = false, version = '2.0.0-alpha.5' } -sp-block-builder = { default-features = false, version = '2.0.0-alpha.5' } -sp-core = { default-features = false, version = '2.0.0-alpha.5' } -sp-inherents = { default-features = false, version = '2.0.0-alpha.5' } -sp-io = { default-features = false, version = '2.0.0-alpha.5' } -sp-offchain = { default-features = false, version = '2.0.0-alpha.5' } -sp-runtime = { default-features = false, version = '2.0.0-alpha.5' } -sp-session = { default-features = false, version = '2.0.0-alpha.5' } -sp-staking = { default-features = false, version = '2.0.0-alpha.5' } -sp-std = { default-features = false, version = '2.0.0-alpha.5' } -sp-transaction-pool = { default-features = false, version = '2.0.0-alpha.5' } -sp-version = { default-features = false, version = '2.0.0-alpha.5' } -sp-runtime-interface = { default-features = false, version = '2.0.0-alpha.5' } +authority-discovery-primitives = { default-features = false, package = 'sp-authority-discovery', version = '2.0.0-alpha.6' } +babe-primitives = { default-features = false, package = 'sp-consensus-babe', version = '0.8.0-alpha.6' } +sp-api = { default-features = false, version = '2.0.0-alpha.6' } +sp-block-builder = { default-features = false, version = '2.0.0-alpha.6' } +sp-core = { default-features = false, version = '2.0.0-alpha.6' } +sp-inherents = { default-features = false, version = '2.0.0-alpha.6' } +sp-io = { default-features = false, version = '2.0.0-alpha.6' } +sp-offchain = { default-features = false, version = '2.0.0-alpha.6' } +sp-runtime = { default-features = false, version = '2.0.0-alpha.6' } +sp-session = { default-features = false, version = '2.0.0-alpha.6' } +sp-staking = { default-features = false, version = '2.0.0-alpha.6' } +sp-std = { default-features = false, version = '2.0.0-alpha.6' } +sp-transaction-pool = { default-features = false, version = '2.0.0-alpha.6' } +sp-version = { default-features = false, version = '2.0.0-alpha.6' } +sp-runtime-interface = { default-features = false, version = '2.0.0-alpha.6' } # crust runtime modules tee = { package = 'cstrml-tee', path = '../cstrml/tee', default-features = false } @@ -74,6 +75,7 @@ std = [ 'grandpa/std', 'finality-tracker/std', 'im-online/std', + 'indices/std', 'randomness-collective-flip/std', 'serde', 'sp-api/std', diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 0561fd8a..d615e633 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -9,13 +9,14 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use sp_core::OpaqueMetadata; -use sp_runtime::curve::PiecewiseLinear; use sp_runtime::traits::{ BlakeTwo256, Block as BlockT, Convert, ConvertInto, OpaqueKeys, SaturatedConversion, IdentityLookup }; -use sp_runtime::transaction_validity::TransactionValidity; -use sp_runtime::{create_runtime_str, generic, impl_opaque_keys, ApplyExtrinsicResult, Perbill}; +use sp_runtime::{ + create_runtime_str, generic, impl_opaque_keys, ApplyExtrinsicResult, Perbill, + transaction_validity::{TransactionValidity, TransactionSource, TransactionPriority} +}; use sp_std::prelude::*; use grandpa::{fg_primitives, AuthorityList as GrandpaAuthorityList}; @@ -80,7 +81,7 @@ impl_opaque_keys! { /// This runtime version. pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("crust"), - impl_name: create_runtime_str!("crust"), + impl_name: create_runtime_str!("crustio-crust"), authoring_version: 1, spec_version: 1, impl_version: 1, @@ -160,6 +161,17 @@ impl babe::Trait for Runtime { type EpochChangeTrigger = babe::ExternalTrigger; } +parameter_types! { + pub const IndexDeposit: Balance = 1 * DOLLARS; +} + +impl indices::Trait for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; + type Event = Event; +} + impl authority_discovery::Trait for Runtime {} type SubmitTransaction = TransactionSubmitter; @@ -168,6 +180,11 @@ parameter_types! { pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_BLOCKS as _; } +parameter_types! { + pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2; + pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value(); +} + impl im_online::Trait for Runtime { type AuthorityId = ImOnlineId; type Event = Event; @@ -175,6 +192,7 @@ impl im_online::Trait for Runtime { type SubmitTransaction = SubmitTransaction; type SessionDuration = SessionDuration; type ReportUnresponsiveness = (); + type UnsignedPriority = StakingUnsignedPriority; } impl grandpa::Trait for Runtime { @@ -192,10 +210,6 @@ impl finality_tracker::Trait for Runtime { type ReportLatency = ReportLatency; } -parameter_types! { - pub const IndexDeposit: Balance = 1 * DOLLARS; -} - parameter_types! { pub const MinimumPeriod: u64 = SLOT_DURATION / 2; } @@ -208,7 +222,7 @@ impl timestamp::Trait for Runtime { } parameter_types! { - pub const UncleGenerations: BlockNumber = 5; + pub const UncleGenerations: BlockNumber = 0; } impl authorship::Trait for Runtime { @@ -227,6 +241,7 @@ impl session::Trait for Runtime { type ValidatorId = AccountId; type ValidatorIdOf = staking::StashOf; type ShouldEndSession = Babe; + type NextSessionRotation = Babe; type SessionManager = Staking; type SessionHandler = ::KeyTypeIdProviders; type Keys = SessionKeys; @@ -238,17 +253,6 @@ impl session::historical::Trait for Runtime { type FullIdentificationOf = staking::ExposureOf; } -pallet_staking_reward_curve::build! { - const REWARD_CURVE: PiecewiseLinear<'static> = curve!( - min_inflation: 0_025_000, - max_inflation: 0_100_000, - ideal_stake: 0_500_000, - falloff: 0_050_000, - max_piece_count: 40, - test_precision: 0_005_000, - ); -} - parameter_types! { // 3 sessions in an era (30 mins). pub const SessionsPerEra: SessionIndex = 3; @@ -355,6 +359,7 @@ construct_runtime! { Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)}, Timestamp: timestamp::{Module, Call, Storage, Inherent}, + Indices: indices::{Module, Call, Storage, Config, Event}, Balances: balances::{Module, Call, Storage, Config, Event}, TransactionPayment: transaction_payment::{Module, Storage}, @@ -448,8 +453,10 @@ impl_runtime_apis! { } impl sp_transaction_pool::runtime_api::TaggedTransactionQueue for Runtime { - fn validate_transaction(tx: ::Extrinsic) -> TransactionValidity { - Executive::validate_transaction(tx) + fn validate_transaction( + source: TransactionSource, + tx: ::Extrinsic) -> TransactionValidity { + Executive::validate_transaction(source, tx) } } From 8c082bdd2846f157264d3ea913afc719d74ea4b3 Mon Sep 17 00:00:00 2001 From: Zikun Fan Date: Wed, 22 Apr 2020 02:10:34 +0800 Subject: [PATCH 2/2] resolve test cases --- cstrml/market/src/mock.rs | 7 +++++-- cstrml/market/src/tests.rs | 2 -- cstrml/staking/src/mock.rs | 9 +++++---- cstrml/staking/src/tests.rs | 7 +++---- cstrml/tee/src/mock.rs | 7 +++++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/cstrml/market/src/mock.rs b/cstrml/market/src/mock.rs index b2cfef5a..9a89cbce 100644 --- a/cstrml/market/src/mock.rs +++ b/cstrml/market/src/mock.rs @@ -1,10 +1,13 @@ use super::*; -use frame_support::{impl_outer_origin, parameter_types, weights::Weight}; +use frame_support::{ + impl_outer_origin, parameter_types, weights::Weight, + traits::{OnFinalize, OnInitialize} +}; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup, OnFinalize, OnInitialize}, + traits::{BlakeTwo256, IdentityLookup}, Perbill, }; pub type AccountId = u64; diff --git a/cstrml/market/src/tests.rs b/cstrml/market/src/tests.rs index 7cada8a0..0fe43323 100644 --- a/cstrml/market/src/tests.rs +++ b/cstrml/market/src/tests.rs @@ -1,5 +1,3 @@ -use super::*; - use crate::mock::{new_test_ext, run_to_block, Origin, Market}; use frame_support::assert_ok; use hex; diff --git a/cstrml/staking/src/mock.rs b/cstrml/staking/src/mock.rs index c695ed30..c19ede32 100644 --- a/cstrml/staking/src/mock.rs +++ b/cstrml/staking/src/mock.rs @@ -4,13 +4,13 @@ use crate::*; use frame_support::{ assert_ok, impl_outer_origin, parameter_types, StorageValue, IterableStorageMap, - traits::{Currency, Get, FindAuthor}, + traits::{Currency, Get, FindAuthor, OnInitialize}, weights::Weight, }; use sp_core::{crypto::key_types, H256}; use sp_io; use sp_runtime::testing::{Header, UintAuthorityId}; -use sp_runtime::traits::{Convert, IdentityLookup, OnInitialize, OpaqueKeys, SaturatedConversion}; +use sp_runtime::traits::{Convert, IdentityLookup, OpaqueKeys, SaturatedConversion}; use sp_runtime::{KeyTypeId, Perbill}; use sp_staking::{ offence::{OffenceDetails, OnOffenceHandler}, @@ -159,6 +159,7 @@ impl pallet_session::Trait for Test { type ValidatorId = AccountId; type ValidatorIdOf = crate::StashOf; type ShouldEndSession = pallet_session::PeriodicSessions; + type NextSessionRotation = pallet_session::PeriodicSessions; type SessionManager = pallet_session::historical::NoteHistoricalRoot; type SessionHandler = TestSessionHandler; type Keys = UintAuthorityId; @@ -583,7 +584,7 @@ pub fn on_offence_in_era( let bonded_eras = crate::BondedEras::get(); for &(bonded_era, start_session) in bonded_eras.iter() { if bonded_era == era { - Staking::on_offence(offenders, slash_fraction, start_session); + let _ = Staking::on_offence(offenders, slash_fraction, start_session); return; } else if bonded_era > era { break; @@ -591,7 +592,7 @@ pub fn on_offence_in_era( } if Staking::current_era().unwrap_or(0) == era { - Staking::on_offence( + let _ = Staking::on_offence( offenders, slash_fraction, Staking::current_era_start_session_index(), diff --git a/cstrml/staking/src/tests.rs b/cstrml/staking/src/tests.rs index d2ddc129..1be2cdc0 100644 --- a/cstrml/staking/src/tests.rs +++ b/cstrml/staking/src/tests.rs @@ -5,11 +5,11 @@ use crate::mock::*; use frame_support::{ assert_noop, assert_ok, dispatch::DispatchError, - traits::{Currency, ReservableCurrency}, + traits::{Currency, ReservableCurrency, OnInitialize}, }; use sp_runtime::{ assert_eq_error_rate, - traits::{BadOrigin, OnInitialize}, + traits::BadOrigin, }; use sp_staking::offence::OffenceDetails; use substrate_test_utils::assert_eq_uvec; @@ -369,8 +369,7 @@ fn multi_era_reward_should_work() { ); assert_eq!( Balances::total_balance(&21) / 1000000, - (init_balance_21 + total_staking_payout_0 * 1000 / 2001 + - Perbill::from_rational_approximation(stakes_21, 142667657428421) * total_staking_payout_1) / 1000000 + (stakes_21 + Perbill::from_rational_approximation(stakes_21, 142667657428421) * total_staking_payout_1) / 1000000 ); }); } diff --git a/cstrml/tee/src/mock.rs b/cstrml/tee/src/mock.rs index c485e5ba..0defd310 100644 --- a/cstrml/tee/src/mock.rs +++ b/cstrml/tee/src/mock.rs @@ -1,11 +1,14 @@ use super::*; -use frame_support::{impl_outer_origin, parameter_types, weights::Weight}; +use frame_support::{ + impl_outer_origin, parameter_types, weights::Weight, + traits::{ OnInitialize, OnFinalize } +}; use keyring::Sr25519Keyring; use sp_core::{crypto::AccountId32, H256}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup, OnFinalize, OnInitialize}, + traits::{BlakeTwo256, IdentityLookup}, Perbill, };