From be12db2d9a2a644fda4751ae5a0b4cfd1dcfd7f9 Mon Sep 17 00:00:00 2001 From: Aten Date: Thu, 18 Jun 2020 20:08:17 +0800 Subject: [PATCH] update substrate to real rc3 version(current is rc2) (#105) --- Cargo.lock | 479 +++++++++++++++++++++++---------------------- runtime/src/lib.rs | 26 +-- src/service.rs | 20 +- 3 files changed, 266 insertions(+), 259 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac07f9af67722..524835a39bb60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,7 +129,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -252,7 +252,7 @@ dependencies = [ "log", "peeking_take_while", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "regex", "rustc-hash", "shlex", @@ -800,7 +800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2127768764f1556535c01b5326ef94bd60ff08dcfbdc544d53e69ed155610f5d" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -934,7 +934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "synstructure", ] @@ -1008,16 +1008,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -1033,8 +1033,8 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -1048,8 +1048,8 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "11.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "11.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "serde", @@ -1059,8 +1059,8 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "bitmask", "frame-metadata", @@ -1084,41 +1084,41 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support-procedural-tools", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "frame-support-procedural-tools" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "frame-system" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1133,8 +1133,8 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sp-api", @@ -1278,7 +1278,7 @@ checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" dependencies = [ "proc-macro-hack", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -1740,7 +1740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -1825,9 +1825,9 @@ dependencies = [ [[package]] name = "jsonrpc-client-transports" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2307a7e78cf969759e390a8a2151ea12e783849a45bb00aa871b468ba58ea79e" +checksum = "ecbdaacc17243168d9d1fa6b2bd7556a27e1e60a621d8a2a6e590ae2b145d158" dependencies = [ "failure", "futures 0.1.29", @@ -1841,9 +1841,9 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25525f6002338fb4debb5167a89a0b47f727a5a48418417545ad3429758b7fec" +checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" dependencies = [ "futures 0.1.29", "log", @@ -1854,30 +1854,30 @@ dependencies = [ [[package]] name = "jsonrpc-core-client" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f9382e831a6d630c658df103aac3f971da096deb57c136ea2b760d3b4e3f9f" +checksum = "34221123bc79b66279a3fde2d3363553835b43092d629b34f2e760c44dc94713" dependencies = [ "jsonrpc-client-transports", ] [[package]] name = "jsonrpc-derive" -version = "14.0.5" +version = "14.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058" +checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "jsonrpc-http-server" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52860f0549694aa4abb12766856f56952ab46d3fb9f0815131b2db3d9cc2f29" +checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522" dependencies = [ "hyper 0.12.35", "jsonrpc-core", @@ -1890,21 +1890,22 @@ dependencies = [ [[package]] name = "jsonrpc-pubsub" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ca5e391d6c6a2261d4adca029f427fe63ea546ad6cef2957c654c08495ec16" +checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986" dependencies = [ "jsonrpc-core", "log", "parking_lot 0.10.2", + "rand 0.7.3", "serde", ] [[package]] name = "jsonrpc-server-utils" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f06add502b48351e05dd95814835327fb115e4e9f834ca42fd522d3b769d4d2" +checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb" dependencies = [ "bytes 0.4.12", "globset", @@ -1918,9 +1919,9 @@ dependencies = [ [[package]] name = "jsonrpc-ws-server" -version = "14.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017a7dd5083d9ed62c5e1dd3e317975c33c3115dac5447f4480fe05a8c354754" +checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc" dependencies = [ "jsonrpc-core", "jsonrpc-server-utils", @@ -2132,7 +2133,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f09548626b737ed64080fde595e06ce1117795b8b9fc4d2629fa36561c583171" dependencies = [ - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -2826,8 +2827,8 @@ dependencies = [ [[package]] name = "pallet-aura" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2845,8 +2846,8 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2861,8 +2862,8 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2881,8 +2882,8 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2894,8 +2895,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2912,8 +2913,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2926,8 +2927,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-benchmarking", "frame-support", @@ -2943,8 +2944,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "frame-system", @@ -2957,8 +2958,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -2975,8 +2976,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-support", "parity-scale-codec", @@ -3072,7 +3073,7 @@ checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -3182,7 +3183,7 @@ checksum = "2e0bf239e447e67ff6d16a8bb5e4d4bd2343acf5066061c0e8e06ac5ba8ca68c" dependencies = [ "proc-macro-hack", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -3240,7 +3241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -3318,7 +3319,7 @@ checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "version_check", ] @@ -3330,7 +3331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "syn-mid", "version_check", @@ -3423,7 +3424,7 @@ dependencies = [ "anyhow", "itertools", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -3468,9 +3469,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42934bc9c8ab0d3b273a16d8551c8f0fcff46be73276ca083ec2414c15c4ba5e" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ "proc-macro2", ] @@ -3746,7 +3747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -3921,8 +3922,8 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -3945,8 +3946,8 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -3961,8 +3962,8 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -3977,19 +3978,19 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "proc-macro-crate", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "sc-cli" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "ansi_term 0.12.1", "atty", @@ -4029,8 +4030,8 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "fnv", @@ -4065,8 +4066,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "blake2-rfc", "hash-db", @@ -4094,8 +4095,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "sc-client-api", "sp-blockchain", @@ -4105,8 +4106,8 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "futures 0.3.5", @@ -4136,8 +4137,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -4158,8 +4159,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "lazy_static", @@ -4185,8 +4186,8 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "log", @@ -4202,8 +4203,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "log", "parity-scale-codec", @@ -4217,8 +4218,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "assert_matches", "derive_more", @@ -4254,8 +4255,8 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -4271,8 +4272,8 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "hex", @@ -4286,8 +4287,8 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "bitflags", "bs58", @@ -4338,8 +4339,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -4353,8 +4354,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "bytes 0.5.4", "fnv", @@ -4380,8 +4381,8 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "libp2p", @@ -4393,8 +4394,8 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -4402,8 +4403,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "hash-db", @@ -4434,8 +4435,8 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "futures 0.3.5", @@ -4458,8 +4459,8 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -4473,8 +4474,8 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "exit-future", @@ -4482,6 +4483,7 @@ dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", "hash-db", + "jsonrpc-pubsub", "lazy_static", "log", "netstat2", @@ -4531,8 +4533,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "log", "parity-scale-codec", @@ -4545,8 +4547,8 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -4567,8 +4569,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "erased-serde", "log", @@ -4582,8 +4584,8 @@ dependencies = [ [[package]] name = "sc-transaction-graph" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "futures 0.3.5", @@ -4602,8 +4604,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "futures 0.3.5", @@ -4742,7 +4744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -4772,7 +4774,7 @@ version = "0.2.0" source = "git+https://github.com/chainx-org/light-bitcoin?branch=v2#324335e58fabeec485214a42d2461a6e37058e86" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -4887,7 +4889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -4958,8 +4960,8 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "log", @@ -4970,8 +4972,8 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "hash-db", "parity-scale-codec", @@ -4985,20 +4987,20 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "blake2-rfc", "proc-macro-crate", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "sp-application-crypto" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "serde", @@ -5009,8 +5011,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "integer-sqrt", "num-traits 0.2.11", @@ -5022,8 +5024,8 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sp-api", @@ -5034,8 +5036,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "log", @@ -5050,8 +5052,8 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "serde", "serde_json", @@ -5059,8 +5061,8 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "futures 0.3.5", @@ -5082,8 +5084,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sp-api", @@ -5096,8 +5098,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "base58", "blake2-rfc", @@ -5138,8 +5140,8 @@ dependencies = [ [[package]] name = "sp-database" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -5147,18 +5149,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "sp-externalities" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "environmental", "parity-scale-codec", @@ -5168,8 +5170,8 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "finality-grandpa", "log", @@ -5184,8 +5186,8 @@ dependencies = [ [[package]] name = "sp-finality-tracker" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -5194,8 +5196,8 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "parity-scale-codec", @@ -5206,8 +5208,8 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "hash-db", @@ -5226,8 +5228,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "lazy_static", "sp-core", @@ -5237,8 +5239,8 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "sp-api", "sp-core", @@ -5247,8 +5249,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "backtrace", "log", @@ -5256,8 +5258,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "serde", "sp-core", @@ -5265,8 +5267,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -5286,8 +5288,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "primitive-types", @@ -5301,20 +5303,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] [[package]] name = "sp-serializer" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "serde", "serde_json", @@ -5322,8 +5324,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sp-api", @@ -5335,8 +5337,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -5345,8 +5347,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "hash-db", "log", @@ -5364,13 +5366,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" [[package]] name = "sp-storage" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -5381,8 +5383,8 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5395,16 +5397,16 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "tracing", ] [[package]] name = "sp-transaction-pool" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "derive_more", "futures 0.3.5", @@ -5412,14 +5414,15 @@ dependencies = [ "parity-scale-codec", "serde", "sp-api", + "sp-blockchain", "sp-runtime", "sp-utils", ] [[package]] name = "sp-trie" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "hash-db", "memory-db", @@ -5432,8 +5435,8 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "futures 0.3.5", "futures-core", @@ -5443,8 +5446,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -5455,8 +5458,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5526,7 +5529,7 @@ dependencies = [ "heck", "proc-macro-error", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -5547,7 +5550,7 @@ checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" dependencies = [ "heck", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -5565,16 +5568,16 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-rpc-system" -version = "2.0.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "2.0.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -5594,8 +5597,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0-rc2" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +version = "0.8.0-rc3" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" dependencies = [ "async-std", "derive_more", @@ -5609,7 +5612,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#45b9f0a9cbf901abaa9f1fca5fe8baeed029133d" +source = "git+https://github.com/paritytech/substrate.git?tag=v2.0.0-rc3#34695a85650b58bcd7d7e2a677cafc2921251d68" [[package]] name = "subtle" @@ -5641,7 +5644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1425de3c33b0941002740a420b1a906a350b88d08b82b2c8a01035a3f9447bac" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "unicode-xid 0.2.0", ] @@ -5652,7 +5655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -5672,7 +5675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "unicode-xid 0.2.0", ] @@ -5746,7 +5749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab81dbd1cd69cd2ce22ecfbdd3bdb73334ba25350649408cc6c085f46d89573d" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -6099,7 +6102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", ] @@ -6146,7 +6149,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56" dependencies = [ - "rand 0.3.23", + "rand 0.7.3", ] [[package]] @@ -6329,7 +6332,7 @@ dependencies = [ "lazy_static", "log", "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "wasm-bindgen-shared", ] @@ -6352,7 +6355,7 @@ version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cd85aa2c579e8892442954685f0d801f9129de24fa2136b2c6a539c76b65776" dependencies = [ - "quote 1.0.5", + "quote 1.0.7", "wasm-bindgen-macro-support", ] @@ -6363,7 +6366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -6627,7 +6630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ "proc-macro2", - "quote 1.0.5", + "quote 1.0.7", "syn 1.0.22", "synstructure", ] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 7cf9108c6bd50..87fba6e616ba0 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -86,25 +86,25 @@ pub fn native_version() -> NativeVersion { } } +const AVERAGE_ON_INITIALIZE_WEIGHT: Perbill = Perbill::from_percent(10); parameter_types! { pub const BlockHashCount: BlockNumber = 2400; /// We allow for 2 seconds of compute with a 6 second average block time. pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND; pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75); /// Assume 10% of weight for average on_initialize calls. - pub const MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get() - .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get(); + pub MaximumExtrinsicWeight: Weight = + AvailableBlockRatio::get().saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT) + * MaximumBlockWeight::get(); pub const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; } impl frame_system::Trait for Runtime { - /// The identifier used to distinguish between accounts. - type AccountId = AccountId; + /// The ubiquitous origin type. + type Origin = Origin; /// The aggregated dispatch type that is available for extrinsics. type Call = Call; - /// The lookup mechanism to get account ID from whatever is passed in dispatchers. - type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; /// The index type for blocks. @@ -113,12 +113,14 @@ impl frame_system::Trait for Runtime { type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; + /// The identifier used to distinguish between accounts. + type AccountId = AccountId; + /// The lookup mechanism to get account ID from whatever is passed in dispatchers. + type Lookup = IdentityLookup; /// The header type. type Header = generic::Header; /// The ubiquitous event type. type Event = Event; - /// The ubiquitous origin type. - type Origin = Origin; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; /// Maximum weight of each block. @@ -145,12 +147,12 @@ impl frame_system::Trait for Runtime { /// /// This type is being generated by `construct_runtime!`. type ModuleToIndex = ModuleToIndex; + /// The data to be stored in an account. + type AccountData = (); /// What to do if a new account is created. type OnNewAccount = (); /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); - /// The data to be stored in an account. - type AccountData = (); } impl pallet_aura::Trait for Runtime { @@ -161,8 +163,6 @@ impl pallet_grandpa::Trait for Runtime { type Event = Event; type Call = Call; - type KeyOwnerProofSystem = (); - type KeyOwnerProof = >::Proof; @@ -171,6 +171,8 @@ impl pallet_grandpa::Trait for Runtime { GrandpaId, )>>::IdentificationTuple; + type KeyOwnerProofSystem = (); + type HandleEquivocation = (); } diff --git a/src/service.rs b/src/service.rs index fb0d621793463..11440176ae25f 100644 --- a/src/service.rs +++ b/src/service.rs @@ -43,12 +43,12 @@ macro_rules! new_full_start { crate::service::Executor, >($config)? .with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))? - .with_transaction_pool(|config, client, _fetcher, prometheus_registry| { - let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); + .with_transaction_pool(|builder| { + let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone()); Ok(sc_transaction_pool::BasicPool::new( - config, + builder.config().transaction_pool.clone(), std::sync::Arc::new(pool_api), - prometheus_registry, + builder.prometheus_registry(), )) })? .with_import_queue( @@ -212,15 +212,17 @@ pub fn new_light(config: Configuration) -> Result(config)? .with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))? - .with_transaction_pool(|config, client, fetcher, prometheus_registry| { - let fetcher = fetcher + .with_transaction_pool(|builder| { + let fetcher = builder + .fetcher() .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; - let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone()); + let pool_api = + sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher.clone()); let pool = sc_transaction_pool::BasicPool::with_revalidation_type( - config, + builder.config().transaction_pool.clone(), Arc::new(pool_api), - prometheus_registry, + builder.prometheus_registry(), sc_transaction_pool::RevalidationType::Light, ); Ok(pool)