diff --git a/.github/workflows/runtime-tests.yml b/.github/workflows/runtime-tests.yml index 487f230..f35aace 100644 --- a/.github/workflows/runtime-tests.yml +++ b/.github/workflows/runtime-tests.yml @@ -39,7 +39,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2020-03-09 + toolchain: nightly-2020-10-05 components: rustfmt target: wasm32-unknown-unknown default: true @@ -78,7 +78,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2020-03-09 + toolchain: nightly-2020-10-05 components: rustfmt target: wasm32-unknown-unknown default: true diff --git a/Cargo.lock b/Cargo.lock index 7464fc9..614f697 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,23 +40,11 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7001367fde4c768a19d1029f0a8be5abd9308e1119846d5bd9ad26297b8faf5" dependencies = [ - "aes-soft 0.4.0", - "aesni 0.7.0", + "aes-soft", + "aesni", "block-cipher", ] -[[package]] -name = "aes-ctr" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" -dependencies = [ - "aes-soft 0.3.3", - "aesni 0.6.0", - "ctr", - "stream-cipher 0.3.2", -] - [[package]] name = "aes-gcm" version = "0.6.0" @@ -70,17 +58,6 @@ dependencies = [ "subtle 2.2.3", ] -[[package]] -name = "aes-soft" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" -dependencies = [ - "block-cipher-trait", - "byteorder 1.3.4", - "opaque-debug 0.2.3", -] - [[package]] name = "aes-soft" version = "0.4.0" @@ -92,17 +69,6 @@ dependencies = [ "opaque-debug 0.2.3", ] -[[package]] -name = "aesni" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" -dependencies = [ - "block-cipher-trait", - "opaque-debug 0.2.3", - "stream-cipher 0.3.2", -] - [[package]] name = "aesni" version = "0.7.0" @@ -128,6 +94,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + [[package]] name = "aho-corasick" version = "0.7.13" @@ -406,9 +378,9 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bindgen" -version = "0.53.3" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" +checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" dependencies = [ "bitflags", "cexpr", @@ -540,15 +512,6 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-cipher-trait" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" -dependencies = [ - "generic-array 0.12.3", -] - [[package]] name = "block-padding" version = "0.1.5" @@ -896,16 +859,6 @@ dependencies = [ "sct", ] -[[package]] -name = "ctr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" -dependencies = [ - "block-cipher-trait", - "stream-cipher 0.3.2", -] - [[package]] name = "cuckoofilter" version = "0.3.2" @@ -1143,9 +1096,9 @@ checksum = "4bd3bdaaf0a72155260a1c098989b60db1cbb22d6a628e64f16237aa4da93cc7" [[package]] name = "fdlimit" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da54a593b34c71b889ee45f5b5bb900c74148c5f7f8c6a9479ee7899f69603c" +checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" dependencies = [ "libc", ] @@ -1189,18 +1142,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12a63160eac0a00a1dba821291465e7c4bdaeee489af2912dc3d4513a9d1c34" +checksum = "98d7f1c606d158d5af4479f2971f259d8dd262f03f6f7b5b37e92eec7b8de396" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d92ab79f0c46fe4347d5073a0e331d935ca8d8bde0d001c8938900716685c3" +checksum = "66a5e3fe43568300fdca1c1bfd45ea463a12cca8fbe6172a4f6d58cd54e3fbcc" dependencies = [ "frame-support", "frame-system", @@ -1217,14 +1170,15 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a0cd96943af326c968548906a3968d573c7c6ddfa645c4bd2ed8168c1b6c68" +checksum = "c843800f05a7ad4653bc0db53a15e3d9bdd1cf14103e15c29e8aca200dbb1188" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -1233,9 +1187,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "11.0.0-rc6" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b82bf25442501c9455fc60090d606e5a36cc6e6953a7afee87fcab4fe2865b" +checksum = "6b5640bfcb7111643807c63cd38ecdcc923d3253e525f23ab6b366002bf8ecd5" dependencies = [ "parity-scale-codec", "serde", @@ -1245,9 +1199,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611cb2bafdb3aa6d77e35153ddf3da26203481b294959e00491e5ba6609ef3a1" +checksum = "807c32da14bd0e5fb751095335a07938cda6f1488f57d7b0539118e3434980a8" dependencies = [ "bitmask", "frame-metadata", @@ -1271,9 +1225,9 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961165a915c5a0bcbb3976791c4e857639d773474336f9484aee21dfb2268b66" +checksum = "508dc2eb44a802f1876e3dc97a76aed8f18b993f75f6cb1975cb83cf45a5d981" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1283,9 +1237,9 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4855863432cfb36407e2f18cd1e189cf70ee3259ed137409e6076fa8fd9bc92b" +checksum = "04f6d1dd14477123180c47024bcc24c1a624ea8631b4f00080d14089907397f4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1296,9 +1250,9 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e41f45abe08fa7bb27c38ed4141bdb24dfe9604b024726cfc931b12303de9a2" +checksum = "8ad38379ecedd632f286c7b94a4b9a15bffb635194de4dbf2b4458bc46cee28f" dependencies = [ "proc-macro2", "quote", @@ -1307,9 +1261,9 @@ dependencies = [ [[package]] name = "frame-system" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "646ced951522d31f4bda819a2c87ea7feac3abcb1b35fba38b1ecc52fc661e75" +checksum = "d172404f0e44b867f5fd14465a27f298b8828b53d7a7a555d3759e1dec3c8f0d" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1742,6 +1696,15 @@ dependencies = [ "autocfg 1.0.1", ] +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash 0.4.7", +] + [[package]] name = "heck" version = "0.3.1" @@ -1776,6 +1739,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "hex-literal" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" + [[package]] name = "hex-literal-impl" version = "0.2.2" @@ -1785,6 +1754,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "hex_fmt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" + [[package]] name = "hmac" version = "0.7.1" @@ -1968,15 +1943,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-serde" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8" -dependencies = [ - "serde", -] - [[package]] name = "impl-serde" version = "0.3.1" @@ -2059,15 +2025,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "0.4.6" @@ -2094,9 +2051,9 @@ dependencies = [ [[package]] name = "jsonrpc-client-transports" -version = "14.2.1" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2773fa94a2a1fd51efb89a8f45b8861023dbb415d18d3c9235ae9388d780f9ec" +checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7" dependencies = [ "failure", "futures 0.1.29", @@ -2110,9 +2067,9 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" +checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa" dependencies = [ "futures 0.1.29", "log", @@ -2123,18 +2080,18 @@ dependencies = [ [[package]] name = "jsonrpc-core-client" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34221123bc79b66279a3fde2d3363553835b43092d629b34f2e760c44dc94713" +checksum = "6f764902d7b891344a0acb65625f32f6f7c6db006952143bd650209fbe7d94db" dependencies = [ "jsonrpc-client-transports", ] [[package]] name = "jsonrpc-derive" -version = "14.2.1" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef" +checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2144,9 +2101,9 @@ dependencies = [ [[package]] name = "jsonrpc-http-server" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522" +checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" dependencies = [ "hyper 0.12.35", "jsonrpc-core", @@ -2159,9 +2116,9 @@ dependencies = [ [[package]] name = "jsonrpc-ipc-server" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dedccd693325d833963b549e959137f30a7a0ea650cde92feda81dc0c1393cb5" +checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7" dependencies = [ "jsonrpc-core", "jsonrpc-server-utils", @@ -2173,9 +2130,9 @@ dependencies = [ [[package]] name = "jsonrpc-pubsub" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986" +checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77" dependencies = [ "jsonrpc-core", "log", @@ -2186,9 +2143,9 @@ dependencies = [ [[package]] name = "jsonrpc-server-utils" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb" +checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176" dependencies = [ "bytes 0.4.12", "globset", @@ -2202,16 +2159,16 @@ dependencies = [ [[package]] name = "jsonrpc-ws-server" -version = "14.2.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc" +checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22" dependencies = [ "jsonrpc-core", "jsonrpc-server-utils", "log", + "parity-ws", "parking_lot 0.10.2", "slab", - "ws", ] [[package]] @@ -2262,9 +2219,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c341ef15cfb1f923fa3b5138bfbd2d4813a2c1640b473727a53351c7f0b0fa2" +checksum = "44947dd392f09475af614d740fe0320b66d01cb5b977f664bbbb5e45a70ea4c1" dependencies = [ "fs-swap", "kvdb", @@ -2314,10 +2271,11 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.22.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0306a49ee6a89468f96089906f36b0eef82c988dcfc8acf3e2dcd6ad1c859f85" +checksum = "571f5a4604c1a40d75651da141dfde29ad15329f537a779528803297d2220274" dependencies = [ + "atomic", "bytes 0.5.6", "futures 0.3.5", "lazy_static", @@ -2331,12 +2289,11 @@ dependencies = [ "libp2p-kad", "libp2p-mdns", "libp2p-mplex", - "libp2p-noise 0.21.0", + "libp2p-noise", "libp2p-ping", "libp2p-plaintext", "libp2p-pnet", "libp2p-request-response", - "libp2p-secio", "libp2p-swarm", "libp2p-tcp", "libp2p-uds", @@ -2351,43 +2308,11 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "libp2p" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ebb6c031584a5af181fe3a1e4b074af5d0b1a3b31663200f0251f4bcff6b5c" -dependencies = [ - "atomic", - "bytes 0.5.6", - "futures 0.3.5", - "lazy_static", - "libp2p-core", - "libp2p-core-derive", - "libp2p-dns", - "libp2p-identify", - "libp2p-kad", - "libp2p-mdns", - "libp2p-mplex", - "libp2p-noise 0.22.0", - "libp2p-ping", - "libp2p-swarm", - "libp2p-tcp", - "libp2p-wasm-ext", - "libp2p-websocket", - "libp2p-yamux", - "multihash", - "parity-multiaddr", - "parking_lot 0.10.2", - "pin-project", - "smallvec 1.4.2", - "wasm-timer", -] - [[package]] name = "libp2p-core" -version = "0.20.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a694fd76d7c33a45a0e6e1525e9b9b5d11127c9c94e560ac0f8abba54ed80af" +checksum = "52f13ba8c7df0768af2eb391696d562c7de88cc3a35122531aaa6a7d77754d25" dependencies = [ "asn1_der", "bs58", @@ -2429,9 +2354,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abeff37fa533fead23fc71b14ed0a2aced36c0c65c3d0078aff07821fb71029e" +checksum = "74029ae187f35f4b8ddf26b9779a68b340045d708528a103917cdca49a296db5" dependencies = [ "flate2", "futures 0.3.5", @@ -2440,9 +2365,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751924b6b98e350005e0b87a822beb246792a3fb878c684e088f866158120ac" +checksum = "7cf319822e08dd65c8e060d2354e9f952895bbc433f5706c75ed010c152aee5e" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2451,9 +2376,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d4f310a02441b681075037ffb41649ee8836619559311b801ef3d5cdbe14cf" +checksum = "d8a9acb43a3e4a4e413e0c4abe0fa49308df7c6335c88534757b647199cb8a51" dependencies = [ "cuckoofilter", "fnv", @@ -2468,9 +2393,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70f76b6c53ae9c97c234498c799802e43f91766bcf4a2a1f94f9339617d713b" +checksum = "ab20fcb60edebe3173bbb708c6ac3444afdf1e3152dc2866b10c4f5497f17467" dependencies = [ "base64 0.11.0", "byteorder 1.3.4", @@ -2478,10 +2403,11 @@ dependencies = [ "fnv", "futures 0.3.5", "futures_codec", + "hex_fmt", "libp2p-core", "libp2p-swarm", "log", - "lru", + "lru_time_cache", "prost", "prost-build", "rand 0.7.3", @@ -2493,9 +2419,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912c00a7bf67e0e765daf0cc37e08f675ea26aba3d6d1fbfaee81f19a4c23049" +checksum = "56396ee63aa9164eacf40c2c5d2bda8c4133c2f57e1b0425d51d3a4e362583b1" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2509,9 +2435,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44ed3a4c8111c570ab2bffb30c6353178d7603ce3787e3c5f2493c8d3d16d1f0" +checksum = "cc7fa9047f8b8f544278a35c2d9d45d3b2c1785f2d86d4e1629d6edf97be3955" dependencies = [ "arrayvec 0.5.1", "bytes 0.5.6", @@ -2536,9 +2462,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd004c668160fd922f7268b2cd1e4550ff69165d9c744e9eb5770086eb753d02" +checksum = "3173b5a6b2f690c29ae07798d85b9441a131ac76ddae9015ef22905b623d0c69" dependencies = [ "async-std", "data-encoding", @@ -2558,9 +2484,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ae0ffacd30f073f96cd518b2c9cd2cb18ac27c3d136a4b23cf1af99f33e541" +checksum = "8a73a799cc8410b36e40b8f4c4b6babbcb9efd3727111bf517876e4acfa612d3" dependencies = [ "bytes 0.5.6", "fnv", @@ -2574,31 +2500,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f353f8966bbaaf7456535fffd3f366f153148773a0cf04b2ec3860955cb720e" -dependencies = [ - "bytes 0.5.6", - "curve25519-dalek 2.1.0", - "futures 0.3.5", - "lazy_static", - "libp2p-core", - "log", - "prost", - "prost-build", - "rand 0.7.3", - "sha2 0.8.2", - "snow", - "static_assertions", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "libp2p-noise" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e594f2de0c23c2b7ad14802c991a2e68e95315c6a6c7715e53801506f20135d" +checksum = "6ef6c490042f549fb1025f2892dfe6083d97a77558f450c1feebe748ca9eb15a" dependencies = [ "bytes 0.5.6", "curve25519-dalek 2.1.0", @@ -2618,9 +2522,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70130cf130e4ba6dc177366e72dd9f86f9e3588fa1a0c4145247e676f16affad" +checksum = "ad063c21dfcea4518ac9e8bd4119d33a5b26c41e674f602f41f05617a368a5c8" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2633,9 +2537,9 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f0308a97f6fdd37a2bc388070e471c3ce9d92aa45c99d75c87c2dc5d5cac96" +checksum = "903a12e99c72dbebefea258de887982adeacc7025baa1ceb10b7fa9928f54791" dependencies = [ "bytes 0.5.6", "futures 0.3.5", @@ -2665,54 +2569,31 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.1.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f48682b48a96545a323edd150c1d64fc1e250240bba02866e9f902e3dc032a9" +checksum = "9c0c9e8a4cd69d97e9646c54313d007512f411aba8c5226cfcda16df6a6e84a3" dependencies = [ "async-trait", + "bytes 0.5.6", "futures 0.3.5", "libp2p-core", "libp2p-swarm", - "smallvec 1.4.2", - "wasm-timer", -] - -[[package]] -name = "libp2p-secio" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff43513c383f7cdab2736eb98465fc4c5dd5d1988df89749dc8a68950349d56" -dependencies = [ - "aes-ctr", - "ctr", - "futures 0.3.5", - "hmac", - "js-sys", - "lazy_static", - "libp2p-core", "log", - "parity-send-wrapper", - "pin-project", - "prost", - "prost-build", - "quicksink", + "lru 0.6.3", + "minicbor", "rand 0.7.3", - "ring", - "rw-stream-sink", - "sha2 0.8.2", - "static_assertions", - "twofish", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "smallvec 1.4.2", + "unsigned-varint 0.5.1", + "wasm-timer", ] [[package]] name = "libp2p-swarm" -version = "0.20.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88d5e2a090a2aadf042cd33484e2f015c6dab212567406a59deece5dedbd133" +checksum = "7193e444210132237b81b755ec7fe53f1c4bd2f53cf719729b94c0c72eb6eaa1" dependencies = [ + "either", "futures 0.3.5", "libp2p-core", "log", @@ -2724,9 +2605,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1fa2bbad054020cb875546a577a66a65a5bf42eff55ed5265f92ffee3cc052" +checksum = "44f42ec130d7a37a7e47bf4398026b7ad9185c08ed26972e2720f8b94112796f" dependencies = [ "async-std", "futures 0.3.5", @@ -2740,9 +2621,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9db9fce9e3588c3118475d9ca761c5c133b639a624a7341e2a61e4b28c376b8" +checksum = "dea7acb0a034f70d7db94c300eba3f65c0f6298820105624088a9609c9974d77" dependencies = [ "async-std", "futures 0.3.5", @@ -2752,9 +2633,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.20.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0feb99e32fea20ffb1bbf56a6fb2614bff7325ff44a515728385170b3420d2c3" +checksum = "34c1faac6f92c21fbe155417957863ea822fba9e9fd5eb24c0912336a100e63f" dependencies = [ "futures 0.3.5", "js-sys", @@ -2766,9 +2647,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046a5201f6e471f22b22b394e4d084269ed1e28cf7300f7b49874385db84c7bd" +checksum = "d650534ebd99f48f6fa292ed5db10d30df2444943afde4407ceeddab8e513fca" dependencies = [ "async-tls", "either", @@ -2786,22 +2667,22 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.20.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ae9bf2f7d8a4be9c7e9b61df9de9dc1bd66419d669098f22f81f8d9571029a" +checksum = "781d9b9f043dcdabc40640807125368596b849fd4d96cdca2dcf052fdf6f33fd" dependencies = [ "futures 0.3.5", "libp2p-core", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "thiserror", "yamux", ] [[package]] name = "librocksdb-sys" -version = "6.7.4" +version = "6.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005" +checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09" dependencies = [ "bindgen", "cc", @@ -2907,6 +2788,21 @@ dependencies = [ "hashbrown 0.6.3", ] +[[package]] +name = "lru" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aae342b73d57ad0b8b364bd12584819f2c1fe9114285dfcf8b0722607671635" +dependencies = [ + "hashbrown 0.9.1", +] + +[[package]] +name = "lru_time_cache" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb241df5c4caeb888755363fc95f8a896618dc0d435e9e775f7930cb099beab" + [[package]] name = "matchers" version = "0.0.1" @@ -2991,6 +2887,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "minicbor" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc03ad6f8f548db7194a5ff5a6f96342ecae4e3ef67d2bf18bacc0e245cd041" +dependencies = [ + "minicbor-derive", +] + +[[package]] +name = "minicbor-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c214bf3d90099b52f3e4b328ae0fe34837fd0fab683ad1e10fceb4629106df48" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "miniz_oxide" version = "0.4.0" @@ -3310,9 +3226,9 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec78c836f1481626270edfa445c612ba8e3aa6601f418f31a9aa815ae3ab6584" +checksum = "56bf116724c3adb7eee6ae49adfc28d3d38d9d34bbfdcc009497120256309a37" dependencies = [ "frame-benchmarking", "frame-support", @@ -3325,9 +3241,9 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b925ea02f36e558d0ff08becce040b11ddf319701fe5125935fd98ea6ab16bee" +checksum = "13642cbbb2ea520ca2021299baec604de102a1d033dd32812c946cb03f48f47e" dependencies = [ "frame-support", "frame-system", @@ -3340,9 +3256,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8678ecd7743bc05eae24ac0c115b9c2893fdeee0a880fbd6263ee4c56ead2ce" +checksum = "ccddd55b713f541dff6ccf063cc7ddbc4fc41e92a9fdad8ec9562a0e3b465016" dependencies = [ "frame-benchmarking", "frame-support", @@ -3372,9 +3288,9 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc20af3143a62c16e7c9e92ea5c6ae49f7d271d97d4d8fe73afc28f0514a3d0f" +checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a" dependencies = [ "arrayref", "bs58", @@ -3384,7 +3300,7 @@ dependencies = [ "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", "url 2.1.1", ] @@ -3471,6 +3387,24 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865" +[[package]] +name = "parity-ws" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61" +dependencies = [ + "byteorder 1.3.4", + "bytes 0.4.12", + "httparse", + "log", + "mio", + "mio-extras", + "rand 0.7.3", + "sha-1", + "slab", + "url 2.1.1", +] + [[package]] name = "parking" version = "1.0.6" @@ -3729,7 +3663,7 @@ checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" dependencies = [ "fixed-hash", "impl-codec", - "impl-serde 0.3.1", + "impl-serde", "uint", ] @@ -3789,14 +3723,15 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd" +checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae" dependencies = [ "cfg-if", "fnv", "lazy_static", - "spin", + "parking_lot 0.11.0", + "regex", "thiserror", ] @@ -3818,7 +3753,7 @@ checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" dependencies = [ "bytes 0.5.6", "heck", - "itertools 0.8.2", + "itertools", "log", "multimap", "petgraph", @@ -3835,7 +3770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", - "itertools 0.8.2", + "itertools", "proc-macro2", "quote", "syn", @@ -4190,27 +4125,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rental" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f" -dependencies = [ - "rental-impl", - "stable_deref_trait", -] - -[[package]] -name = "rental-impl" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "retain_mut" version = "0.1.1" @@ -4234,9 +4148,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61aa17a99a2413cd71c1106691bf59dad7de0cd5099127f90e9d99c429c40d4a" +checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" dependencies = [ "libc", "librocksdb-sys", @@ -4355,9 +4269,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a46695a66db86ce460cffd11a6aec080e00502e9372facd26b2b3517e0fb95f" +checksum = "527f6822cf592ac2b4a6ca7d04601c48d6728b8c03d9a9cc0488e4b535c69c6d" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -4380,9 +4294,9 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82383c69e2f293e6cd3b3e5ad3665b5d61a700a4478a31e0cbdcffdea10951a9" +checksum = "5bee59dc560f30e72ee95c224e3e75299b53b619e659a38af9db2639803c08ee" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -4398,11 +4312,12 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6a3b2b731b95934560c5368769ba0450b372a0db04d5d80ab91a85d5be6d88" +checksum = "b3d0e4d53e723ee6bad8cadec9651086887d1d920996e1589ee7dfa767a7cba9" dependencies = [ "impl-trait-for-tuples", + "parity-scale-codec", "sc-chain-spec-derive", "sc-network", "sc-telemetry", @@ -4415,9 +4330,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7fd27254a972011700e661644588c836f8cf47bd5e4692e55590fcf31c7a86d" +checksum = "38af2ca789e2d2fa2aa0ec16d27dc648fa4d64ecb10760d2f552b2c86ea7a403" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4427,21 +4342,20 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa4f8b84f28478c4e3ae2e96857b289a0fd892884520d2c484ceefcd8aa959f" +checksum = "9a2ce2952f155bd72b85ff866c588b6bae8f1bc183275f1a7a54eee55535a640" dependencies = [ "ansi_term 0.12.1", "atty", "bip39", "chrono", "derive_more", - "env_logger", "fdlimit", "futures 0.3.5", "hex", "lazy_static", - "libp2p 0.22.0", + "libp2p", "log", "names", "nix", @@ -4471,19 +4385,22 @@ dependencies = [ "substrate-prometheus-endpoint", "time", "tokio 0.2.22", + "tracing", + "tracing-log", + "tracing-subscriber", ] [[package]] name = "sc-client-api" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad0e67083f458010898ba79c6863ce841c8d55b3c8c507f9a8afae7a15a251" +checksum = "9fafb2b2861e847657c4656d2ae2249c9f3f6a76fb92a22f750325b77e1fb4c8" dependencies = [ "derive_more", "fnv", "futures 0.3.5", "hash-db", - "hex-literal", + "hex-literal 0.3.1", "kvdb", "lazy_static", "log", @@ -4512,9 +4429,9 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1073163402675b042550121a2e1cb7db98d51849abc3ebc871fd36e707ed0871" +checksum = "6bc82e81fafb162ceda7635932c8b5d65b8bc7b021e49546ab913e2e2458524d" dependencies = [ "blake2-rfc", "hash-db", @@ -4543,9 +4460,9 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badd279fbfa94188cb49446eb9a4112fc7d3212f20faea3a8a00662341243f50" +checksum = "d6dd5b4e7a37bf78e85161bd6f01a09f0eb7cf49f2961d136885659ad6e30d49" dependencies = [ "sc-client-api", "sp-blockchain", @@ -4555,14 +4472,16 @@ dependencies = [ [[package]] name = "sc-consensus-pow" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "660ac58a1fe308b7044a25a3ab48cb1f060514cc73640d0807c1cd204efd3e92" +checksum = "df58ae29974dad1927843ae476442f02224cc89a608d66832ce042d3838c2591" dependencies = [ "derive_more", "futures 0.3.5", + "futures-timer 3.0.2", "log", "parity-scale-codec", + "parking_lot 0.10.2", "sc-client-api", "sp-api", "sp-block-builder", @@ -4578,9 +4497,9 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99435a9edd886f5f30be5d8ab0b328b9d1bd06e0949896640cc6311b3c2bd58d" +checksum = "af77c7fda9659559e257fe330af26e7c2e8f61583c2a5c45f4c9db73d58a902b" dependencies = [ "derive_more", "lazy_static", @@ -4606,9 +4525,9 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff18805f4cdfb46dbaab60765a87d3e3c25ae17032e4b2b807f7844f85ec5f9" +checksum = "6663e4d1d2f8255e6c1994ce548365a7631a82f7ab231d0b8a122cc2a0011949" dependencies = [ "derive_more", "log", @@ -4624,9 +4543,9 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec579a2de5717d393971b53f7db23b41da1f5da63b175b6e2c14e8e2c373a9b8" +checksum = "78aeea37a28b83af11fe621ee047758e125341db96efaf7f553a4180fe48d6b8" dependencies = [ "log", "parity-scale-codec", @@ -4640,9 +4559,9 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "698b29fd10438f00eaa393ec725ae33b6e19162471c429ea69236d766bf3292e" +checksum = "b81dbdbba0420bb4c0bf2a79bcbb78de5bd1349aad8467b3115f82be579b2972" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -4659,9 +4578,9 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528afd2d984ab1bc4667fb60b5d2fbd685bf286145f630be7bc8cdbff8d1858f" +checksum = "21bbf8b58ed80e1d375aaa8ee5dedf17f68fea30c900440a695fb630a1757283" dependencies = [ "derive_more", "hex", @@ -4676,9 +4595,9 @@ dependencies = [ [[package]] name = "sc-light" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2703ff0aff2636c45b0249cc144ee7f131b97d239f6696fc545ba16e295a1386" +checksum = "a00ce4c6f21d572549b8b8a55757a0e548ddd670ab89d9415125a4e09c0ffa74" dependencies = [ "hash-db", "lazy_static", @@ -4696,11 +4615,12 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cc74f4df8b0ab2c71d177c7bb1994fc3719276b8d9051b386d123d2f328ac9" +checksum = "b9e58ccd69ea8dd0c1e1d98e5e7ed2969aaf14d45dcf98416c679a968e752850" dependencies = [ "async-std", + "async-trait", "bitflags", "bs58", "bytes 0.5.6", @@ -4714,11 +4634,11 @@ dependencies = [ "futures_codec", "hex", "ip_network", - "libp2p 0.23.0", + "libp2p", "linked-hash-map", "linked_hash_set", "log", - "lru", + "lru 0.4.3", "nohash-hasher", "parity-scale-codec", "parking_lot 0.10.2", @@ -4750,9 +4670,9 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdeeeb906e69fed938acfd4772295f7007ee7c253425359889a61916e1e2c43" +checksum = "79495bd858351489fcebeb4e47821e15329ad5606f0d7983836e069005c3d9dd" dependencies = [ "bytes 0.5.6", "fnv", @@ -4778,12 +4698,12 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cd0f82759563667f55b43bc3242fe0822516919a639b1deb3501d6600a2a52" +checksum = "bbfaa3d62db8ad549e6d21b6e353e00e2e7338c8623c01c79e8f36b035266a4b" dependencies = [ "futures 0.3.5", - "libp2p 0.23.0", + "libp2p", "log", "serde_json", "sp-utils", @@ -4792,9 +4712,9 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5fcf2e03848137feb140c3e718f1787ec2a41dfc11ec77eebc73e22e3fb579" +checksum = "d42c942480b516b4bd4a32d1434f634126220cb00c8d482658700cc58dc22c6f" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -4802,9 +4722,9 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6de8c678e509abd67706c46110f47d7f17f8c86d2ae03c2d34dd1bf0af1ee" +checksum = "fbc3793d8ff10dbeb0b683151a1ea33570dc994195cc29451e0b72ce35179adc" dependencies = [ "futures 0.3.5", "hash-db", @@ -4835,9 +4755,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eee9cecea38a2052d41bc9f62a68ece2cb7a9f1b29c156bb49d77de1e7cb95a" +checksum = "cfb4b79b9b6b410c745a00eb4ead11b2ef0819e6eac970a5ec6415abf82777be" dependencies = [ "derive_more", "futures 0.3.5", @@ -4860,10 +4780,11 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f45d489660ccfc6ab172c6b00520dcfa1468d6abaa8cd599521df25b7af0b6" +checksum = "2f9118867e60870b99cc1877edb4c35878babe6696335841e5b636dcba2fdb3d" dependencies = [ + "futures 0.1.29", "jsonrpc-core", "jsonrpc-http-server", "jsonrpc-ipc-server", @@ -4873,13 +4794,14 @@ dependencies = [ "serde", "serde_json", "sp-runtime", + "substrate-prometheus-endpoint", ] [[package]] name = "sc-service" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb40d43fed89449bac132f2d6e3a477bb8df1053797d8bb30d22f6a2db56816" +checksum = "e04b2096d7dac26c52656cd2c85bc208d2ca3316ea2185fd775763d558a980da" dependencies = [ "derive_more", "directories", @@ -4927,6 +4849,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", + "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-utils", @@ -4939,9 +4862,9 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c85bf121dc25232c82cd5aa905084a14e7aadbd650bc9a3334894728026369" +checksum = "56341f78caf54af053889d1e863ca9b03004a3f471947805226fa8a6be9c9a59" dependencies = [ "log", "parity-scale-codec", @@ -4954,13 +4877,13 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690fb181755b30db7112f086ab815fdcb0ef273b703fc50d89e8e9930fb76ac3" +checksum = "5883219d0ccec3e4d50079ba63f8accc71659b93537cff66de326a382b138c4b" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", - "libp2p 0.23.0", + "libp2p", "log", "parking_lot 0.10.2", "pin-project", @@ -4976,9 +4899,9 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01e6f4e38e0d0daf42df5abf7b908c248314fdf7a5ca2a87356bdfcce2d2fc8" +checksum = "695f005588c8b6957e56c86bc4624969a0c1a8e4e4d2f4fe0bb4039a26a10503" dependencies = [ "erased-serde", "log", @@ -4990,14 +4913,15 @@ dependencies = [ "slog", "sp-tracing", "tracing", + "tracing-core", "tracing-subscriber", ] [[package]] name = "sc-transaction-graph" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4b349262cc33587bd53de7331f7ccd8bd2f29b7da1d0fab6e426cf6246559b" +checksum = "31fed765b519362f7ae824a2d3a2e6ee9912ac972e8ff61838d4ff0831cb3077" dependencies = [ "derive_more", "futures 0.3.5", @@ -5017,9 +4941,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a885d3dda5239eb7c8c49b2beb3ff3cfaf771418450a302c0fb143ba6b242b8" +checksum = "248d4bcde22c936b462e4aa6c32e0f49a96942b123a1a46bc60cd02fbf907002" dependencies = [ "derive_more", "futures 0.3.5", @@ -5240,7 +5164,7 @@ dependencies = [ [[package]] name = "sha3pow" -version = "2.0.0-rc6" +version = "2.0.0" dependencies = [ "parity-scale-codec", "rand 0.7.3", @@ -5399,9 +5323,9 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16378a5000d98a01b87fa8a40a5bf02cc483545cbae8125c456954330eee78e4" +checksum = "9e79a1db780708b6b71e9914e2b1d11b3e61c9bfb492c88b1024115e1a6661da" dependencies = [ "derive_more", "log", @@ -5412,9 +5336,9 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7467f7e20ded41f54cffec173588419dc9c3efb7fb1e73a4541a66774545f9cb" +checksum = "953a3296335d9761311763dbe6855109ea4bea915e27cf5633d8b01057898302" dependencies = [ "hash-db", "parity-scale-codec", @@ -5428,9 +5352,9 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da136f7fbc99517e5f6f16401110a16240f99d2fbff738b8666b0b10a1d638c7" +checksum = "8247ca24a2a881af2ac675c8ec33584944965d6d45645bbec16fe327ce42dce6" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -5441,9 +5365,9 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33508e0f9c96186eae2c73482ae02b463cb85fd80d42dc48d7b5cf778aad6ba" +checksum = "885eca124aa6ce0bba57c08bc48c4357096996d630a77f572580ef8e2e4df034" dependencies = [ "parity-scale-codec", "serde", @@ -5454,9 +5378,9 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f861e78b2de65df52d855ff668a00890160ab66afa25e8203f4240152e89085" +checksum = "667775bc50eb214225df18c92e4ec57acc7e2dc78d7d210eb4dd930db1a73995" dependencies = [ "integer-sqrt", "num-traits", @@ -5468,9 +5392,9 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6439b15294ed4eec9a2c330c7c834e2af2118cedd20db7f8be33bd2949c03800" +checksum = "07d7fca8aa126a9d295843d592f44b48d8cf93880862baeff2968164598ab26c" dependencies = [ "parity-scale-codec", "sp-api", @@ -5481,13 +5405,13 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f79c60117f539ee7a9c585722268f6b2b12999390f2c6ec53269977c10eae9c" +checksum = "e37387284973e2edceefaa673930282801ea238e5892a2cc6aa02f7f2e7601df" dependencies = [ "derive_more", "log", - "lru", + "lru 0.4.3", "parity-scale-codec", "parking_lot 0.10.2", "sp-block-builder", @@ -5499,9 +5423,9 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9eb83a5f50c95172e462843184f8a3d55798b58a68f31c46054fff1ec16b19" +checksum = "150ce7661d02d4d0509a4a8364ab3b71a5ef2faf3f97d22d4b76bc0786d9e28b" dependencies = [ "serde", "serde_json", @@ -5509,14 +5433,14 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24512668d65ee6026dd7e2fdfb18ea1aaeee0f59415a4abf969b67c2f968229d" +checksum = "b460103293bbf2f4193e43c4f031fdc099c5e27c782369bbb4dacc7765e84057" dependencies = [ "derive_more", "futures 0.3.5", "futures-timer 3.0.2", - "libp2p 0.23.0", + "libp2p", "log", "parity-scale-codec", "parking_lot 0.10.2", @@ -5536,9 +5460,9 @@ dependencies = [ [[package]] name = "sp-consensus-pow" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d379efbe898e988980f46c1ff3c5774ce5f70150a39389285e60cbdaab989" +checksum = "003032c128177be826760e3310a21c30bf87dd988a668db8ac0301f2045234cd" dependencies = [ "parity-scale-codec", "sp-api", @@ -5549,9 +5473,9 @@ dependencies = [ [[package]] name = "sp-core" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146765f2e906030c2d7fba4a685390407d5d0595b7e46716b2bcd6c7ac744579" +checksum = "e92ac5c674ee2cd9219d084301b4cbb82b28a94a0f3087bf4bea0ef3067ebb5c" dependencies = [ "base58", "blake2-rfc", @@ -5563,7 +5487,7 @@ dependencies = [ "hash-db", "hash256-std-hasher", "hex", - "impl-serde 0.3.1", + "impl-serde", "lazy_static", "libsecp256k1", "log", @@ -5594,9 +5518,9 @@ dependencies = [ [[package]] name = "sp-database" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23faeb4e1c660ddaa0c06ba2a0d51697e0eda10c7d9568005c3bafeff65f3027" +checksum = "4c1c352eceefe5bcdfc27f13a2fd038fc571b7aca5146f2cd651d40e9d2457dd" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -5604,9 +5528,9 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc56e04bc64020aa6c1a35fb74991ab8d2aa46ffc0b133145103d8b6304f195" +checksum = "8a3750b084e0f4677f6e834a974f30b1ba97fc2fe00185c9d03611a2228446dc" dependencies = [ "proc-macro2", "quote", @@ -5615,9 +5539,9 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ff5c062c4c36814d8aa21031b3fc7a16816db879965a910b98f49c6d80914e" +checksum = "9d87fcd0e0fc5e025459cfe769803488d4894e36d0f8cef80b5239d2e7ef6580" dependencies = [ "environmental", "parity-scale-codec", @@ -5627,9 +5551,9 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0c71c49638e89a2aa252d291625528d67a6efee6df0ffb88cbae32f3ca878e" +checksum = "365e5aee23640631e63e8634f1d804e33c8fcb521f4052910f29abaa2df1c1cf" dependencies = [ "derive_more", "parity-scale-codec", @@ -5640,9 +5564,9 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3668b7ee3720ffbea89308832f04cee067c8d40a06f9ced818d890cb2aae112f" +checksum = "b9e1dee9244eb6cba1bef9b3a4ec288185e1380e455f1fd348b60252592c1cf0" dependencies = [ "futures 0.3.5", "hash-db", @@ -5658,13 +5582,15 @@ dependencies = [ "sp-tracing", "sp-trie", "sp-wasm-interface", + "tracing", + "tracing-core", ] [[package]] name = "sp-keyring" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99472908ac61a50b9973c492e277db3295ba2314294c2e36e8dd41842fae6fc5" +checksum = "3f76feeb27b218d58523931ea2d708b622c3bd96a3be1c3a5895bba0f7a54c13" dependencies = [ "lazy_static", "sp-core", @@ -5674,9 +5600,9 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39724817f34c7311202eee09bdf3190f0c2f2f3852e1d228053227d44863217" +checksum = "fbd5e101b2510ad84adaeb4589e6a94fdc741242ab1e39b89c87a647133205ad" dependencies = [ "sp-api", "sp-core", @@ -5685,9 +5611,9 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a3e76c47eca218aa86c8a02942c62d71fb47b01feb1fc38d8297f93929a35e" +checksum = "492126eb766b3b6740e4e4929d6527d37708598b7296a664f3680c0f0c1fc573" dependencies = [ "backtrace", "log", @@ -5695,9 +5621,9 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f5c07f1dbfb9a50a1beaedaa9d2909758d25c94a591bfbd0a400b328fc7b22e" +checksum = "e5c6678f4b42421e6dcdf3896a0c81a403c29ef1cf8d74b046d59125d40da911" dependencies = [ "serde", "sp-core", @@ -5705,9 +5631,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb489c671d0dc1ec00f83550e259cc75ab5c25d0d41b901c7a35cda99da7964" +checksum = "62542f8ce9d5fcb43a4dd3c3a53326d33aacf9b0bc9d353d6fe9fd5ff3031747" dependencies = [ "either", "hash256-std-hasher", @@ -5728,9 +5654,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b63b4b5e0fd1488b545d908003cd8129c88c066af361f9b6483ac7c97d8f6c1" +checksum = "8b7e363c480cc8c9019b84f85d10c0b56a184079d5d840d2d1d55087ad835dc6" dependencies = [ "parity-scale-codec", "primitive-types", @@ -5745,9 +5671,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21c3ed5a0258faaa1370859bfdacf27d798f4205161a68289555eb1a1a6a4e41" +checksum = "85cf56a38544293e54dbe0aa7b6aed1e046bfc704b6fc3de7255897dca98ccb1" dependencies = [ "Inflector", "proc-macro-crate", @@ -5758,9 +5684,9 @@ dependencies = [ [[package]] name = "sp-serializer" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99a01e4c61cabad1e383f014e559b1390f5f98c43ccdd0492c0fc195f4a4047" +checksum = "643933e971979094c9d4b27b015c7250985a262e405bb9ad090336d8ceb5b2b9" dependencies = [ "serde", "serde_json", @@ -5768,9 +5694,9 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b571809d807be2244393de7ee5003e5b6f53187897d2302d988b38481bb4421" +checksum = "d138b1f548933003feaa967de49ed87066643073bcc41be45ef2daaa0991c133" dependencies = [ "parity-scale-codec", "sp-api", @@ -5782,9 +5708,9 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab31cfa1734a9548ebe4b87d10bcf658f835ee3b0c8f08f89f46eb7013f81a9" +checksum = "3b06f9839d8b4312486626bde31d6cd7763dd9b7d93ea9e70c01ca30f0998032" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -5793,12 +5719,11 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1d76c8c207b644ed9cabeeeb9eead95c72691db9e357fe56ab19285b36b2b4" +checksum = "5f58335de98bca196683a8ef22195a8a43b457b8bc705dba3124138ffc2ee720" dependencies = [ "hash-db", - "itertools 0.9.0", "log", "num-traits", "parity-scale-codec", @@ -5808,6 +5733,7 @@ dependencies = [ "sp-core", "sp-externalities", "sp-panic-handler", + "sp-std", "sp-trie", "trie-db", "trie-root", @@ -5815,17 +5741,17 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd69654cdd9fa179dad52811220356dc2991f70b3b93e77c27f4e317d58c059b" +checksum = "fa2d6e166cead2d3b1d3d8fe0e787d076b7d0296b1760a0d7d340846d0ba42c5" [[package]] name = "sp-storage" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0dba5526e0a1d2acc3d969cdcdf89f4e0395a1a6e807f5aa517ef15bf0e710" +checksum = "0f4625e6f8f40995939560f48f89028f658b7929657c68d01c571c81ab5619ff" dependencies = [ - "impl-serde 0.2.3", + "impl-serde", "parity-scale-codec", "ref-cast", "serde", @@ -5835,9 +5761,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59b7c9ea91411e7d18be5009ac38775843778edde563d791a4ba40fecaec4de" +checksum = "0cb398f0a5d2798ad4e02450b3089534547b448d22ebe6f3b2c03f74170f58d1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5850,20 +5776,23 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a43072c8a66b1f6cfec0bee7f3f2aa7866869317b5f430e8a2743551b77c4d" +checksum = "b9a5c42c5450991ca3a28c190e75122f5ccedbcb024953e7c357e7aa2afd8534" dependencies = [ "log", - "rental", + "parity-scale-codec", + "sp-std", "tracing", + "tracing-core", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748dbe5c6420dceb48ddabda8ba2ba80e1ef184f32c207ef2f9cb87e56a4ebd" +checksum = "83b34ee48341c17c6e2f1e55f6076918f46b0c4505a99ad69ab1edda8b45bbd8" dependencies = [ "derive_more", "futures 0.3.5", @@ -5877,9 +5806,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b27498caf2238d68df9ed9a8bf326622142119328ae41b17cafc36c6acafab" +checksum = "f3aae57c8ae81ba978503137a8c625d2963eb425dd90dec0d96b4ed18d8bfd55" dependencies = [ "hash-db", "memory-db", @@ -5892,9 +5821,9 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d45813274bd799a0e77d55f4ac225a59af1b4363142ca41bb38e29f699a76a81" +checksum = "84310a02e2ac89b5e288d7af980414fd88753e3caba92aab1983cd2819991150" dependencies = [ "futures 0.3.5", "futures-core", @@ -5905,11 +5834,11 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d075c051dc9dc75685c484463729d50d21930aa9068f652734598f8a882f6e0" +checksum = "21935199c8765f0d02facc718f9c83149a70ea684fb03612e5161c682b38a301" dependencies = [ - "impl-serde 0.2.3", + "impl-serde", "parity-scale-codec", "serde", "sp-runtime", @@ -5918,9 +5847,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb0c2a1c2bdbbd67c1b8f20a9c85606122e7227b67cf5cd9faf3df2f454a66b" +checksum = "f1c28225e8b7ec7e260f8b46443f8731abda206334cb75c740d2407693f38167" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6035,30 +5964,31 @@ dependencies = [ [[package]] name = "substrate-bip39" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c004e8166d6e0aa3a9d5fa673e5b7098ff25f930de1013a21341988151e681bb" +checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236" dependencies = [ "hmac", "pbkdf2", "schnorrkel", "sha2 0.8.2", + "zeroize", ] [[package]] name = "substrate-build-script-utils" -version = "2.0.0-rc6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf0107b85ed2f59e42d015274a3816ba3bd5b0f01a69818bc04d3ea94a242e3" +checksum = "f14feab86fe31e7d0a485d53d7c1c634c426f7ae5b8ce4f705b2e49a35713fcb" dependencies = [ "platforms", ] [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0-rc6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcccc8b56f8590db1f1e6acc8674187eb856ef42d7f93f3326e1fdbc10389f37" +checksum = "8d3e361741d066bfc29554b9f1bc8e4ac927eb4bd33dd8bb0486969edd8b0b5a" dependencies = [ "async-std", "derive_more", @@ -6552,9 +6482,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db63662723c316b43ca36d833707cc93dff82a02ba3d7e354f342682cc8b3545" +checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" dependencies = [ "lazy_static", ] @@ -6629,17 +6559,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "twofish" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1" -dependencies = [ - "block-cipher-trait", - "byteorder 1.3.4", - "opaque-debug 0.2.3", -] - [[package]] name = "twox-hash" version = "1.5.0" @@ -6740,6 +6659,16 @@ dependencies = [ "futures_codec", ] +[[package]] +name = "unsigned-varint" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" +dependencies = [ + "futures-io", + "futures-util", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -6770,12 +6699,12 @@ dependencies = [ [[package]] name = "utxo-runtime" -version = "2.0.0-rc6" +version = "2.0.0" dependencies = [ "frame-executive", "frame-support", "frame-system", - "hex-literal", + "hex-literal 0.2.1", "pallet-balances", "pallet-sudo", "pallet-timestamp", @@ -6798,7 +6727,7 @@ dependencies = [ [[package]] name = "utxo-workshop" -version = "2.0.0-rc6" +version = "2.0.0" dependencies = [ "futures 0.3.5", "hex", @@ -7097,24 +7026,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "ws" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94" -dependencies = [ - "byteorder 1.3.4", - "bytes 0.4.12", - "httparse", - "log", - "mio", - "mio-extras", - "rand 0.7.3", - "sha-1", - "slab", - "url 2.1.1", -] - [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -7138,14 +7049,14 @@ dependencies = [ [[package]] name = "yamux" -version = "0.4.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd37e58a1256a0b328ce9c67d8b62ecdd02f4803ba443df478835cb1a41a637c" +checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c" dependencies = [ "futures 0.3.5", "log", "nohash-hasher", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "rand 0.7.3", "static_assertions", ] diff --git a/README.md b/README.md index 99ad404..a706610 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A UTXO chain implementation on Substrate, with two self-guided workshops. Original [UXTO inspiration](https://github.com/0x7CFE/substrate-node-template/tree/utxo) by [Dmitriy Kashitsyn](https://github.com/0x7CFE). -Substrate Version: `2.0.0-rc6`. For educational purposes only. +Substrate Version: `2.0.0`. For educational purposes only. ## Table of Contents - [Installation](#Installation): Setting up Rust & Substrate dependencies @@ -26,7 +26,9 @@ curl https://sh.rustup.rs -sSf | sh # from https://rustup.rs instead rustup update nightly +rustup update nightly-2020-10-05 rustup target add wasm32-unknown-unknown --toolchain nightly +rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-05 rustup update stable ``` @@ -48,7 +50,7 @@ The following example takes you through a scenario where: 1. Compile and build a release node ```bash -cargo build --release +cargo +nightly-2020-10-05 build --release ``` 2. Start a node. The `--dev` flag will start a single mining node, and the `--tmp` flag will start it in a new temporary directory. diff --git a/node/Cargo.toml b/node/Cargo.toml index 9b01221..8dd1d1c 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -4,14 +4,14 @@ build = 'build.rs' edition = '2018' name = 'utxo-workshop' repository = 'https://github.com/substrate-developer-hub/utxo-workshop' -version = '2.0.0-rc6' +version = '2.0.0' [build-dependencies] -substrate-build-script-utils = '2.0.0-rc6' +substrate-build-script-utils = '2.0.0' [dependencies.utxo-runtime] path = '../runtime' -version = '2.0.0-rc6' +version = '2.0.0' [dependencies] futures = '0.3.1' @@ -20,24 +20,24 @@ structopt = '0.3.8' parity-scale-codec = '1.3.0' sha3 = "0.8" rand = { version = "0.7", features = ["small_rng"] } -sc-consensus-pow = '0.8.0-rc6' -sc-basic-authorship = '0.8.0-rc6' -sc-cli = '0.8.0-rc6' -sc-client-api = '2.0.0-rc6' -sc-consensus = '0.8.0-rc6' -sc-executor = '0.8.0-rc6' -sc-network = '0.8.0-rc6' -sc-service = '0.8.0-rc6' -sc-transaction-pool = '2.0.0-rc6' -sp-api = '2.0.0-rc6' -sp-blockchain = '2.0.0-rc6' -sp-consensus = '0.8.0-rc6' -sp-consensus-pow = '0.8.0-rc6' -sp-core = '2.0.0-rc6' -sp-inherents = '2.0.0-rc6' -sp-runtime = '2.0.0-rc6' -sp-timestamp = '2.0.0-rc6' -sp-transaction-pool = '2.0.0-rc6' +sc-consensus-pow = '0.8.0' +sc-basic-authorship = '0.8.0' +sc-cli = '0.8.0' +sc-client-api = '2.0.0' +sc-consensus = '0.8.0' +sc-executor = '0.8.0' +sc-network = '0.8.0' +sc-service = '0.8.0' +sc-transaction-pool = '2.0.0' +sp-api = '2.0.0' +sp-blockchain = '2.0.0' +sp-consensus = '0.8.0' +sp-consensus-pow = '0.8.0' +sp-core = '2.0.0' +sp-inherents = '2.0.0' +sp-runtime = '2.0.0' +sp-timestamp = '2.0.0' +sp-transaction-pool = '2.0.0' sha3pow = {path = './sha3pow'} hex = "0.4" diff --git a/node/sha3pow/Cargo.toml b/node/sha3pow/Cargo.toml index cd90317..c205b95 100644 --- a/node/sha3pow/Cargo.toml +++ b/node/sha3pow/Cargo.toml @@ -2,17 +2,17 @@ authors = ['Anonymous'] edition = '2018' name = 'sha3pow' -version = '2.0.0-rc6' +version = '2.0.0' [dependencies] parity-scale-codec = '1.3.0' sha3 = "0.8" rand = { version = "0.7", features = ["small_rng"] } -sc-consensus = '0.8.0-rc6' -sc-consensus-pow = '0.8.0-rc6' -sc-client-api = '2.0.0-rc6' -sp-api = '2.0.0-rc6' -sp-blockchain = '2.0.0-rc6' -sp-consensus-pow = '0.8.0-rc6' -sp-core = '2.0.0-rc6' -sp-runtime = '2.0.0-rc6' +sc-consensus = '0.8.0' +sc-consensus-pow = '0.8.0' +sc-client-api = '2.0.0' +sp-api = '2.0.0' +sp-blockchain = '2.0.0' +sp-consensus-pow = '0.8.0' +sp-core = '2.0.0' +sp-runtime = '2.0.0' diff --git a/node/sha3pow/src/lib.rs b/node/sha3pow/src/lib.rs index 1b3108a..878a3cf 100644 --- a/node/sha3pow/src/lib.rs +++ b/node/sha3pow/src/lib.rs @@ -119,40 +119,4 @@ impl, C> PowAlgorithm for Sha3Algorithm where Ok(true) } - - fn mine( - &self, - _parent: &BlockId, - pre_hash: &H256, - _pre_digest: Option<&[u8]>, - difficulty: Self::Difficulty, - round: u32 // The number of nonces to try during this call - ) -> Result, Error> { - // Get a randomness source from the environment; fail if one isn't available - let mut rng = SmallRng::from_rng(&mut thread_rng()) - .map_err(|e| Error::Environment(format!("Initialize RNG failed for mining: {:?}", e)))?; - - // Loop the specified number of times - for _ in 0..round { - - // Choose a new nonce - let nonce = H256::random_using(&mut rng); - - // Calculate the seal - let compute = Compute { - difficulty, - pre_hash: *pre_hash, - nonce, - }; - let seal = compute.compute(); - - // If we solved the PoW then return, otherwise loop again - if hash_meets_difficulty(&seal.work, difficulty) { - return Ok(Some(seal.encode())) - } - } - - // Tried the specified number of rounds and never found a solution - Ok(None) - } } diff --git a/node/src/cli.rs b/node/src/cli.rs index dd36ec2..874c2d1 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -1,4 +1,3 @@ -pub use sc_cli::Subcommand; use std::convert::TryInto; use structopt::StructOpt; @@ -28,3 +27,27 @@ fn parse_sr25519_public_key(i: &str) -> Result .try_into() .or(Err("invalid length for SR25519 public key".to_string())) } + +#[derive(Debug, StructOpt)] +pub enum Subcommand { + /// Build a chain specification. + BuildSpec(sc_cli::BuildSpecCmd), + + /// Validate blocks. + CheckBlock(sc_cli::CheckBlockCmd), + + /// Export blocks. + ExportBlocks(sc_cli::ExportBlocksCmd), + + /// Export the state of a given block into a chain spec. + ExportState(sc_cli::ExportStateCmd), + + /// Import blocks. + ImportBlocks(sc_cli::ImportBlocksCmd), + + /// Remove the whole chain. + PurgeChain(sc_cli::PurgeChainCmd), + + /// Revert the chain to a previous state. + Revert(sc_cli::RevertCmd), +} diff --git a/node/src/command.rs b/node/src/command.rs index dbe993f..476e0a2 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -16,10 +16,9 @@ use crate::service; use crate::chain_spec; -use crate::cli::Cli; +use crate::cli::{Cli, Subcommand}; use sc_cli::{SubstrateCli, RuntimeVersion, Role, ChainSpec}; use sc_service::PartialComponents; -use crate::service::new_partial; impl SubstrateCli for Cli { fn impl_name() -> String { @@ -69,18 +68,58 @@ impl SubstrateCli for Cli { pub fn run() -> sc_cli::Result<()> { let cli = Cli::from_args(); let default_sr25519_public_key = sp_core::sr25519::Public::from_raw([0; 32]); + let sr25519_public_key = cli.run.sr25519_public_key.unwrap_or(default_sr25519_public_key); match &cli.subcommand { - Some(subcommand) => { - let runner = cli.create_runner(subcommand)?; - runner.run_subcommand(subcommand, |config| { - let PartialComponents { client, backend, task_manager, import_queue, .. } - = new_partial(&config, default_sr25519_public_key)?; - Ok((client, backend, import_queue, task_manager)) + Some(Subcommand::BuildSpec(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) + }, + Some(Subcommand::CheckBlock(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.async_run(|config| { + let PartialComponents { client, task_manager, import_queue, ..} + = service::new_partial(&config, sr25519_public_key)?; + Ok((cmd.run(client, import_queue), task_manager)) + }) + }, + Some(Subcommand::ExportBlocks(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.async_run(|config| { + let PartialComponents { client, task_manager, ..} + = service::new_partial(&config, sr25519_public_key)?; + Ok((cmd.run(client, config.database), task_manager)) + }) + }, + Some(Subcommand::ExportState(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.async_run(|config| { + let PartialComponents { client, task_manager, ..} + = service::new_partial(&config, sr25519_public_key)?; + Ok((cmd.run(client, config.chain_spec), task_manager)) + }) + }, + Some(Subcommand::ImportBlocks(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.async_run(|config| { + let PartialComponents { client, task_manager, import_queue, ..} + = service::new_partial(&config, sr25519_public_key)?; + Ok((cmd.run(client, import_queue), task_manager)) + }) + }, + Some(Subcommand::PurgeChain(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|config| cmd.run(config.database)) + }, + Some(Subcommand::Revert(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.async_run(|config| { + let PartialComponents { client, task_manager, backend, ..} + = service::new_partial(&config, sr25519_public_key)?; + Ok((cmd.run(client, backend), task_manager)) }) }, None => { - let sr25519_public_key = cli.run.sr25519_public_key.unwrap_or(default_sr25519_public_key); let runner = cli.create_runner(&cli.run.base)?; runner.run_node_until_exit(|config| match config.role { Role::Light => service::new_light(config, sr25519_public_key), diff --git a/node/src/service.rs b/node/src/service.rs index e834771..c26521d 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -78,7 +78,7 @@ ServiceError> { client.clone(), Sha3Algorithm::new(client.clone()), 0, // check inherents starting at block 0 - Some(select_chain.clone()), + select_chain.clone(), inherent_data_providers.clone(), can_author_with, ); @@ -153,19 +153,17 @@ pub fn new_full(config: Configuration, sr25519_public_key: sr25519::Public) -> R let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()); - sc_consensus_pow::start_mine( + sc_consensus_pow::start_mining_worker( Box::new(pow_block_import), client.clone(), + select_chain, Sha3Algorithm::new(client.clone()), proposer, - None, // No preruntime digests - rounds, network, - std::time::Duration::new(2, 0), - // Choosing not to supply a select_chain means we will use the client's - // possibly-outdated metadata when fetching the block to mine on - Some(select_chain), + None, // No preruntime digests inherent_data_providers, + std::time::Duration::new(2, 0), + std::time::Duration::new(2, 0), can_author_with, ); } @@ -197,7 +195,7 @@ pub fn new_light(config: Configuration, sr25519_public_key: sr25519::Public) -> client.clone(), Sha3Algorithm::new(client.clone()), 0, // check inherents starting at block 0 - Some(select_chain), + select_chain, inherent_data_providers.clone(), // TODO what should I Really use here? This compiles, and the `can_author_with` from line 196 doesn't?? sp_consensus::AlwaysCanAuthor, diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index de5722f..ddf6941 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -4,12 +4,12 @@ edition = '2018' homepage = 'https://substrate.dev' name = 'utxo-runtime' repository = 'https://github.com/substrate-developers-hub/utxo-workshop' -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.balances] default-features = false package = 'pallet-balances' -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.codec] default-features = false @@ -19,11 +19,11 @@ version = '1.2.0' [dependencies.frame-executive] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.frame-support] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.serde] features = ['derive'] @@ -32,65 +32,65 @@ version = '1.0.101' [dependencies.sp-api] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-block-builder] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-consensus-pow] default-features = false -version = '0.8.0-rc6' +version = '0.8.0' [dependencies.sp-core] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-inherents] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-io] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-offchain] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-runtime] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-session] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-std] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-transaction-pool] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sp-version] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.sudo] default-features = false package = 'pallet-sudo' -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.frame-system] default-features = false -version = '2.0.0-rc6' +version = '2.0.0' [dependencies.timestamp] default-features = false package = 'pallet-timestamp' -version = '2.0.0-rc6' +version = '2.0.0' [dev-dependencies] hex-literal = "0.2.1" diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 9cfd45f..3da9f18 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -181,10 +181,7 @@ impl frame_system::Trait for Runtime { type AvailableBlockRatio = AvailableBlockRatio; /// Version of the runtime. type Version = Version; - /// Converts a module to the index of the module in `construct_runtime!`. - /// - /// This type is being generated by `construct_runtime!`. - type ModuleToIndex = ModuleToIndex; + type PalletInfo = PalletInfo; /// What to do if a new account is created. type OnNewAccount = (); /// What to do if an account is fully reaped from the system. @@ -209,9 +206,11 @@ impl timestamp::Trait for Runtime { parameter_types! { pub const ExistentialDeposit: u128 = 500; + pub const MaxLocks: u32 = 50; } impl balances::Trait for Runtime { + type MaxLocks = MaxLocks; /// The type for recording an account's balance. type Balance = Balance; /// The ubiquitous event type. diff --git a/runtime/src/utxo.rs b/runtime/src/utxo.rs index 8fcfeba..31ee455 100644 --- a/runtime/src/utxo.rs +++ b/runtime/src/utxo.rs @@ -325,7 +325,7 @@ mod tests { type MaximumBlockLength = MaximumBlockLength; type AvailableBlockRatio = AvailableBlockRatio; type Version = (); - type ModuleToIndex = (); + type PalletInfo = (); type AccountData = (); type OnNewAccount = (); type OnKilledAccount = ();