From 49eaab967d748d696420434ba6a0e851f3030f1f Mon Sep 17 00:00:00 2001 From: Xiliang Chen Date: Tue, 26 May 2020 16:04:23 +1200 Subject: [PATCH] update to Substrate 2.0 (#246) * update to Substrate 2.0 * update for oracle --- Cargo.lock | 1003 ++++++++++------- Cargo.toml | 71 +- inspect/Cargo.toml | 12 +- modules/accounts/Cargo.toml | 18 +- modules/accounts/src/mock.rs | 11 +- modules/airdrop/Cargo.toml | 10 +- modules/airdrop/src/mock.rs | 1 + modules/auction_manager/Cargo.toml | 14 +- .../auction_manager/benchmarking/Cargo.toml | 18 +- .../auction_manager/benchmarking/src/mock.rs | 1 + modules/auction_manager/src/mock.rs | 1 + modules/cdp_engine/Cargo.toml | 16 +- modules/cdp_engine/benchmarking/Cargo.toml | 18 +- modules/cdp_engine/benchmarking/src/mock.rs | 1 + modules/cdp_engine/src/mock.rs | 1 + modules/cdp_treasury/Cargo.toml | 16 +- modules/cdp_treasury/src/mock.rs | 1 + modules/dex/Cargo.toml | 16 +- modules/dex/rpc/Cargo.toml | 6 +- modules/dex/rpc/runtime-api/Cargo.toml | 6 +- modules/dex/src/mock.rs | 1 + modules/emergency_shutdown/Cargo.toml | 14 +- .../benchmarking/Cargo.toml | 18 +- .../benchmarking/src/mock.rs | 1 + modules/emergency_shutdown/src/mock.rs | 1 + modules/homa/Cargo.toml | 6 +- modules/homa_treasury/Cargo.toml | 12 +- modules/honzon/Cargo.toml | 14 +- modules/honzon/benchmarking/Cargo.toml | 18 +- modules/honzon/benchmarking/src/mock.rs | 1 + modules/honzon/src/mock.rs | 1 + modules/loans/Cargo.toml | 14 +- modules/loans/src/mock.rs | 1 + modules/nominees_election/Cargo.toml | 14 +- modules/nominees_election/src/mock.rs | 1 + modules/polkadot_bridge/Cargo.toml | 12 +- modules/prices/Cargo.toml | 12 +- modules/prices/src/mock.rs | 1 + modules/primitives/Cargo.toml | 2 +- modules/staking_pool/Cargo.toml | 14 +- modules/staking_pool/rpc/Cargo.toml | 6 +- .../staking_pool/rpc/runtime-api/Cargo.toml | 6 +- modules/staking_pool/src/mock.rs | 1 + modules/support/Cargo.toml | 6 +- modules/template/Cargo.toml | 10 +- orml | 2 +- runtime/Cargo.toml | 74 +- runtime/src/lib.rs | 14 +- src/chain_spec.rs | 8 +- src/command.rs | 1 + src/rpc.rs | 9 +- src/service.rs | 95 +- utilities/Cargo.toml | 8 +- 53 files changed, 913 insertions(+), 726 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1695fca8a..5a1f835c0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,6 +46,7 @@ dependencies = [ "sc-network", "sc-offchain", "sc-rpc", + "sc-rpc-api", "sc-service", "sc-telemetry", "sc-transaction-pool", @@ -162,9 +163,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456d75cbb82da1ad150c8a9d97285ffcd21c9931dcb11e995903e7d75141b38b" +checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" dependencies = [ "gimli 0.21.0", ] @@ -228,18 +229,6 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" -[[package]] -name = "app_dirs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -dependencies = [ - "ole32-sys", - "shell32-sys", - "winapi 0.2.8", - "xdg", -] - [[package]] name = "approx" version = "0.3.2" @@ -292,7 +281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -301,20 +290,30 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5" +[[package]] +name = "async-macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421d59b24c1feea2496e409b3e0a8de23e5fc130a2ddc0b012e551f3b272bba" +dependencies = [ + "futures-core-preview", + "pin-utils", +] + [[package]] name = "async-std" -version = "1.5.0" +version = "0.99.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "538ecb01eb64eecd772087e5b6f7540cbc917f047727339a472dafed2185b267" +checksum = "44501a9f7961bb539b67be0c428b3694e26557046a52759ca7eaf790030a64cc" dependencies = [ - "async-task", - "broadcaster", - "crossbeam-channel", + "async-macros", + "async-task 1.3.1", + "crossbeam-channel 0.3.9", "crossbeam-deque", - "crossbeam-utils", + "crossbeam-utils 0.6.6", "futures-core", "futures-io", - "futures-timer 2.0.2", + "futures-timer 1.0.3", "kv-log-macro", "log", "memchr", @@ -327,6 +326,30 @@ dependencies = [ "slab", ] +[[package]] +name = "async-std" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a45cee2749d880d7066e328a7e161c7470ced883b2fd000ca4643e9f1dd5083a" +dependencies = [ + "async-task 3.0.0", + "crossbeam-utils 0.7.2", + "futures-channel", + "futures-core", + "futures-io", + "futures-timer 3.0.2", + "kv-log-macro", + "log", + "memchr", + "num_cpus", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "smol", + "wasm-bindgen-futures", +] + [[package]] name = "async-task" version = "1.3.1" @@ -337,6 +360,12 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "async-task" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17772156ef2829aadc587461c7753af20b7e8db1529bc66855add962a3b35d3" + [[package]] name = "async-tls" version = "0.7.0" @@ -415,9 +444,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.53.2" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb26d6a69a335b8cb0e7c7e9775cd5666611dc50a37177c3f2cedcfc040e8c8" +checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" dependencies = [ "bitflags", "cexpr", @@ -524,20 +553,6 @@ dependencies = [ "byte-tools", ] -[[package]] -name = "broadcaster" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c972e21e0d055a36cf73e4daae870941fe7a8abcd5ac3396aab9e4c126bd87" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "futures-util", - "parking_lot 0.10.2", - "slab", -] - [[package]] name = "bs58" version = "0.3.1" @@ -602,9 +617,9 @@ checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" [[package]] name = "cc" -version = "1.0.53" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "404b1fe4f65288577753b17e3b36a04596ee784493ec249bf81c7f2d2acd751c" +checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" dependencies = [ "jobserver", ] @@ -831,13 +846,36 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if", + "crossbeam-channel 0.4.2", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils 0.7.2", +] + +[[package]] +name = "crossbeam-channel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +dependencies = [ + "crossbeam-utils 0.6.6", +] + [[package]] name = "crossbeam-channel" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -848,7 +886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -860,7 +898,7 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.0", "cfg-if", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset", @@ -874,7 +912,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" dependencies = [ "cfg-if", - "crossbeam-utils", + "crossbeam-utils 0.7.2", +] + +[[package]] +name = "crossbeam-utils" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +dependencies = [ + "cfg-if", + "lazy_static", ] [[package]] @@ -928,9 +976,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c0346158a19b3627234e15596f5e465c360fcdb97d817bcb255e0510f5a788" +checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69" [[package]] name = "derive_more" @@ -940,7 +988,7 @@ checksum = "2127768764f1556535c01b5326ef94bd60ff08dcfbdc544d53e69ed155610f5d" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -1036,7 +1084,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -1130,7 +1178,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "synstructure", ] @@ -1219,18 +1267,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e085ec973163e0c957a3e25beddb97944689ea526f057a4b4592728ab45a357a" +checksum = "96d72d90bd5a8711d59def3f8950f2ca374850dbe3b0043f14a7234e0b359b8a" dependencies = [ "parity-scale-codec", ] [[package]] name = "frame-benchmarking" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d146476da2981e83811578fd5e21f84187f42393d23e1ce2fd4a14870e760f1" +checksum = "ffbf4811157937291a8060c0a34c0c5d53333918725def286baa625c3f149469" dependencies = [ "frame-support", "frame-system", @@ -1246,9 +1294,9 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6883afdada136802e51273ae7d6ebc03428f564fa8467c76a6d4c20dc5d6c9f" +checksum = "eb389a267d86c911b93f7fcf10192c2a540781695b3d426fede01be864f7d0e6" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -1265,9 +1313,9 @@ dependencies = [ [[package]] name = "frame-executive" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6747f1e57d9074911ddfa2c36506baa70895aba99a2d63293aaff4c8f5d788" +checksum = "686e4e6b9aa08c7d17c455019bd5b188b314462f08b22b0765261adcf565861b" dependencies = [ "frame-support", "frame-system", @@ -1281,9 +1329,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "11.0.0-alpha.8" +version = "11.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1f439f895a2969285d24d9e8903c2183a3378ca6ce58f1ffe4fa8cc7e3e40" +checksum = "f2c89262e407f0d2d498ae4abedbd874afb705c9c7fde59e5a027be268eb574f" dependencies = [ "parity-scale-codec", "serde", @@ -1293,9 +1341,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801c1c348d96f817484b57250a7adf82c6e7d6efd90cc39c553b3bdad3a05cb2" +checksum = "39726841194dad8d255a4cc204caacddcae276347a0370124d434fc787dc9c2d" dependencies = [ "bitmask", "frame-metadata", @@ -1306,6 +1354,7 @@ dependencies = [ "parity-scale-codec", "paste", "serde", + "smallvec 1.4.0", "sp-arithmetic", "sp-core", "sp-inherents", @@ -1318,45 +1367,45 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede36e595bf4deb14b39e3852c42572c63e87af587c10d3f034296175da18c47" +checksum = "01de227b018d4a8d3508108a00f5f4446eea751c3180dbcdf59cd85f49e48afd" dependencies = [ "frame-support-procedural-tools", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "frame-support-procedural-tools" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba02050eafbb4ae7751e9753ece93527e1c49902731517cb201463eef7f0a11" +checksum = "064b7f99c7407aac9d4d48a699516e315209ad28fd9d4d9a791225878dbd3d7c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e52653168aa702585a80016110a9ea6889f0f38300c3233c50f0e2e7feefa5" +checksum = "ced9dc0943b624756a030c2692cb79c2e7935330b12ad7fb9e3b5e9488b4120c" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "frame-system" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f2f6a94c034bbd2348771cd2c0b3a258ea8f240de2365ff9554764458059af" +checksum = "73f7492c9edfb9f1ed5c7aa73f82d2a43af3d93feae6c535aefea0664462cc7c" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1371,9 +1420,9 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a875054d7de286f58109000a05ffabf72512e9ba8227b47c0f295179d7f98e" +checksum = "66f50dd4e6a376582bd875f9287b3b322a358162cffbd1e82b2d10c9bcad62dd" dependencies = [ "parity-scale-codec", "sp-api", @@ -1524,7 +1573,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -1542,6 +1591,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "futures-timer" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7946248e9429ff093345d3e8fdf4eb0f9b2d79091611c9c14f744971a6f8be45" +dependencies = [ + "futures-core-preview", + "pin-utils", +] + [[package]] name = "futures-timer" version = "2.0.2" @@ -1553,6 +1612,10 @@ name = "futures-timer" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +dependencies = [ + "gloo-timers", + "send_wrapper 0.4.0", +] [[package]] name = "futures-util" @@ -1686,6 +1749,19 @@ dependencies = [ "regex", ] +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "goblin" version = "0.1.3" @@ -2011,7 +2087,7 @@ checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -2069,6 +2145,15 @@ 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.5" @@ -2161,7 +2246,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -2239,9 +2324,9 @@ dependencies = [ [[package]] name = "kv-log-macro" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d3beed37e5483887d81eb39de6de03a8346531410e1306ca48a9a89bd3a51" +checksum = "4ff57d6d215f7ca7eb35a9a64d656ba4d9d2bef114d741dc08048e75e2f5d418" dependencies = [ "log", ] @@ -2345,9 +2430,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ea742c86405b659c358223a8f0f9f5a9eb27bb6083894c6340959b05269662" +checksum = "057eba5432d3e740e313c6e13c9153d0cb76b4f71bfc2e5242ae5bdb7d41af67" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -2367,7 +2452,7 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multihash", - "parity-multiaddr 0.8.0", + "parity-multiaddr 0.9.0", "parking_lot 0.10.2", "pin-project", "smallvec 1.4.0", @@ -2376,9 +2461,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d2c17158c4dca984a77a5927aac6f0862d7f50c013470a415f93be498b5739" +checksum = "4f5e30dcd8cb13a02ad534e214da234eca1595a76b5788b645dfa5c734d2124b" dependencies = [ "asn1_der", "bs58", @@ -2392,7 +2477,7 @@ dependencies = [ "log", "multihash", "multistream-select", - "parity-multiaddr 0.8.0", + "parity-multiaddr 0.9.0", "parking_lot 0.10.2", "pin-project", "prost", @@ -2410,19 +2495,19 @@ dependencies = [ [[package]] name = "libp2p-core-derive" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329127858e4728db5ab60c33d5ae352a999325fdf190ed022ec7d3a4685ae2e6" +checksum = "f09548626b737ed64080fde595e06ce1117795b8b9fc4d2629fa36561c583171" dependencies = [ "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "libp2p-dns" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d0993481203d68e5ce2f787d033fb0cac6b850659ed6c784612db678977c71" +checksum = "3cc186d9a941fd0207cf8f08ef225a735e2d7296258f570155e525f6ee732f87" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2431,9 +2516,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38ca3eb807789e26f41c82ca7cd2b3843c66c5587b8b5f709a2f421f3061414" +checksum = "6438ed8ca240c7635c9caa3be6c5258bc0058553ae97ba81737f04e5d33804f5" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2447,9 +2532,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92cda1fb8149ea64d092a2b99d2bd7a2c309eee38ea322d02e4480bd6ee1759" +checksum = "41d6c1d5100973527ae70d82687465b17049c1b717a7964de38b8e65000878ff" dependencies = [ "arrayvec 0.5.1", "bytes 0.5.4", @@ -2474,11 +2559,11 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e908d2aaf8ff0ec6ad1f02fe1844fd777fb0b03a68a226423630750ab99471" +checksum = "51b00163d13f705aae67c427bea0575f8aaf63da6524f9bd4a5a093b8bda0b38" dependencies = [ - "async-std", + "async-std 0.99.12", "data-encoding", "dns-parser", "either", @@ -2496,9 +2581,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0832882b06619b2e81d74e71447753ea3c068164a0bca67847d272e856a04a02" +checksum = "34ce63313ad4bce2d76e54c292a1293ea47a0ebbe16708f1513fa62184992f53" dependencies = [ "bytes 0.5.4", "fnv", @@ -2512,9 +2597,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918e94a649e1139c24ee9f1f8c1f2adaba6d157b9471af787f2d9beac8c29c77" +checksum = "84fd504e27b0eadd451e06b67694ef714bd8374044e7db339bb0cdb83755ddf4" dependencies = [ "curve25519-dalek", "futures 0.3.5", @@ -2533,9 +2618,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bfbf87eebb492d040f9899c5c81c9738730465ac5e78d9b7a7d086d0f07230" +checksum = "c189cf1dfe4b3f01e2c0fe5e97a6f5df8aeb6f3569e26981015eb7c08015ce5f" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2548,9 +2633,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44ab289ae44cc691da0a6fe96aefa43f26c86c6c7813998e203f6d80f1860f18" +checksum = "b4a8101a0e0d5f04562137a476bf5f5423cd5bdab2f7e43a75909668e63cb102" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2563,24 +2648,25 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37ea44823d3ed223e4605da94b50177bc520f05ae2452286700549a32d81669" +checksum = "309f95fce9bec755eff5406f8b822fd3969990830c2b54f752e1fc181d5ace3e" dependencies = [ - "async-std", + "async-std 0.99.12", "futures 0.3.5", "futures-timer 3.0.2", "get_if_addrs", "ipnet", "libp2p-core", "log", + "socket2", ] [[package]] name = "libp2p-wasm-ext" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ac7dbde0f88cad191dcdfd073b8bae28d01823e8ca313f117b6ecb914160c3" +checksum = "f59fdbb5706f2723ca108c088b1c7a37f735a8c328021f0508007162627e9885" dependencies = [ "futures 0.3.5", "js-sys", @@ -2592,9 +2678,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6874c9069ce93d899df9dc7b29f129c706b2a0fdc048f11d878935352b580190" +checksum = "085fbe4c05c4116c2164ab4d5a521eb6e00516c444f61b3ee9f68c7b1e53580b" dependencies = [ "async-tls", "bytes 0.5.4", @@ -2613,9 +2699,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f91aea50f6571e0bc6c058dc0e9b270afd41ec28dd94e9e4bf607e78b9ab87" +checksum = "0b305d3a8981e68f11c0e17f2d11d5c52fae95e0d7c283f9e462b5b2dab413b2" dependencies = [ "futures 0.3.5", "libp2p-core", @@ -2710,9 +2796,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237" +checksum = "9e488db3a9e108382265a30764f43cfc87517322e5d04ae0603b32a33461dca3" dependencies = [ "hashbrown", ] @@ -3368,9 +3454,9 @@ checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" [[package]] name = "multihash" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47fbc227f7e2b1cb701f95404579ecb2668abbdd3c7ef7a6cbb3cc0d3b236869" +checksum = "f75db05d738947aa5389863aadafbcf2e509d7ba099dc2ddcdf4fc66bf7a9e03" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -3389,9 +3475,9 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" [[package]] name = "multistream-select" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74cdcf7cfb3402881e15a1f95116cb033d69b33c83d481e1234777f5ef0c3d2c" +checksum = "991c33683908c588b8f2cf66c221d8f390818c1bdcd13fce55208408e027a796" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -3583,16 +3669,6 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" -[[package]] -name = "ole32-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "once_cell" version = "1.4.0" @@ -3827,27 +3903,25 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30053f51607457afb60e38190fec5a234f1303aea44f18fabae6222a518a54cf" +checksum = "5d46281803743411850c0bd4280797388315022725bbebf15b6e9f254a35324e" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "sp-authorship", - "sp-core", "sp-inherents", - "sp-io", "sp-runtime", "sp-std", ] [[package]] name = "pallet-babe" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc818592d1467681d735917e4d068fabf68f8ddbec4c5cd3a85b5c025434cf66" +checksum = "7dd438031ed2350e16a5cff6cbda77ee145497e92e84671a3ea3b8611fde0e3c" dependencies = [ "frame-support", "frame-system", @@ -3868,25 +3942,24 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15039f4d4586f34d83588a1cb9dbd74ed0cd9e7c6df4c45da707bd8f3ed235f2" +checksum = "0b8f3e074b612fe0a33b1719fd4358eb9cd2fd24a0ae8e870cb62683fb673612" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "serde", - "sp-io", "sp-runtime", "sp-std", ] [[package]] name = "pallet-collective" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f596a5208d11de9629d8528b180472ef8a6e023b69aed7a1cd1b422804d885d5" +checksum = "e5c9e1de2693b5f1163e2cb23b06075b901997f1ce65b5f8bbd1f6ddd539c4fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -3901,9 +3974,9 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bee38fcd8fcc35695fe61bc8ccc71e49264c65d2df95ab8f74bfc5e1e7e663a" +checksum = "220cf62639ca785b2fcbb5c57d779157796805a1f7e32d0dad3f0fa5701245c3" dependencies = [ "frame-support", "frame-system", @@ -3918,9 +3991,9 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c14a3561e27c636f8012e19b5853af63e0552c6113ba141c34e176b7a129ab" +checksum = "5a17d1bfc324a694babc0e5bf0c00da3099afc7272e2aa6dfb9a164e68adf479" dependencies = [ "frame-support", "frame-system", @@ -3939,9 +4012,9 @@ dependencies = [ [[package]] name = "pallet-indices" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cf5e1462cab8d3b7fc3c949ca0e30d4414026719a723d266a88526e988b6ec" +checksum = "bbd779571d2e264cdf6e456d2a42e17c99504cbd407eb3a7d12e0b447a4083ec" dependencies = [ "frame-support", "frame-system", @@ -3956,9 +4029,9 @@ dependencies = [ [[package]] name = "pallet-membership" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7729e1407241efb7dc570f6bfe1dff53f45b90b330def7ff3720bf9974780c02" +checksum = "be6c6d0cca434aa85c358ff0e291ce386118cf09f54078c34b228a1065c35270" dependencies = [ "frame-support", "frame-system", @@ -3971,9 +4044,9 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e124db9e87cb5213189090346d92ccc603905b011e746b38743c0f7f771aa6" +checksum = "6d4b3bc9c2fa8fef7ee97bb92dcae78a60cbbae5828a0e131f5f04ffd32b8ee2" dependencies = [ "frame-support", "frame-system", @@ -3985,9 +4058,9 @@ dependencies = [ [[package]] name = "pallet-recovery" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036fd68bb70a9b52e0ca31da88c330b69829a287a3975b0ab49a4652bb80f98d" +checksum = "4345d29305170f34bf30d4882f36879e8eee35703554a3db2cce89d2a0e670b1" dependencies = [ "enumflags2", "frame-support", @@ -4001,9 +4074,9 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b944b9bc1bee36ae10168134de413c2429da43c163df90c0666afbf5f47f30" +checksum = "10ac03e07ad6b30430a47bc75c18a364b09b2020d013b64f27ea1b18173af018" dependencies = [ "frame-support", "frame-system", @@ -4011,7 +4084,6 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "serde", - "sp-io", "sp-runtime", "sp-session", "sp-staking", @@ -4021,9 +4093,9 @@ dependencies = [ [[package]] name = "pallet-staking" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6e7c8723fd3e86a698286d9e3a29d8d022364a9b67b27ca567664ce75e9dc2" +checksum = "a9d193031c5381d4fb389cf1db2c69a57d514b8d46deb2b4565ddfc73d1cbd53" dependencies = [ "frame-support", "frame-system", @@ -4032,7 +4104,6 @@ dependencies = [ "parity-scale-codec", "serde", "sp-application-crypto", - "sp-core", "sp-io", "sp-phragmen", "sp-runtime", @@ -4043,21 +4114,21 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1bf67639cd979e3642aaa77478a8cdeefbd859b95d72d0f2a66c562fb9562c" +checksum = "96761531dea8290e2ac3e7be08cb3b12af6d63e5fe01b7d309ee35ab56520bf2" dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "pallet-sudo" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9aa24cdbd0916706a764ae81bcb90bdcdc73d94e380b59a48bb195ca1f74e96" +checksum = "9889c949f6e9403038b9c5f15efeaaa7576fb9f49d0c2cbe9198e96cc088f918" dependencies = [ "frame-support", "frame-system", @@ -4070,9 +4141,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249f2f5688bc6c8fb43ceb36ac78d0a92ec0c6862b90c3b6a8bf0b94a2e4d672" +checksum = "f2cbc1bad543b991b526bff9a5c78af03c1a95f9f2845fe6934b4b05ccd95f47" dependencies = [ "frame-benchmarking", "frame-support", @@ -4088,23 +4159,24 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce6987f7e7eb7bd2f13a33416dacc3148ac2e6641cb172a98faef9408179eaf" +checksum = "cd6a70c9777c441b26fc27bd43b592851652d012691c34ef7c7c5845c19c08aa" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", + "smallvec 1.4.0", "sp-runtime", "sp-std", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9f0b87ca51c15924adddabf8a86b322550886b4701100d934e05ac260fcf06" +checksum = "74efe29e412d6a4a8400effb584557a5d056b6dc24677134618a186095ee6462" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4121,9 +4193,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1c5b6c895a1a35669431513d2a953d29e8c5fa04df05c354407de78e567ce3" +checksum = "dcb8465c1483997cac167cfa0a5a6aa802ed6fbc3c7f00e4b15337f4987d63e2" dependencies = [ "frame-support", "parity-scale-codec", @@ -4135,9 +4207,9 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75ca8a0e12bf64a71e0774148eb0f31e73518819d30ac5ffd738702289e86ea" +checksum = "44dcd7185203536472d59ba5c2cdf84ce45d1fa8a1752961a9e7b260a8f9eefc" dependencies = [ "frame-support", "frame-system", @@ -4150,9 +4222,9 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93b57387e9f1004cffb08a4b9b805b56659044634ad202ef07589442aa3d916" +checksum = "9277f433b171621dc13f1cad1ff6ef75dde2bdcaa3051db6c38276c0447485a6" dependencies = [ "frame-support", "frame-system", @@ -4198,9 +4270,9 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db35e222f783ef4e6661873f6c165c4eb7b65e0c408349818517d5705c2d7d3" +checksum = "12ca96399f4a01aa89c59220c4f52ac371940eb4e53e3ce990da796f364bdf69" dependencies = [ "arrayref", "bs58", @@ -4251,7 +4323,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -4283,7 +4355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2", - "syn 1.0.22", + "syn 1.0.25", "synstructure", ] @@ -4345,9 +4417,9 @@ dependencies = [ [[package]] name = "paste" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a229b1c58c692edcaa5b9b0948084f130f55d2dcc15b02fcc5340b2b4521476" +checksum = "3431e8f72b90f8a7af91dec890d9814000cb371258e0ec7370d93e085361f531" dependencies = [ "paste-impl", "proc-macro-hack", @@ -4355,14 +4427,14 @@ dependencies = [ [[package]] name = "paste-impl" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0bf239e447e67ff6d16a8bb5e4d4bd2343acf5066061c0e8e06ac5ba8ca68c" +checksum = "25af5fc872ba284d8d84608bf8a0fa9b5376c96c23f503b007dfd9e34dde5606" dependencies = [ "proc-macro-hack", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -4401,9 +4473,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "petgraph" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92" +checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" dependencies = [ "fixedbitset", "indexmap", @@ -4411,22 +4483,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d480cb4e89522ccda96d0eed9af94180b7a5f93fb28f66e1fd7d68431663d1" +checksum = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82996f11efccb19b685b14b5df818de31c1edcee3daa256ab5775dd98e72feb" +checksum = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -4441,6 +4513,18 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0deb65f46e873ba8aa7c6a8dbe3f23cb1bf59c339a81a1d56361dde4d66ac8" +dependencies = [ + "crossbeam-utils 0.7.2", + "futures-io", + "futures-sink", + "futures-util", +] + [[package]] name = "pkg-config" version = "0.3.17" @@ -4495,7 +4579,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "version_check", ] @@ -4507,16 +4591,16 @@ checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "syn-mid", "version_check", ] [[package]] name = "proc-macro-hack" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" +checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" [[package]] name = "proc-macro-nested" @@ -4526,9 +4610,9 @@ checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" [[package]] name = "proc-macro2" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f5ffe53a6b28e37c9c1ce74893477864d64f74778a93a4beb43c8fa167f639" +checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101" dependencies = [ "unicode-xid 0.2.0", ] @@ -4580,7 +4664,7 @@ checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26" dependencies = [ "bytes 0.5.4", "heck", - "itertools", + "itertools 0.8.2", "log", "multimap", "petgraph", @@ -4597,10 +4681,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" dependencies = [ "anyhow", - "itertools", + "itertools 0.8.2", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -4886,7 +4970,7 @@ checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" dependencies = [ "crossbeam-deque", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "num_cpus", ] @@ -4934,7 +5018,7 @@ checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -5037,7 +5121,7 @@ dependencies = [ "base64 0.11.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] @@ -5120,9 +5204,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4642892f8b92ed7a3402af425fcabed35652813dbd3b1689d8808a3a59859e80" +checksum = "ee85bbc540909244f78dd9325eee53fa755d8476939f96fa6d3c03adc4494e55" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5130,6 +5214,7 @@ dependencies = [ "parity-scale-codec", "sc-block-builder", "sc-client-api", + "sc-proposer-metrics", "sc-telemetry", "sp-api", "sp-blockchain", @@ -5138,14 +5223,15 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-transaction-pool", + "substrate-prometheus-endpoint", "tokio-executor 0.2.0-alpha.6", ] [[package]] name = "sc-block-builder" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1b5be3c97274faa61528af80d84a7f881c41b84bfeb473d328848327c458ca" +checksum = "e3605c5c7821eff9d990ccc7e4abfc06ae92315f3b0648c04c367c7c1e932f08" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5160,9 +5246,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecf7e2267f42d66cf1b5894ed26cb0f93bc86ec20b2671d329754c41ccc8517f" +checksum = "c85937b5b8fcda9213e193abdc3dfd60f9091a82b4747266f4fc95b290fba8ef" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5177,28 +5263,27 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5570c450f51a23eade7c9c41d7b57d7e993ffd6f2965c595a816ad0c0158076" +checksum = "409266980723c92fc5c60b4876b81f489541224cc0c3c177a48239d179fe34c4" dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "sc-cli" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da02165525fde48d931ac183305aace5238f9f2c82d05db893958b5d76d3395" +checksum = "397274fb2a7219b60e7ee2dce3b46f241a2f7d2c9b740b642455cf6758c39491" dependencies = [ "ansi_term 0.12.1", - "app_dirs", "atty", "chrono", - "clap", "derive_more", + "directories", "env_logger", "fdlimit", "futures 0.3.5", @@ -5232,9 +5317,9 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99718588c70ae9dcbb8d4f2b4a232d9608c3b4e450c84ca651863bc3b92fdca9" +checksum = "10a2226cd81bf100bcffa537ef35576e141690f8225948218ab0e47f7b6b6703" dependencies = [ "derive_more", "fnv", @@ -5269,9 +5354,9 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0987a05f0c4905197eec4e9819657fe6e107550deb6afc5895009c9d0814fac" +checksum = "74e1a2e58710294dfa825a56b77f544d7c279bef7216bdb3b41028bab904dd84" dependencies = [ "blake2-rfc", "hash-db", @@ -5299,9 +5384,9 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a357fdfbd672ad59aeccbcefa07e94853c83652bb6018080e4345cdeceb52c" +checksum = "0d76b9dcebc9c76fc979f954f9e2f4375140a5da1b118a129bde9423c2f6939d" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5311,9 +5396,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afb94dd52a4f9d5ca73ab6a00590a785bc23b7616e5047b15f8cb50da295034" +checksum = "49e104a842806e28928868fad89111333d5d01429ce268a55ced7def50fefa98" dependencies = [ "derive_more", "fork-tree", @@ -5354,9 +5439,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c26fe2a4998798efcc8171db68ea5a59d5080fc5bbf39d8f44e31e7fd9d7f220" +checksum = "0b4b20e603bf48a54b393d2411c054a551f088d7062b2051cefbae5f9bb98ad4" dependencies = [ "derive_more", "futures 0.3.5", @@ -5366,6 +5451,7 @@ dependencies = [ "sc-consensus-babe", "sc-consensus-epochs", "sc-keystore", + "sc-rpc-api", "serde", "sp-api", "sp-blockchain", @@ -5377,9 +5463,9 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832860ddc947c2e50f3574e8c8808e0047478d70cc2320b77231f406e84fbf36" +checksum = "c84e000720412831a814c38291ad4d9a542846833a5ed22480e5b13dec451170" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5391,9 +5477,9 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e2a4501fc2b0f9dd45a7a2ce2efeed282de6a3fa7d2e6587aabbe6ff6e876e" +checksum = "eb8cb8192ef8f2bd107bcdf85b7d742cc56dc61b218597c06c776e71f26feaf3" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5414,9 +5500,9 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d27643a13a7ae005d59c2d4b662d4a957225c97e2baff063cb0610f8411046" +checksum = "f20e2198a4c5262566bdd4b85ad768347216656ae26a6594aa7771d2a0d65bdb" dependencies = [ "log", "sc-client-api", @@ -5429,9 +5515,9 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df607e93136fd953d4b0c0965e50fe4e8096e05113a3926ee0e4ef3f96419e0" +checksum = "8e4b59e1a69d04b0c7586b4e5d764252ecf92895cba1e1ba5b2c97e3e455f2a5" dependencies = [ "derive_more", "lazy_static", @@ -5458,9 +5544,9 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120fac2a31f3e1db6666a4f83ed496d2de2538c6395669eecf160882996571d9" +checksum = "a3571d2588896aaa490c7088be5de6bcf8c36567851c4318826e886d27676ff7" dependencies = [ "derive_more", "log", @@ -5476,9 +5562,9 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098dca91b82fec02aa9b6910d62ec1b4e9fd59c8164f5ea931f5ddd4a2030486" +checksum = "6e5a6b7135e2300f2a85f2947e1716f3678184a423efd59573caa69ee6d1949f" dependencies = [ "log", "parity-scale-codec", @@ -5492,9 +5578,9 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2137d121f2ed1cb84081eb8577f53de705393cda4d582e1c9d49001da084c977" +checksum = "b9e4f3ca111bfe8e96fa15a9271a96d6ac551fa299499d03215714cfc7e4b7c4" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -5514,9 +5600,9 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e482398ef943250e9b87db96073a65315a8346f335f3cc423f07cdcebed8495" +checksum = "aad6acf40942450e756891d101f2a400388af367dc4aa1f9a27dc8aef5075277" dependencies = [ "assert_matches", "derive_more", @@ -5552,9 +5638,9 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331a768eb8184f081249d65ba60205f6c1c773499a352c02cb93364ab92e04c6" +checksum = "e00622bd858306e1f9a4e522f373e9e02ac4873d95e022525810ce648ee3bc5c" dependencies = [ "derive_more", "finality-grandpa", @@ -5570,9 +5656,9 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de60dbb9c7a2fb2ae7135bedfafff120707ce6360531cc7253765508854ff663" +checksum = "d2a0cdf03350a940b5a8ef7c33adcfa95352d54a3c9c51791a2f1d0f8adf8460" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -5588,9 +5674,9 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95c793b121902e1b9c25f1462b6899a8386cb471ddb539560d7e502cb38f8dc" +checksum = "d343fe5e352ca6a5d3db4e60c333d9248cc0965845a46724f0633c09346bb9d5" dependencies = [ "derive_more", "hex", @@ -5604,11 +5690,12 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c86c05925dd8ed72e932b6eee59651fa3815d1ea434bfd482df9b12b66beaa7" +checksum = "7e767860114bdd61c67de4d82cd3cc40c9eaa1ae6d9909ad52f89dc605dd63bd" dependencies = [ "bitflags", + "bs58", "bytes 0.5.4", "derive_more", "either", @@ -5656,9 +5743,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07715f7e7c253b1b1eabe0c0408e1dbd662f07eddc46e4507fee6f25992f227d" +checksum = "92948fb2a7a3ebce70b62bb1cec36b963edcf9527990d4e40d37c95285144b4c" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5672,9 +5759,9 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bf54ec6d3dd27bd26b8f2332557b7946785767ee4d251af8b923964b22ee24" +checksum = "03b00e31f6bad10e758cb5535d6ae82bb2085969134e8ea33779df23222a89a9" dependencies = [ "bytes 0.5.4", "fnv", @@ -5700,9 +5787,9 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf30d5e8501147b010703c0b83cc38bf13b297c663b220a99236fcef665a7c9" +checksum = "ebeb54176cfd98f586f0f1bf2fd045a8f103505ee08147bd0cface6400bb6d23" dependencies = [ "futures 0.3.5", "libp2p", @@ -5712,11 +5799,21 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "sc-proposer-metrics" +version = "0.8.0-rc1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c212ea7ce2b08eb513e212817782c598937d2eb7c5cc4c8c500ef54e3e56145" +dependencies = [ + "log", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-rpc" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5503c0545d7a79a0d05bcb41bb35c5b3b5d28b350ddf168cb89e6141371e3a7f" +checksum = "0c023d9770da6667e2653dca79136e8f26124c35e52a4123def4447b6a353d43" dependencies = [ "futures 0.3.5", "hash-db", @@ -5747,9 +5844,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51dd4ac4f4e0643146d0bcfbf8c0ad02d11c94834a4860b2417868c590730f7b" +checksum = "fac9da8779cad5f8ed053785c9b3752656bd47bb4d4efd2a9408d8785aa8052a" dependencies = [ "derive_more", "futures 0.3.5", @@ -5772,9 +5869,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d029f5a71c6ef043c1a6b3d8cc2d99e6dac44c80869032dd2894dd4c023677" +checksum = "928418c611d54f5a4cb1a5bda7c6aef0daacdca1b4e70e68ae3cc37d21d887e3" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5788,9 +5885,9 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265682168d60e300657ea99d1595bbf50d6994a5469e9dbbe0537edeea6ed48f" +checksum = "3d5008f81d141689b970d70824053f8460bb011bb2934fc4ab1c666054ae5b19" dependencies = [ "derive_more", "exit-future", @@ -5847,9 +5944,9 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158ad756775c7f5ce27bef41695b9485763b999145a3781d95efcb6d6c55e02e" +checksum = "84e3ae3859e289a9399ddf2b516f39ba69fbf0dac67980796da2092091737fb0" dependencies = [ "log", "parity-scale-codec", @@ -5862,9 +5959,9 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcb4a3df69e49910d4c1f4ae4b291618571cbede42679a29f70f36c83e02bdc" +checksum = "fd896720912a3ce4526849392ef718909d801e19ccd6ba91d0fd1e0aa018d224" dependencies = [ "bytes 0.5.4", "futures 0.3.5", @@ -5885,9 +5982,9 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b31cb270c27ba07f7deb90d5188b0d97bea1a711866edd2dd07881235c49b5" +checksum = "2d8141bbd8513b4dfcc73121fe285f018a134af0f03d186659309a4c7df627f0" dependencies = [ "erased-serde", "log", @@ -5901,9 +5998,9 @@ dependencies = [ [[package]] name = "sc-transaction-graph" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3209b2f4825d9dc6fd85fad566fa4c2fc0a9792ada4b23abcfa25d3c6c76f895" +checksum = "5a0abbfac17e840c415ef08532f6f2821752caf100d50269045d2865c0679267" dependencies = [ "derive_more", "futures 0.3.5", @@ -5922,9 +6019,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68baf30450f1922768fec420910e7f6a4add16fd4401ef1cd76045756d22e12f" +checksum = "710a10ec46423c7ed8ba632bce9733877fcc9c6e2472f2a27a489dbb2387856a" dependencies = [ "derive_more", "futures 0.3.5", @@ -5981,6 +6078,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +[[package]] +name = "scoped-tls-hkt" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e9d7eaddb227e8fbaaa71136ae0e1e913ca159b86c7da82f3e8f0044ad3a63" + [[package]] name = "scopeguard" version = "1.1.0" @@ -6004,7 +6107,7 @@ checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -6061,6 +6164,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4" +[[package]] +name = "send_wrapper" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" + [[package]] name = "serde" version = "1.0.110" @@ -6078,7 +6187,7 @@ checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -6112,9 +6221,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" +checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" dependencies = [ "block-buffer", "digest", @@ -6135,16 +6244,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "shell32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "shlex" version = "0.1.1" @@ -6208,7 +6307,7 @@ checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -6226,6 +6325,25 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" +[[package]] +name = "smol" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686c634ad1873fffef6aed20f180eede424fbf3bb31802394c90fd7335a661b7" +dependencies = [ + "async-task 3.0.0", + "crossbeam", + "futures-io", + "futures-util", + "nix", + "once_cell", + "piper", + "scoped-tls-hkt", + "slab", + "socket2", + "wepoll-binding", +] + [[package]] name = "snow" version = "0.6.2" @@ -6244,6 +6362,18 @@ dependencies = [ "x25519-dalek", ] +[[package]] +name = "socket2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "winapi 0.3.8", +] + [[package]] name = "soketto" version = "0.3.2" @@ -6266,9 +6396,9 @@ dependencies = [ [[package]] name = "sp-allocator" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e36dd7cae657c8fc53426539ed04667086f7fb06d2accb0bd5d4553e2d28f2" +checksum = "4f2ea936d3c137ef89d7f12207b351d2d61a03a8ebf4f2891f5c912e91d7bbdd" dependencies = [ "derive_more", "log", @@ -6279,9 +6409,9 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933f9371cf80450d9e9e6c1ca462d4d20ea93c498efa7e6eb3016ee3616e6346" +checksum = "1cdc455498c8bcf66093795a9bb691bae886fe738ccbb33703d446b7d421954a" dependencies = [ "hash-db", "parity-scale-codec", @@ -6295,22 +6425,22 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23654e5ada7302c765a5ac47d3f5ef44dc62bd4b0e217ba98340ff38599cbdb7" +checksum = "41840a56b81f49bfe200d52ddec6210844fe0394b324c144ac60679e53f0e2cd" dependencies = [ "blake2-rfc", "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "sp-application-crypto" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb42d9d466ce8451c5e8f14d2bcee480d8d103fc7c4e36bfe1576924612abea7" +checksum = "8ebf9e326f8e5e5cdbfe59c6a809c331b0730b6195c7c51e9ea910ba06870d71" dependencies = [ "parity-scale-codec", "serde", @@ -6321,14 +6451,13 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc1e6a199da5eb23d823fc2a5ae6587987b037d3ffd43112730bd7c8c9ce75" +checksum = "8cf1c2dae15153dca8c0070a701a1cc8d8fd75db752c530a57252c3afe9a69c9" dependencies = [ "integer-sqrt", "num-traits 0.2.11", "parity-scale-codec", - "primitive-types", "serde", "sp-debug-derive", "sp-std", @@ -6336,9 +6465,9 @@ dependencies = [ [[package]] name = "sp-authorship" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc5741e2656107421cf57cb204caae817a4cb66de3d035393b7e9edd08f0703" +checksum = "8549c5b19b4cf6b81b7a89048348410752b4fc463067ff876b35de0a2779d4d4" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6348,9 +6477,9 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ea1d9afe6a8ec6e64545ca446870c8d144a4f6c4df8c582a8aad8aa98899be" +checksum = "f07bd1907a79cb56647678b836afa451b6089dbd4a8f81f592fa7d62fdae332f" dependencies = [ "parity-scale-codec", "sp-api", @@ -6361,9 +6490,9 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381c1427e3afeff0ae2231c78762ecbf8ddd3abcc8c136368996cb8f8daf51a4" +checksum = "b06c80d7c123743d5ff1782254801fbc69b3320dfb6d31f0d435b5f4ac69ba93" dependencies = [ "derive_more", "log", @@ -6378,9 +6507,9 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9af65a2d6c4c46b027132dd334a5fbe6996cc9b2c2a8371d991cabb42f72c75" +checksum = "db27c5f2a66495213e1acc9b6d34ceb4e2579aced375237e38c71786436db078" dependencies = [ "serde", "serde_json", @@ -6388,9 +6517,9 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19818d06577989480d1caaa7ecd57a30191d1d06afc76f21525cc4bbe1f56eb2" +checksum = "2b81a1251e2af22b65a8594e37fa2c76c52e6369c5a7086121a066f1b18d6d0c" dependencies = [ "derive_more", "futures 0.3.5", @@ -6412,9 +6541,9 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d8ecfe618bf718a0dfa803653c8379237443e6c2576c95484a45a10d88dad2" +checksum = "1e31b0e64263672c408bda662a2cd3951c1583eace8f6501c3b44ccf168ee3f3" dependencies = [ "merlin", "parity-scale-codec", @@ -6430,9 +6559,9 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0b9c10cc6e272b8f7b7a7510ba37fbeea9fab19395ec5025fd458f1490447a" +checksum = "43696b11cb98e0b117a1b1cc5dde8f99181f3eb9fbbb64e9775c4448765df21d" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6443,9 +6572,9 @@ dependencies = [ [[package]] name = "sp-core" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849ec70fd5290d8cc06b437c6e3d4c0b1d51325ce0b58979c7d614237c92d0de" +checksum = "93fe0027d63bb554f2200efeebf4d67424dbaf1c225dab6362181b41e270e1d9" dependencies = [ "base58", "blake2-rfc", @@ -6486,9 +6615,9 @@ dependencies = [ [[package]] name = "sp-database" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ba5b65f8aea3031f7150ed35f458c70a072f594f9def3259702c2e02b36d9b" +checksum = "4688f3517361da44fa18bffb6307f3bd83d76a22ea8f8544473506dc1365e1b1" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6496,20 +6625,20 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aefdbd18f023868a6bc1290f276ef3016df1eafda3a2e053522de3592be2f4b0" +checksum = "cbcd16087f1c28c33f7e5ffe000c6e09483b10d847f4acbad6ac735de4425472" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "sp-externalities" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b324150bcfe32e24b864e76fb7dcfe56a55abddd10f1d5f4fdaa46106eb573a" +checksum = "2c4b44de486095c23dd0309d1691c930626a47839d659f69a283e784a7618693" dependencies = [ "environmental", "parity-scale-codec", @@ -6519,9 +6648,9 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd7892eb6595ad28a38e44359fc56fd82c9a296a1e18ccb7e3d26b482258828" +checksum = "85dc5d5ada6255783aa5b5ca40ce5d936e41ddb09288ac686ea02e1804aa77dd" dependencies = [ "finality-grandpa", "log", @@ -6536,9 +6665,9 @@ dependencies = [ [[package]] name = "sp-finality-tracker" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64f2379722c52149c66f41eef94e1d44fb0791595197c2ce3072f92106aa2f1" +checksum = "e5f3dbeb6da1924b9d48d145103bade7aaf04a2a9df12ae722b2c8d738713e65" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6547,9 +6676,9 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8070a314f6e58392d205ec342431e6ba5f4499d953e3df99ea143e811174fbfc" +checksum = "51ba01e574d382270ff0d0ae0878b744a68aa2606fe7fb8c71cba069176c51e1" dependencies = [ "derive_more", "parity-scale-codec", @@ -6560,9 +6689,9 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4f40d5b30c223376358fcd6fbaddad347731ada946c613d0652a1ec92c5765" +checksum = "5b41aecfb4802a89f6b32afc8cb6f49731e4ee287b7ab62228f579ca640ee01e" dependencies = [ "futures 0.3.5", "hash-db", @@ -6581,9 +6710,9 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "515714a1fd5b3413e8d68f7d980a0ba5836c489b29bd52ee428853895ae12bcf" +checksum = "74c6a87956f75ee95eef50c44f69d57a8db885cffe529997c07e42cc7e9d9cc3" dependencies = [ "lazy_static", "sp-core", @@ -6593,9 +6722,9 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aef3991346d6a7775226352ecb3fdc0d704fc496eb97340ab8c04ec51a5ba89" +checksum = "ef9504d3a69e573f87fe8e8f7d54597f796b1699e36b924b08fb535ba85f1fd4" dependencies = [ "sp-api", "sp-core", @@ -6604,9 +6733,9 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79abaffc0fa0ebcf7e502cb47f9a71a9d6404b50a3a8f473450cb50e2431055f" +checksum = "a242ce0269a635f914106f0c77aa96d2ed7377a0ac1f216b77c9951b2846253a" dependencies = [ "backtrace", "log", @@ -6614,9 +6743,9 @@ dependencies = [ [[package]] name = "sp-phragmen" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d54a72e1cd6288b335b789c4e3d7c3f51b0ec2ecda7b225e17947a34f097ddf" +checksum = "b092de137025ea911c129d72e0b411e17cbe226446c03cc765d5d77f4f4f724d" dependencies = [ "parity-scale-codec", "serde", @@ -6627,21 +6756,21 @@ dependencies = [ [[package]] name = "sp-phragmen-compact" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb03d4c62d5ff85f574cfe41771da9bfd7f7f138016f0fb56ed4692deac013c" +checksum = "4d76803ecd9c4aeff7cee48222770f0b81947ffeef4629efc521e246c27186c7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "sp-rpc" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b0b26e87aa1977ce9f8b3e237ececdcd8846b21cd3afc0b9d49a9258257500" +checksum = "2097233a57c4ba8a67174f7da19339c826f96baa187a97a76ede4f0c29f4d549" dependencies = [ "serde", "sp-core", @@ -6649,9 +6778,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bac084804973620b6b2e1bdad255cc05c43ea25e8125e06c5639aee3fa11de1" +checksum = "39b8415ff75b453ea26840c9daaba27c64d20a7d8de23af1ecf46d01ceeb8f5c" dependencies = [ "hash256-std-hasher", "impl-trait-for-tuples", @@ -6671,9 +6800,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7897c32765159395cddf64f132e77dcb6990c24f770cd02a5f7878f14b41c153" +checksum = "98c8d54c5dbd003fdeb5d60d55f9dcca5a6425564cb7297bf230ac712f1ac5bb" dependencies = [ "parity-scale-codec", "primitive-types", @@ -6687,22 +6816,22 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f359e902a02eb1158dccc3de3f7f3c5fea2f8fc5272086e8416e38c5605253" +checksum = "3c8ad8b29013f03d6b0ed65dceadfa2d0bf847cb4531d53986ebcf28a4b8989b" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] name = "sp-serializer" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b8ea58d6a17d8d5ada589b8b4220e8bdf20472d68d538ccabba03324d03c0f" +checksum = "8528584d0eb2a9d48499993c6d62cbe1fdf6f45422e6c898ed1e267bc7231e87" dependencies = [ "serde", "serde_json", @@ -6710,9 +6839,9 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea67e2ff2c4196e7b17053fdf0c03d5a51f5656ebfcc3a0b8301aa41380db59" +checksum = "028cb87666ac84afd8da3f7c6bbe29c31bf416f6b3d3a438c9001ef1fe289c85" dependencies = [ "parity-scale-codec", "sp-api", @@ -6724,9 +6853,9 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf5237a93b46f0d6e1335c2d8a49fbda2931069936d272d5f6afcfeef44661b" +checksum = "fd7c81d6b97fbdae95ff64ddb5e2a0bb2ba020090b48ba52db07edbf5012c1bc" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6735,9 +6864,9 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27609369f90fed83d8fddc1bab03d09a9d21fa88b66a941e8f038127045be0fd" +checksum = "f53788d5ecc3353768158698342bc1a14c78e180a2109d84d7238fa3589f475a" dependencies = [ "hash-db", "log", @@ -6755,15 +6884,15 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5b34f340ab6df2f41bbc308971f1b3f35d6bb07a76df6227e865a75a01a167" +checksum = "e1b3a679374614e8cd469ee3579c74bf60555eca3e34be8bfb31e6905ade8a8a" [[package]] name = "sp-storage" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98af4c5c38bb3d0daf8fc8440f105cfca62562585edbf250a008c51b9a6c05ae" +checksum = "b82508a3362e53dc0558817a26dc784a247dd088dabfc7de05063282d44158e1" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -6774,9 +6903,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a446274b36d9e7a80aa6dd5c08972b5f65b6bec088ec3d4899d3572b61ff14d" +checksum = "d51fae3a580ec624a07af97ba4bf834d049837502f088d6c2fdb68274de85144" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6789,18 +6918,18 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e014ecb675d4d3b5aa4f51e5a1458b831694af12aabeecbbd7026866c213c78b" +checksum = "ebbea0d8efd38a4c1a116a35e1716edf335e8bf77a88af3359bbb038a00f39b6" dependencies = [ "tracing", ] [[package]] name = "sp-transaction-pool" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe87996439ee428a4bd36bd5c39f1bf4cceb11cd16835dff6d824618b0c446ec" +checksum = "743484a2430ef9e61980468423cd87c4ce4a9a70b518a42dcc6d28573d7aa35c" dependencies = [ "derive_more", "futures 0.3.5", @@ -6814,9 +6943,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12249dafa9241cf1f5277c780f7f53a7274dc24c33fd5a18971598b5d53957e9" +checksum = "0d2c48a303498b34fbb2ed780b81a0f3ec25dcc45bb4c7f5a7e33863578a6e1e" dependencies = [ "hash-db", "memory-db", @@ -6829,9 +6958,9 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99afe6724ca66246771a6217f5b42688c4091459e2a50ad4d197d4176e3cae14" +checksum = "36b1a835f6b1f3f391ad94faac1e2fdada6d7dbb4ef6409e6a9f53ec745c7b24" dependencies = [ "futures 0.3.5", "futures-core", @@ -6841,9 +6970,9 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752d3997f1bc4df69f230741f331fbf5a777197262a635919be1a905d40f8f9c" +checksum = "4aaee466aabc480c4c1edc54a6560695ab827414f3c5aecc58d181fd67b1180d" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -6854,9 +6983,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68b4ae291c49f6fddbb2d5cd4d622cc4620bcfcd3931438dee3b8ee7b901968" +checksum = "94c5b3c49173fe2163a17c1a14f17ac6087258c1d458853a0fb9b27f53ac9f9b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6936,7 +7065,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -6957,7 +7086,7 @@ dependencies = [ "heck", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -6974,18 +7103,18 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0fa55015128457f926cbc29d8ffae6b99be98ca0bbcca90266ab1847e1787a" +checksum = "b8e82bda182b827de9bc45ead0c654f195579afe5baf8bfcb0300af2f49e2662" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-rpc-system" -version = "2.0.0-alpha.8" +version = "2.0.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1160225cfa404a433ff933a950d433501d7b8919bf4b74fd8b1cb386cd81c9" +checksum = "0511f1fda6c65fd69f4db5fe9268458501f876d62d2225bfbad7ae2cdd37c971" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7005,11 +7134,11 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.0-alpha.8" +version = "0.8.0-rc1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7080bfc85d2f3b75ef9b75157ae249bf6bbade1d0a23d8a4d5aa35d47f691fa8" +checksum = "b1feede30cdf68ae7e008ea1795c639db8c222ac49175410832ff2900860bce9" dependencies = [ - "async-std", + "async-std 1.6.0", "derive_more", "futures-util", "hyper 0.13.5", @@ -7026,9 +7155,9 @@ checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a" [[package]] name = "substrate-wasmtime" -version = "0.16.0-threadsafe.3" +version = "0.16.0-threadsafe.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b0d8eca5d0186e98c8d13399423853e2356b593e028b53e43b2aa35e9105a82" +checksum = "6bd62264edc1a5f3ef44d86fb0c11c9fb142894b9a2da034f34afae482080d7a" dependencies = [ "anyhow", "backtrace", @@ -7049,9 +7178,9 @@ dependencies = [ [[package]] name = "substrate-wasmtime-jit" -version = "0.16.0-threadsafe.3" +version = "0.16.0-threadsafe.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95772b1778186e4f5c9ae9148bab9911cddf563805a403dee418780e2ed14b4" +checksum = "4ce43c159d4f3ef6b19641e1ae045847fd202d8e2cc74df7ccb2b6475e069d4a" dependencies = [ "anyhow", "cfg-if", @@ -7076,9 +7205,9 @@ dependencies = [ [[package]] name = "substrate-wasmtime-profiling" -version = "0.16.0-threadsafe.3" +version = "0.16.0-threadsafe.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8a0bf9ca20bee7d83338470247a3f1823158382ebd51fadefcc986e0a6c3de" +checksum = "c77f0ce539b5a09a54dc80a1cf0c7cd7e694df11029354fe50a2d5fe889bdb97" dependencies = [ "anyhow", "cfg-if", @@ -7095,9 +7224,9 @@ dependencies = [ [[package]] name = "substrate-wasmtime-runtime" -version = "0.16.0-threadsafe.3" +version = "0.16.0-threadsafe.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a559895fe1efab16d1c490199225ae35c153ed432ef87ebc177fb37edbd20c7c" +checksum = "46516af0a64a7d9b652c5aa7436b6ce13edfa54435a66ef177fc02d2283e2dc2" dependencies = [ "backtrace", "cc", @@ -7138,9 +7267,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.22" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1425de3c33b0941002740a420b1a906a350b88d08b82b2c8a01035a3f9447bac" +checksum = "f14a640819f79b72a710c0be059dce779f9339ae046c8bef12c361d56702146f" dependencies = [ "proc-macro2", "quote 1.0.6", @@ -7155,7 +7284,7 @@ checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -7175,7 +7304,7 @@ checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "unicode-xid 0.2.0", ] @@ -7240,22 +7369,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5976891d6950b4f68477850b5b9e5aa64d955961466f9e174363f573e54e8ca7" +checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab81dbd1cd69cd2ce22ecfbdd3bdb73334ba25350649408cc6c085f46d89573d" +checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -7395,7 +7524,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", ] @@ -7438,7 +7567,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", "lazy_static", "log", @@ -7453,9 +7582,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a" +checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" dependencies = [ "futures-core", "rustls", @@ -7506,7 +7635,7 @@ checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", "lazy_static", "log", @@ -7521,7 +7650,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.29", "slab", "tokio-executor 0.1.10", @@ -7608,7 +7737,7 @@ checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", ] [[package]] @@ -7801,9 +7930,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" [[package]] name = "void" @@ -7859,7 +7988,7 @@ dependencies = [ "log", "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "wasm-bindgen-shared", ] @@ -7893,7 +8022,7 @@ checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7914,7 +8043,7 @@ dependencies = [ "js-sys", "parking_lot 0.9.0", "pin-utils", - "send_wrapper", + "send_wrapper 0.2.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -8056,6 +8185,25 @@ dependencies = [ "webpki", ] +[[package]] +name = "wepoll-binding" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374fff4ff9701ff8b6ad0d14bacd3156c44063632d8c136186ff5967d48999a7" +dependencies = [ + "bitflags", + "wepoll-sys", +] + +[[package]] +name = "wepoll-sys" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9082a777aed991f6769e2b654aa0cb29f1c3d615daf009829b07b66c7aff6a24" +dependencies = [ + "cc", +] + [[package]] name = "which" version = "3.1.1" @@ -8147,12 +8295,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "xdg" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" - [[package]] name = "yamux" version = "0.4.5" @@ -8184,24 +8326,24 @@ checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ "proc-macro2", "quote 1.0.6", - "syn 1.0.22", + "syn 1.0.25", "synstructure", ] [[package]] name = "zstd" -version = "0.5.1+zstd.1.4.4" +version = "0.5.2+zstd.1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f" +checksum = "644352b10ce7f333d6e0af85bd4f5322dc449416dc1211c6308e95bca8923db4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "2.0.3+zstd.1.4.4" +version = "2.0.4+zstd.1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f" +checksum = "7113c0c9aed2c55181f2d9f5b0a36e7d2c0183b11c058ab40b35987479efe4d7" dependencies = [ "libc", "zstd-sys", @@ -8209,11 +8351,12 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.15+zstd.1.4.4" +version = "1.4.16+zstd.1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8" +checksum = "c442965efc45353be5a9b9969c9b0872fff6828c7e06d118dda2cb2d0bb11d5a" dependencies = [ "cc", "glob", + "itertools 0.9.0", "libc", ] diff --git a/Cargo.toml b/Cargo.toml index d9a1097daa..b65ffa9b67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,39 +23,40 @@ serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" structopt = "0.3.8" -pallet-transaction-payment-rpc = { version = "2.0.0-alpha.8" } -sc-basic-authorship = { version = "0.8.0-alpha.8" } -sc-chain-spec = { version = "2.0.0-alpha.8" } -sc-cli = { version = "0.8.0-alpha.8" } -sc-client-api = { version = "2.0.0-alpha.8" } -sc-client-db = { version = "0.8.0-alpha.8" } -sc-consensus = { version = "0.8.0-alpha.8" } -sc-consensus-babe = { version = "0.8.0-alpha.8" } -sc-consensus-babe-rpc = { version = "0.8.0-alpha.8" } -sc-consensus-epochs = { version = "0.8.0-alpha.8" } -sc-executor = { version = "0.8.0-alpha.8" } -sc-finality-grandpa = { version = "0.8.0-alpha.8" } -sc-finality-grandpa-rpc = { version = "0.8.0-alpha.8" } -sc-keystore = { version = "2.0.0-alpha.8" } -sc-network = { version = "0.8.0-alpha.8" } -sc-offchain = { version = "2.0.0-alpha.8" } -sc-rpc = { version = "2.0.0-alpha.8" } -sc-service = { version = "0.8.0-alpha.8" } -sc-telemetry = { version = "2.0.0-alpha.8" } -sc-transaction-pool = { version = "2.0.0-alpha.8" } -sp-api = { version = "2.0.0-alpha.8" } -sp-consensus = { version = "0.8.0-alpha.8" } -sp-consensus-babe = { version = "0.8.0-alpha.8" } -sp-core = { version = "2.0.0-alpha.8" } -sp-finality-grandpa = { version = "2.0.0-alpha.8" } -sp-inherents = { version = "2.0.0-alpha.8" } -sp-io = { version = "2.0.0-alpha.8" } -sp-runtime = { version = "2.0.0-alpha.8" } -sp-transaction-pool = { version = "2.0.0-alpha.8" } -substrate-frame-rpc-system = { version = "2.0.0-alpha.8" } -frame-benchmarking-cli = { version = "2.0.0-alpha.8" } -sp-blockchain = { version = "2.0.0-alpha.8" } -frame-benchmarking = { version = "2.0.0-alpha.8" } +pallet-transaction-payment-rpc = { version = "2.0.0-rc1" } +sc-basic-authorship = { version = "0.8.0-rc1" } +sc-chain-spec = { version = "2.0.0-rc1" } +sc-cli = { version = "0.8.0-rc1" } +sc-client-api = { version = "2.0.0-rc1" } +sc-client-db = { version = "0.8.0-rc1" } +sc-consensus = { version = "0.8.0-rc1" } +sc-consensus-babe = { version = "0.8.0-rc1" } +sc-consensus-babe-rpc = { version = "0.8.0-rc1" } +sc-consensus-epochs = { version = "0.8.0-rc1" } +sc-executor = { version = "0.8.0-rc1" } +sc-finality-grandpa = { version = "0.8.0-rc1" } +sc-finality-grandpa-rpc = { version = "0.8.0-rc1" } +sc-keystore = { version = "2.0.0-rc1" } +sc-network = { version = "0.8.0-rc1" } +sc-offchain = { version = "2.0.0-rc1" } +sc-rpc = { version = "2.0.0-rc1" } +sc-rpc-api = { version = "0.8.0-rc1" } +sc-service = { version = "0.8.0-rc1" } +sc-telemetry = { version = "2.0.0-rc1" } +sc-transaction-pool = { version = "2.0.0-rc1" } +sp-api = { version = "2.0.0-rc1" } +sp-consensus = { version = "0.8.0-rc1" } +sp-consensus-babe = { version = "0.8.0-rc1" } +sp-core = { version = "2.0.0-rc1" } +sp-finality-grandpa = { version = "2.0.0-rc1" } +sp-inherents = { version = "2.0.0-rc1" } +sp-io = { version = "2.0.0-rc1" } +sp-runtime = { version = "2.0.0-rc1" } +sp-transaction-pool = { version = "2.0.0-rc1" } +substrate-frame-rpc-system = { version = "2.0.0-rc1" } +frame-benchmarking-cli = { version = "2.0.0-rc1" } +sp-blockchain = { version = "2.0.0-rc1" } +frame-benchmarking = { version = "2.0.0-rc1" } module-dex-rpc = { path = "modules/dex/rpc" } module-support = { path = "modules/support" } @@ -67,8 +68,8 @@ inspect = { package = "acala-inspect", path = "inspect" } [build-dependencies] vergen = "3.0.4" -build-script-utils = { package = "substrate-build-script-utils", version = "2.0.0-alpha.8" } -frame-benchmarking-cli = { version = "2.0.0-alpha.8" } +build-script-utils = { package = "substrate-build-script-utils", version = "2.0.0-rc1" } +frame-benchmarking-cli = { version = "2.0.0-rc1" } [features] default = ["wasmtime"] diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index c7bf1b97dc..be3597d22b 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -8,10 +8,10 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.3.0" } derive_more = "0.99" log = "0.4.8" -sc-cli = { version = "0.8.0-alpha.8" } -sc-client-api = { version = "2.0.0-alpha.8" } -sc-service = { version = "0.8.0-alpha.8", default-features = false } -sp-blockchain = { version = "2.0.0-alpha.8" } -sp-core = { version = "2.0.0-alpha.8" } -sp-runtime = { version = "2.0.0-alpha.8" } +sc-cli = { version = "0.8.0-rc1" } +sc-client-api = { version = "2.0.0-rc1" } +sc-service = { version = "0.8.0-rc1", default-features = false } +sp-blockchain = { version = "2.0.0-rc1" } +sp-core = { version = "2.0.0-rc1" } +sp-runtime = { version = "2.0.0-rc1" } structopt = "0.3.8" diff --git a/modules/accounts/Cargo.toml b/modules/accounts/Cargo.toml index 17a3ef8338..52e5fdf7e8 100644 --- a/modules/accounts/Cargo.toml +++ b/modules/accounts/Cargo.toml @@ -7,20 +7,20 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -pallet-transaction-payment = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } -pallet-timestamp = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +pallet-transaction-payment = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } +pallet-timestamp = { version = "2.0.0-rc1", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [features] diff --git a/modules/accounts/src/mock.rs b/modules/accounts/src/mock.rs index c190e2dfbb..31d6017b58 100644 --- a/modules/accounts/src/mock.rs +++ b/modules/accounts/src/mock.rs @@ -3,13 +3,9 @@ #![cfg(test)] use super::*; -use frame_support::{impl_outer_dispatch, impl_outer_origin, parameter_types}; +use frame_support::{impl_outer_dispatch, impl_outer_origin, parameter_types, weights::IdentityFee}; use sp_core::H256; -use sp_runtime::{ - testing::Header, - traits::{ConvertInto, IdentityLookup}, - Perbill, -}; +use sp_runtime::{testing::Header, traits::IdentityLookup, Perbill}; pub type AccountId = u64; pub type BlockNumber = u64; @@ -67,6 +63,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } impl orml_tokens::Trait for Runtime { @@ -124,7 +121,7 @@ impl pallet_transaction_payment::Trait for Runtime { type Currency = PalletBalances; type OnTransactionPayment = (); type TransactionByteFee = TransactionByteFee; - type WeightToFee = ConvertInto; + type WeightToFee = IdentityFee; type FeeMultiplierUpdate = (); } diff --git a/modules/airdrop/Cargo.toml b/modules/airdrop/Cargo.toml index e2f59749c8..5d5ad94422 100644 --- a/modules/airdrop/Cargo.toml +++ b/modules/airdrop/Cargo.toml @@ -7,14 +7,14 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/modules/airdrop/src/mock.rs b/modules/airdrop/src/mock.rs index 077dc34495..9d839ab21f 100644 --- a/modules/airdrop/src/mock.rs +++ b/modules/airdrop/src/mock.rs @@ -64,6 +64,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/auction_manager/Cargo.toml b/modules/auction_manager/Cargo.toml index 338efb1b50..2f46b312ea 100644 --- a/modules/auction_manager/Cargo.toml +++ b/modules/auction_manager/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } support = { package = "module-support", path = "../support", default-features = false } @@ -19,8 +19,8 @@ utilities = { path = "../../utilities", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-auction = { path = "../../orml/auction", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp_treasury", default-features = false } diff --git a/modules/auction_manager/benchmarking/Cargo.toml b/modules/auction_manager/benchmarking/Cargo.toml index c0fb68c5c5..594b32a100 100644 --- a/modules/auction_manager/benchmarking/Cargo.toml +++ b/modules/auction_manager/benchmarking/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Acala Developers"] edition = "2018" [dependencies] -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false } orml-auction = { path = "../../../orml/auction", default-features = false } orml-oracle = { path = "../../../orml/oracle", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } @@ -22,12 +22,12 @@ auction-manager = { package = "module-auction-manager", path = "../../auction_ma [dev-dependencies] serde = { version = "1.0.101" } codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../../orml/currencies", default-features = false } orml-tokens = { path = "../../../orml/tokens", default-features = false } -pallet-timestamp = { version = "2.0.0-alpha.8" } +pallet-timestamp = { version = "2.0.0-rc1" } [features] default = ["std"] diff --git a/modules/auction_manager/benchmarking/src/mock.rs b/modules/auction_manager/benchmarking/src/mock.rs index 7ffdff1b9a..1ef4b849f4 100644 --- a/modules/auction_manager/benchmarking/src/mock.rs +++ b/modules/auction_manager/benchmarking/src/mock.rs @@ -61,6 +61,7 @@ impl frame_system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } impl orml_tokens::Trait for Runtime { diff --git a/modules/auction_manager/src/mock.rs b/modules/auction_manager/src/mock.rs index 7b82ddc73b..4a941f1695 100644 --- a/modules/auction_manager/src/mock.rs +++ b/modules/auction_manager/src/mock.rs @@ -82,6 +82,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/cdp_engine/Cargo.toml b/modules/cdp_engine/Cargo.toml index c276dcd680..1617c6564a 100644 --- a/modules/cdp_engine/Cargo.toml +++ b/modules/cdp_engine/Cargo.toml @@ -7,12 +7,12 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -sp-application-crypto = { version = "2.0.0-alpha.8", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +sp-application-crypto = { version = "2.0.0-rc1", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } @@ -20,8 +20,8 @@ primitives = { package = "module-primitives", path = "../primitives", default-fe utilities = { path = "../../utilities", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } dex = { package = "module-dex", path = "../dex", default-features = false } diff --git a/modules/cdp_engine/benchmarking/Cargo.toml b/modules/cdp_engine/benchmarking/Cargo.toml index b6316e2ce7..0b65e43647 100644 --- a/modules/cdp_engine/benchmarking/Cargo.toml +++ b/modules/cdp_engine/benchmarking/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Acala Developers"] edition = "2018" [dependencies] -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false } orml-oracle = { path = "../../../orml/oracle", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } prices = { package = "module-prices", path = "../../prices", default-features = false } @@ -22,13 +22,13 @@ dex = { package = "module-dex", path = "../../dex", default-features = false } [dev-dependencies] serde = { version = "1.0.101" } codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../../orml/currencies", default-features = false } orml-tokens = { path = "../../../orml/tokens", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../../cdp_treasury", default-features = false } -pallet-timestamp = { version = "2.0.0-alpha.8" } +pallet-timestamp = { version = "2.0.0-rc1" } [features] default = ["std"] diff --git a/modules/cdp_engine/benchmarking/src/mock.rs b/modules/cdp_engine/benchmarking/src/mock.rs index a38d49ae86..3d7c8a0154 100644 --- a/modules/cdp_engine/benchmarking/src/mock.rs +++ b/modules/cdp_engine/benchmarking/src/mock.rs @@ -66,6 +66,7 @@ impl frame_system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } impl orml_tokens::Trait for Runtime { diff --git a/modules/cdp_engine/src/mock.rs b/modules/cdp_engine/src/mock.rs index 733513f3e4..faebac9135 100644 --- a/modules/cdp_engine/src/mock.rs +++ b/modules/cdp_engine/src/mock.rs @@ -88,6 +88,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/cdp_treasury/Cargo.toml b/modules/cdp_treasury/Cargo.toml index 1b511fcec8..d70af76436 100644 --- a/modules/cdp_treasury/Cargo.toml +++ b/modules/cdp_treasury/Cargo.toml @@ -7,20 +7,20 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false, optional = true } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false, optional = true } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } orml-auction = { path = "../../orml/auction", default-features = false } dex = { package = "module-dex", path = "../dex", default-features = false } diff --git a/modules/cdp_treasury/src/mock.rs b/modules/cdp_treasury/src/mock.rs index d4d2c85098..e485318b25 100644 --- a/modules/cdp_treasury/src/mock.rs +++ b/modules/cdp_treasury/src/mock.rs @@ -74,6 +74,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index e40f34726d..9dac7a565d 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false, optional = true } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false, optional = true } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } @@ -19,9 +19,9 @@ support = { package = "module-support", path = "../support", default-features = primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp_treasury", default-features = false } diff --git a/modules/dex/rpc/Cargo.toml b/modules/dex/rpc/Cargo.toml index 9168c1b348..3d0d671e43 100644 --- a/modules/dex/rpc/Cargo.toml +++ b/modules/dex/rpc/Cargo.toml @@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.3.0" } jsonrpc-core = "14.0.5" jsonrpc-core-client = "14.0.5" jsonrpc-derive = "14.0.5" -sp-runtime = { version = "2.0.0-alpha.8" } -sp-api = { version = "2.0.0-alpha.8" } -sp-blockchain = { version = "2.0.0-alpha.8" } +sp-runtime = { version = "2.0.0-rc1" } +sp-api = { version = "2.0.0-rc1" } +sp-blockchain = { version = "2.0.0-rc1" } module-dex-rpc-runtime-api = { path = "runtime-api" } diff --git a/modules/dex/rpc/runtime-api/Cargo.toml b/modules/dex/rpc/runtime-api/Cargo.toml index c3cece709c..a5e7ba1424 100644 --- a/modules/dex/rpc/runtime-api/Cargo.toml +++ b/modules/dex/rpc/runtime-api/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-api = { version = "2.0.0-alpha.8", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-api = { version = "2.0.0-rc1", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/modules/dex/src/mock.rs b/modules/dex/src/mock.rs index 1160ede9ab..32d0e5add8 100644 --- a/modules/dex/src/mock.rs +++ b/modules/dex/src/mock.rs @@ -73,6 +73,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/emergency_shutdown/Cargo.toml b/modules/emergency_shutdown/Cargo.toml index 38e865164e..1f937ba8eb 100644 --- a/modules/emergency_shutdown/Cargo.toml +++ b/modules/emergency_shutdown/Cargo.toml @@ -7,19 +7,19 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances= { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances= { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp_treasury", default-features = false } diff --git a/modules/emergency_shutdown/benchmarking/Cargo.toml b/modules/emergency_shutdown/benchmarking/Cargo.toml index a8c2f93547..184c997ccf 100644 --- a/modules/emergency_shutdown/benchmarking/Cargo.toml +++ b/modules/emergency_shutdown/benchmarking/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Acala Developers"] edition = "2018" [dependencies] -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false } orml-oracle = { path = "../../../orml/oracle", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } prices = { package = "module-prices", path = "../../prices", default-features = false } @@ -22,13 +22,13 @@ emergency-shutdown = { package = "module-emergency-shutdown", path = "../../emer [dev-dependencies] serde = { version = "1.0.101" } codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../../orml/currencies", default-features = false } orml-tokens = { path = "../../../orml/tokens", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../../cdp_treasury", default-features = false } -pallet-timestamp = { version = "2.0.0-alpha.8" } +pallet-timestamp = { version = "2.0.0-rc1" } [features] default = ["std"] diff --git a/modules/emergency_shutdown/benchmarking/src/mock.rs b/modules/emergency_shutdown/benchmarking/src/mock.rs index ce717d9288..edcb60df7d 100644 --- a/modules/emergency_shutdown/benchmarking/src/mock.rs +++ b/modules/emergency_shutdown/benchmarking/src/mock.rs @@ -65,6 +65,7 @@ impl frame_system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } impl orml_tokens::Trait for Runtime { diff --git a/modules/emergency_shutdown/src/mock.rs b/modules/emergency_shutdown/src/mock.rs index 760ed176db..385781ded7 100644 --- a/modules/emergency_shutdown/src/mock.rs +++ b/modules/emergency_shutdown/src/mock.rs @@ -80,6 +80,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index cef47205b6..6f0d606c07 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } staking-pool = { package = "module-staking-pool", path = "../staking_pool", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } diff --git a/modules/homa_treasury/Cargo.toml b/modules/homa_treasury/Cargo.toml index b64c16d7b3..3c98ba9646 100644 --- a/modules/homa_treasury/Cargo.toml +++ b/modules/homa_treasury/Cargo.toml @@ -7,17 +7,17 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index b37dbf805f..66f617224d 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -7,10 +7,10 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } cdp-engine = { package = "module-cdp-engine", path = "../cdp_engine", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } @@ -18,9 +18,9 @@ support = { package = "module-support", path = "../support", default-features = primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-io = { version = "2.0.0-alpha.8", default-features = false } -sp-core = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp_treasury", default-features = false } diff --git a/modules/honzon/benchmarking/Cargo.toml b/modules/honzon/benchmarking/Cargo.toml index 6516657ecb..a84b3bb3f7 100644 --- a/modules/honzon/benchmarking/Cargo.toml +++ b/modules/honzon/benchmarking/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Acala Developers"] edition = "2018" [dependencies] -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false } orml-oracle = { path = "../../../orml/oracle", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } honzon = { package = "module-honzon", path = "../../honzon", default-features = false } @@ -22,13 +22,13 @@ loans = { package = "module-loans", path = "../../loans", default-features = fal [dev-dependencies] serde = { version = "1.0.101" } codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] } -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../../orml/currencies", default-features = false } orml-tokens = { path = "../../../orml/tokens", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../../cdp_treasury", default-features = false } -pallet-timestamp = { version = "2.0.0-alpha.8" } +pallet-timestamp = { version = "2.0.0-rc1" } [features] default = ["std"] diff --git a/modules/honzon/benchmarking/src/mock.rs b/modules/honzon/benchmarking/src/mock.rs index f3c9e5fe39..1c35ef6abc 100644 --- a/modules/honzon/benchmarking/src/mock.rs +++ b/modules/honzon/benchmarking/src/mock.rs @@ -65,6 +65,7 @@ impl frame_system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } impl orml_tokens::Trait for Runtime { diff --git a/modules/honzon/src/mock.rs b/modules/honzon/src/mock.rs index 138a13670c..e2d1ecf549 100644 --- a/modules/honzon/src/mock.rs +++ b/modules/honzon/src/mock.rs @@ -88,6 +88,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index c77e43b721..0983b160ae 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -7,19 +7,19 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp_treasury", default-features = false } diff --git a/modules/loans/src/mock.rs b/modules/loans/src/mock.rs index 98d0157061..dfe1e23e06 100644 --- a/modules/loans/src/mock.rs +++ b/modules/loans/src/mock.rs @@ -74,6 +74,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/nominees_election/Cargo.toml b/modules/nominees_election/Cargo.toml index 2a7f73e3d3..46adc71fa7 100644 --- a/modules/nominees_election/Cargo.toml +++ b/modules/nominees_election/Cargo.toml @@ -7,19 +7,19 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } [features] diff --git a/modules/nominees_election/src/mock.rs b/modules/nominees_election/src/mock.rs index 97cf5a1319..28b6a6483d 100644 --- a/modules/nominees_election/src/mock.rs +++ b/modules/nominees_election/src/mock.rs @@ -53,6 +53,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/polkadot_bridge/Cargo.toml b/modules/polkadot_bridge/Cargo.toml index 5f216e6d61..109884fd08 100644 --- a/modules/polkadot_bridge/Cargo.toml +++ b/modules/polkadot_bridge/Cargo.toml @@ -7,17 +7,17 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index 8488c344e5..71ea79477b 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -7,17 +7,17 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/modules/prices/src/mock.rs b/modules/prices/src/mock.rs index 96398d9d68..fa33f69a22 100644 --- a/modules/prices/src/mock.rs +++ b/modules/prices/src/mock.rs @@ -66,6 +66,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/primitives/Cargo.toml b/modules/primitives/Cargo.toml index fbd97f1c76..1a546b2f58 100644 --- a/modules/primitives/Cargo.toml +++ b/modules/primitives/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/modules/staking_pool/Cargo.toml b/modules/staking_pool/Cargo.toml index 59bcf4768c..11a59ddd72 100644 --- a/modules/staking_pool/Cargo.toml +++ b/modules/staking_pool/Cargo.toml @@ -6,19 +6,19 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "module-primitives", path = "../primitives", default-features = false } [dev-dependencies] -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } orml-currencies = { path = "../../orml/currencies", default-features = false } [features] diff --git a/modules/staking_pool/rpc/Cargo.toml b/modules/staking_pool/rpc/Cargo.toml index dcb97bbb4a..22ebe4b166 100644 --- a/modules/staking_pool/rpc/Cargo.toml +++ b/modules/staking_pool/rpc/Cargo.toml @@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.3.0" } jsonrpc-core = "14.0.5" jsonrpc-core-client = "14.0.5" jsonrpc-derive = "14.0.5" -sp-runtime = { version = "2.0.0-alpha.8" } -sp-api = { version = "2.0.0-alpha.8" } -sp-blockchain = { version = "2.0.0-alpha.8" } +sp-runtime = { version = "2.0.0-rc1" } +sp-api = { version = "2.0.0-rc1" } +sp-blockchain = { version = "2.0.0-rc1" } module-staking-pool-rpc-runtime-api = { path = "runtime-api" } module-support = { path = "../../support" } diff --git a/modules/staking_pool/rpc/runtime-api/Cargo.toml b/modules/staking_pool/rpc/runtime-api/Cargo.toml index 9355fa3866..6ffb371f22 100644 --- a/modules/staking_pool/rpc/runtime-api/Cargo.toml +++ b/modules/staking_pool/rpc/runtime-api/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } -sp-api = { version = "2.0.0-alpha.8", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-api = { version = "2.0.0-rc1", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } support = { package = "module-support", path = "../../../support", default-features = false } [features] diff --git a/modules/staking_pool/src/mock.rs b/modules/staking_pool/src/mock.rs index b6f7c569c7..b153158551 100644 --- a/modules/staking_pool/src/mock.rs +++ b/modules/staking_pool/src/mock.rs @@ -70,6 +70,7 @@ impl system::Trait for Runtime { type DbWeight = (); type BlockExecutionWeight = (); type ExtrinsicBaseWeight = (); + type MaximumExtrinsicWeight = (); } pub type System = system::Module; diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index 2502c1aed1..8925a7552d 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] impl-trait-for-tuples = "0.1.3" codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } [features] diff --git a/modules/template/Cargo.toml b/modules/template/Cargo.toml index 04589fddf2..424aa395f8 100644 --- a/modules/template/Cargo.toml +++ b/modules/template/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -support = { package = "frame-support", version = "2.0.0-alpha.8", default-features = false } -system = { package = "frame-system", version = "2.0.0-alpha.8", default-features = false } -runtime-io = { package = "sp-io", version = "2.0.0-alpha.8", default-features = false } -rstd = { package = "sp-std", version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +support = { package = "frame-support", version = "2.0.0-rc1", default-features = false } +system = { package = "frame-system", version = "2.0.0-rc1", default-features = false } +runtime-io = { package = "sp-io", version = "2.0.0-rc1", default-features = false } +rstd = { package = "sp-std", version = "2.0.0-rc1", default-features = false } [features] default = ["std"] diff --git a/orml b/orml index f785964dbb..21d9890fe5 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit f785964dbb67cd0b5520f6dad04f65f0c1556f69 +Subproject commit 21d9890fe5484abdf5f80762fcf73e5ad1e6cb22 diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 32464d4b33..b4349b881d 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -8,42 +8,42 @@ edition = "2018" codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } -frame-executive = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { version = "2.0.0-alpha.8", default-features = false } -frame-system-rpc-runtime-api = { version = "2.0.0-alpha.8", default-features = false } -frame-benchmarking = { version = "2.0.0-alpha.8", default-features = false, optional = true } -pallet-babe = { version = "2.0.0-alpha.8", default-features = false } -pallet-balances = { version = "2.0.0-alpha.8", default-features = false } -pallet-collective = { version = "2.0.0-alpha.8", default-features = false } -pallet-grandpa = { version = "2.0.0-alpha.8", default-features = false } -pallet-indices = { version = "2.0.0-alpha.8", default-features = false } -pallet-membership = { version = "2.0.0-alpha.8", default-features = false } -pallet-randomness-collective-flip = { version = "2.0.0-alpha.8", default-features = false } -pallet-recovery = { version = "2.0.0-alpha.8", default-features = false } -pallet-session = { version = "2.0.0-alpha.8", features = ["historical"], default-features = false } -pallet-staking = { version = "2.0.0-alpha.8", default-features = false } -pallet-staking-reward-curve = { version = "2.0.0-alpha.8", default-features = false } -pallet-sudo = { version = "2.0.0-alpha.8", default-features = false } -pallet-timestamp = { version = "2.0.0-alpha.8", default-features = false } -pallet-transaction-payment = { version = "2.0.0-alpha.8", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-alpha.8", default-features = false } -pallet-treasury = { version = "2.0.0-alpha.8", default-features = false } -pallet-utility = { version = "2.0.0-alpha.8", default-features = false } -sp-api = { version = "2.0.0-alpha.8", default-features = false } -sp-block-builder = { version = "2.0.0-alpha.8", default-features = false } -sp-consensus-babe = { version = "0.8.0-alpha.8", default-features = false } -sp-core = { version = "2.0.0-alpha.8", default-features = false } -sp-inherents = { version = "2.0.0-alpha.8", default-features = false } -sp-io = { version = "2.0.0-alpha.8", default-features = false } -sp-offchain = { version = "2.0.0-alpha.8", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -sp-session = { version = "2.0.0-alpha.8", default-features = false } -sp-staking = { version = "2.0.0-alpha.8", default-features = false } -sp-std = { version = "2.0.0-alpha.8", default-features = false } -sp-transaction-pool = { version = "2.0.0-alpha.8", default-features = false } -sp-version = { version = "2.0.0-alpha.8", default-features = false } -frame-system = { version = "2.0.0-alpha.8", default-features = false } -sp-application-crypto = { version = "2.0.0-alpha.8", default-features = false } +frame-executive = { version = "2.0.0-rc1", default-features = false } +frame-support = { version = "2.0.0-rc1", default-features = false } +frame-system-rpc-runtime-api = { version = "2.0.0-rc1", default-features = false } +frame-benchmarking = { version = "2.0.0-rc1", default-features = false, optional = true } +pallet-babe = { version = "2.0.0-rc1", default-features = false } +pallet-balances = { version = "2.0.0-rc1", default-features = false } +pallet-collective = { version = "2.0.0-rc1", default-features = false } +pallet-grandpa = { version = "2.0.0-rc1", default-features = false } +pallet-indices = { version = "2.0.0-rc1", default-features = false } +pallet-membership = { version = "2.0.0-rc1", default-features = false } +pallet-randomness-collective-flip = { version = "2.0.0-rc1", default-features = false } +pallet-recovery = { version = "2.0.0-rc1", default-features = false } +pallet-session = { version = "2.0.0-rc1", features = ["historical"], default-features = false } +pallet-staking = { version = "2.0.0-rc1", default-features = false } +pallet-staking-reward-curve = { version = "2.0.0-rc1", default-features = false } +pallet-sudo = { version = "2.0.0-rc1", default-features = false } +pallet-timestamp = { version = "2.0.0-rc1", default-features = false } +pallet-transaction-payment = { version = "2.0.0-rc1", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-rc1", default-features = false } +pallet-treasury = { version = "2.0.0-rc1", default-features = false } +pallet-utility = { version = "2.0.0-rc1", default-features = false } +sp-api = { version = "2.0.0-rc1", default-features = false } +sp-block-builder = { version = "2.0.0-rc1", default-features = false } +sp-consensus-babe = { version = "0.8.0-rc1", default-features = false } +sp-core = { version = "2.0.0-rc1", default-features = false } +sp-inherents = { version = "2.0.0-rc1", default-features = false } +sp-io = { version = "2.0.0-rc1", default-features = false } +sp-offchain = { version = "2.0.0-rc1", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +sp-session = { version = "2.0.0-rc1", default-features = false } +sp-staking = { version = "2.0.0-rc1", default-features = false } +sp-std = { version = "2.0.0-rc1", default-features = false } +sp-transaction-pool = { version = "2.0.0-rc1", default-features = false } +sp-version = { version = "2.0.0-rc1", default-features = false } +frame-system = { version = "2.0.0-rc1", default-features = false } +sp-application-crypto = { version = "2.0.0-rc1", default-features = false } orml-auction = { path = "../orml/auction", default-features = false } orml-currencies = { path = "../orml/currencies", default-features = false } @@ -83,7 +83,7 @@ module-auction-manager-benchmarking = { path = "../modules/auction_manager/bench wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6" } [dev-dependencies] -sp-io = { version = "2.0.0-alpha.8" } +sp-io = { version = "2.0.0-rc1" } [features] default = ["std"] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 3506d74201..9a39eba076 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -16,7 +16,7 @@ use sp_core::{ OpaqueMetadata, }; use sp_runtime::traits::{ - BlakeTwo256, Block as BlockT, Convert, ConvertInto, NumberFor, OpaqueKeys, SaturatedConversion, StaticLookup, + BlakeTwo256, Block as BlockT, Convert, NumberFor, OpaqueKeys, SaturatedConversion, Saturating, StaticLookup, }; use sp_runtime::{ create_runtime_str, @@ -41,7 +41,7 @@ pub use frame_support::{ traits::{Contains, ContainsLengthBound, KeyOwnerProofSystem, Randomness}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - Weight, + IdentityFee, Weight, }, StorageValue, }; @@ -107,6 +107,9 @@ parameter_types! { /// We allow for 2 seconds of compute with a 4 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 const MaximumBlockLength: u32 = 5 * 1024 * 1024; pub const Version: RuntimeVersion = VERSION; } @@ -134,6 +137,7 @@ impl system::Trait for Runtime { type DbWeight = RocksDbWeight; type BlockExecutionWeight = BlockExecutionWeight; type ExtrinsicBaseWeight = ExtrinsicBaseWeight; + type MaximumExtrinsicWeight = MaximumExtrinsicWeight; } parameter_types! { @@ -208,7 +212,7 @@ impl pallet_transaction_payment::Trait for Runtime { type Currency = Balances; type OnTransactionPayment = (); type TransactionByteFee = TransactionByteFee; - type WeightToFee = ConvertInto; + type WeightToFee = IdentityFee; type FeeMultiplierUpdate = (); } @@ -517,8 +521,8 @@ impl orml_auction::Trait for Runtime { parameter_types! { pub const MinimumCount: u32 = 1; - pub const ExpiresIn: Moment = 1000 * 60 * 30; // 30 mins - pub const OracleUnsignedPriority: TransactionPriority = TransactionPriority::max_value() - 1; + pub const ExpiresIn: Moment = 1000 * 60 * 60; // 60 mins + pub const OracleUnsignedPriority: TransactionPriority = TransactionPriority::max_value() - 10000; } impl orml_oracle::Trait for Runtime { diff --git a/src/chain_spec.rs b/src/chain_spec.rs index b3e3523826..c6e9bef580 100644 --- a/src/chain_spec.rs +++ b/src/chain_spec.rs @@ -207,12 +207,12 @@ pub fn latest_mandala_testnet_config() -> ChainSpec { vec![ // 5F98oWfz2r5rcRVnP9VCndg33DAAsky3iuoBSpaPUbgN9AJn hex!["8815a8024b06a5b4c8703418f52125c923f939a5c40a717f6ae3011ba7719019"].into(), - // 5GeTpaLR637ztQqFvwCZocZhLp1QqHURKH6Gj7CZteRCAhMs - hex!["cab00722883a824e7fc368ff2ad53ffcce3fa3b794080311218bee8e902929df"].into(), + // 5Fe3jZRbKes6aeuQ6HkcTvQeNhkkRPTXBwmNkuAPoimGEv45 + hex!["9e22b64c980329ada2b46a783623bcf1f1d0418f6a2b5fbfb7fb68dbac5abf0f"].into(), ], vec![( - // 5F98oWfz2r5rcRVnP9VCndg33DAAsky3iuoBSpaPUbgN9AJn - hex!["8815a8024b06a5b4c8703418f52125c923f939a5c40a717f6ae3011ba7719019"].into(), + // 5Fe3jZRbKes6aeuQ6HkcTvQeNhkkRPTXBwmNkuAPoimGEv45 + hex!["9e22b64c980329ada2b46a783623bcf1f1d0418f6a2b5fbfb7fb68dbac5abf0f"].into(), hex!["9e22b64c980329ada2b46a783623bcf1f1d0418f6a2b5fbfb7fb68dbac5abf0f"].unchecked_into(), )], ) diff --git a/src/command.rs b/src/command.rs index fc95449109..52c797034b 100644 --- a/src/command.rs +++ b/src/command.rs @@ -6,6 +6,7 @@ use crate::{ }; use runtime::{Block, RuntimeApi}; use sc_cli::{Result, SubstrateCli}; +use sc_finality_grandpa as grandpa; impl SubstrateCli for Cli { fn impl_name() -> &'static str { diff --git a/src/rpc.rs b/src/rpc.rs index 7e1e3329b3..c5bd8e5c6f 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -6,11 +6,12 @@ use runtime::{ opaque::Block, AccountId, Balance, BlockNumber, CurrencyId, Hash, Index, TimeStampedPrice, UncheckedExtrinsic, }; use sc_consensus_babe::{Config, Epoch}; -use sc_consensus_babe_rpc::BabeRPCHandler; +use sc_consensus_babe_rpc::BabeRpcHandler; use sc_consensus_epochs::SharedEpochChanges; use sc_finality_grandpa::{SharedAuthoritySet, SharedVoterState}; use sc_finality_grandpa_rpc::GrandpaRpcHandler; use sc_keystore::KeyStorePtr; +use sc_rpc_api::DenyUnsafe; use sp_api::ProvideRuntimeApi; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_consensus::SelectChain; @@ -56,6 +57,8 @@ pub struct FullDeps { pub pool: Arc

, /// The SelectChain Strategy pub select_chain: SC, + /// Whether to deny unsafe calls + pub deny_unsafe: DenyUnsafe, /// BABE specific dependencies. pub babe: BabeDeps, /// GRANDPA specific dependencies. @@ -90,6 +93,7 @@ where client, pool, select_chain, + deny_unsafe, babe, grandpa, } = deps; @@ -110,12 +114,13 @@ where io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( client.clone(), ))); - io.extend_with(sc_consensus_babe_rpc::BabeApi::to_delegate(BabeRPCHandler::new( + io.extend_with(sc_consensus_babe_rpc::BabeApi::to_delegate(BabeRpcHandler::new( client.clone(), shared_epoch_changes, keystore, babe_config, select_chain, + deny_unsafe, ))); io.extend_with(OracleApi::to_delegate(Oracle::new(client.clone()))); io.extend_with(DexApi::to_delegate(Dex::new(client.clone()))); diff --git a/src/service.rs b/src/service.rs index 70c1193fbc..2ce5e412d6 100644 --- a/src/service.rs +++ b/src/service.rs @@ -7,7 +7,9 @@ use std::sync::Arc; use runtime::{opaque::Block, RuntimeApi}; use sc_consensus::LongestChain; use sc_consensus_babe; -use sc_finality_grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider}; +use sc_finality_grandpa::{ + self as grandpa, FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider, +}; use sc_service::{config::Configuration, error::Error as ServiceError, AbstractService, ServiceBuilder}; use sp_inherents::InherentDataProviders; @@ -19,7 +21,6 @@ macro_rules! new_full_start { ($config:expr) => {{ use std::sync::Arc; - type RpcExtension = jsonrpc_core::IoHandler; let mut import_setup = None; let mut rpc_setup = None; let inherent_data_providers = sp_inherents::InherentDataProviders::new(); @@ -44,7 +45,7 @@ macro_rules! new_full_start { .take() .ok_or_else(|| sc_service::Error::SelectChainRequired)?; let (grandpa_block_import, grandpa_link) = - sc_finality_grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain)?; + grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain)?; let justification_import = grandpa_block_import.clone(); let (block_import, babe_link) = sc_consensus_babe::block_import( @@ -68,36 +69,52 @@ macro_rules! new_full_start { Ok(import_queue) }, )? - .with_rpc_extensions(|builder| -> std::result::Result { - let babe_link = import_setup - .as_ref() - .map(|s| &s.2) - .expect("BabeLink is present for full services or set up failed; qed."); + .with_rpc_extensions_builder(|builder| { let grandpa_link = import_setup .as_ref() .map(|s| &s.1) .expect("GRANDPA LinkHalf is present for full services or set up failed; qed."); - let shared_authority_set = grandpa_link.shared_authority_set(); - let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty(); - let deps = crate::rpc::FullDeps { - client: builder.client().clone(), - pool: builder.pool(), - select_chain: builder - .select_chain() - .cloned() - .expect("SelectChain is present for full services or set up failed; qed."), - babe: crate::rpc::BabeDeps { - keystore: builder.keystore(), - babe_config: sc_consensus_babe::BabeLink::config(babe_link).clone(), - shared_epoch_changes: sc_consensus_babe::BabeLink::epoch_changes(babe_link).clone(), - }, - grandpa: crate::rpc::GrandpaDeps { - shared_voter_state: shared_voter_state.clone(), - shared_authority_set: shared_authority_set.clone(), - }, - }; - rpc_setup = Some((shared_voter_state)); - Ok(crate::rpc::create_full(deps)) + + let shared_authority_set = grandpa_link.shared_authority_set().clone(); + let shared_voter_state = grandpa::SharedVoterState::empty(); + + rpc_setup = Some((shared_voter_state.clone())); + + let babe_link = import_setup + .as_ref() + .map(|s| &s.2) + .expect("BabeLink is present for full services or set up failed; qed."); + + let babe_config = babe_link.config().clone(); + let shared_epoch_changes = babe_link.epoch_changes().clone(); + + let client = builder.client().clone(); + let pool = builder.pool().clone(); + let select_chain = builder + .select_chain() + .cloned() + .expect("SelectChain is present for full services or set up failed; qed."); + let keystore = builder.keystore().clone(); + + Ok(move |deny_unsafe| { + let deps = crate::rpc::FullDeps { + client: client.clone(), + pool: pool.clone(), + select_chain: select_chain.clone(), + deny_unsafe, + babe: crate::rpc::BabeDeps { + babe_config: babe_config.clone(), + shared_epoch_changes: shared_epoch_changes.clone(), + keystore: keystore.clone(), + }, + grandpa: crate::rpc::GrandpaDeps { + shared_voter_state: shared_voter_state.clone(), + shared_authority_set: shared_authority_set.clone(), + }, + }; + + crate::rpc::create_full(deps) + }) })?; (builder, import_setup, inherent_data_providers, rpc_setup) @@ -124,8 +141,8 @@ macro_rules! new_full { let service = builder .with_finality_proof_provider(|client, backend| { // GenesisAuthoritySetProvider is implemented for StorageAndProofProvider - let provider = client as Arc>; - Ok(Arc::new(sc_finality_grandpa::FinalityProofProvider::new(backend, provider)) as _) + let provider = client as Arc>; + Ok(Arc::new(grandpa::FinalityProofProvider::new(backend, provider)) as _) })? .build()?; @@ -140,7 +157,11 @@ macro_rules! new_full { ($with_startup_data)(&block_import, &babe_link); if let sc_service::config::Role::Authority { .. } = &role { - let proposer = sc_basic_authorship::ProposerFactory::new(service.client(), service.transaction_pool()); + let proposer = sc_basic_authorship::ProposerFactory::new( + service.client(), + service.transaction_pool(), + service.prometheus_registry().as_ref(), + ); let client = service.client(); let select_chain = service.select_chain().ok_or(sc_service::Error::SelectChainRequired)?; @@ -172,7 +193,7 @@ macro_rules! new_full { None }; - let config = sc_finality_grandpa::Config { + let config = grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: std::time::Duration::from_millis(333), justification_period: 512, @@ -190,22 +211,22 @@ macro_rules! new_full { // and vote data availability than the observer. The observer has not // been tested extensively yet and having most nodes in a network run it // could lead to finality stalls. - let grandpa_config = sc_finality_grandpa::GrandpaParams { + let grandpa_config = grandpa::GrandpaParams { config, link: grandpa_link, network: service.network(), inherent_data_providers: inherent_data_providers.clone(), telemetry_on_connect: Some(service.telemetry_on_connect_stream()), - voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), + voting_rule: grandpa::VotingRulesBuilder::default().build(), prometheus_registry: service.prometheus_registry(), shared_voter_state, }; // the GRANDPA voter task is considered infallible, i.e. // if it fails we take down the service with it. - service.spawn_essential_task("grandpa-voter", sc_finality_grandpa::run_grandpa_voter(grandpa_config)?); + service.spawn_essential_task("grandpa-voter", grandpa::run_grandpa_voter(grandpa_config)?); } else { - sc_finality_grandpa::setup_disabled_grandpa(service.client(), &inherent_data_providers, service.network())?; + grandpa::setup_disabled_grandpa(service.client(), &inherent_data_providers, service.network())?; } Ok((service, inherent_data_providers)) diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index feb249647a..99f9aa6964 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -6,10 +6,10 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false } -sp-runtime = { version = "2.0.0-alpha.8", default-features = false } -frame-support = { package = "frame-support", version = "2.0.0-alpha.8", default-features = false } -rstd = { package = "sp-std", version = "2.0.0-alpha.8", default-features = false } -runtime-io = { package = "sp-io", version = "2.0.0-alpha.8", default-features = false } +sp-runtime = { version = "2.0.0-rc1", default-features = false } +frame-support = { package = "frame-support", version = "2.0.0-rc1", default-features = false } +rstd = { package = "sp-std", version = "2.0.0-rc1", default-features = false } +runtime-io = { package = "sp-io", version = "2.0.0-rc1", default-features = false } [features] default = ["std"]