From 43fcd6397b7441849e40346ccb083c4de878a674 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Mon, 16 Nov 2020 16:26:01 +0800 Subject: [PATCH 01/18] Update to Substrate master Update Substrate to https://github.com/paritytech/substrate/commit/77007ed87727a761169d4c57cbeae0151d9efb81 --- Cargo.lock | 1646 +++++++++++++++------------ Cargo.toml | 83 ++ cli/Cargo.toml | 1 + cli/src/cli.rs | 3 - cli/src/command.rs | 30 +- cli/src/service.rs | 78 +- rpc/Cargo.toml | 1 + rpc/src/lib.rs | 2 +- runtime/src/impls.rs | 28 +- runtime/src/lib.rs | 23 +- runtime/src/weights/mod.rs | 6 +- xpallets/genesis-builder/src/lib.rs | 5 +- xpallets/transaction-fee/src/lib.rs | 6 +- 13 files changed, 1041 insertions(+), 871 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6f6773f7..698e2a83f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,11 +12,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" dependencies = [ - "gimli 0.22.0", + "gimli 0.23.0", ] [[package]] @@ -65,7 +65,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63dd91889c49327ad7ef3b500fd1109dbd3c509a03db0d4a9ce413b79f575cb6" dependencies = [ "block-cipher", - "byteorder 1.3.4", + "byteorder", "opaque-debug 0.3.0", ] @@ -94,11 +94,17 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +[[package]] +name = "ahash" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c" + [[package]] name = "aho-corasick" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -134,9 +140,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" +checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" [[package]] name = "approx" @@ -170,9 +176,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "asn1_der" @@ -206,36 +212,36 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801" +checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", - "once_cell 1.4.1", + "once_cell 1.5.2", "vec-arena", ] [[package]] name = "async-global-executor" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0659b83a146398616883aa5199cdd1b055ec088a83c9a338eab3534f33f0622e" +checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04" dependencies = [ "async-executor", "async-io", "futures-lite", "num_cpus", - "once_cell 1.4.1", + "once_cell 1.5.2", ] [[package]] name = "async-io" -version = "1.1.10" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e" +checksum = "40a0b2bb8ae20fede194e779150fe283f65a4a08461b496de546ec366b174ad9" dependencies = [ "concurrent-queue", "fastrand", @@ -243,7 +249,7 @@ dependencies = [ "libc", "log", "nb-connect", - "once_cell 1.4.1", + "once_cell 1.5.2", "parking", "polling", "vec-arena", @@ -262,15 +268,15 @@ dependencies = [ [[package]] name = "async-std" -version = "1.6.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed" +checksum = "a7e82538bc65a25dbdff70e4c5439d52f068048ab97cdea0acd73f131594caa1" dependencies = [ "async-global-executor", "async-io", "async-mutex", "blocking", - "crossbeam-utils", + "crossbeam-utils 0.8.0", "futures-channel", "futures-core", "futures-io", @@ -280,7 +286,7 @@ dependencies = [ "log", "memchr", "num_cpus", - "once_cell 1.4.1", + "once_cell 1.5.2", "pin-project-lite", "pin-utils", "slab", @@ -289,20 +295,21 @@ dependencies = [ [[package]] name = "async-task" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab27c1aa62945039e44edaeee1dc23c74cc0c303dd5fe0fb462a184f1c3a518" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-tls" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df097e3f506bec0e1a24f06bb3c962c228f36671de841ff579cb99f371772634" +checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52" dependencies = [ - "futures 0.3.6", + "futures-core", + "futures-io", "rustls", "webpki", - "webpki-roots 0.19.0", + "webpki-roots", ] [[package]] @@ -318,9 +325,12 @@ dependencies = [ [[package]] name = "atomic" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f46ca51dca4837f1520754d1c8c36636356b81553d928dc9c177025369a06e" +checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" +dependencies = [ + "autocfg 1.0.1", +] [[package]] name = "atomic-waker" @@ -353,15 +363,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.53" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" +checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28" dependencies = [ "addr2line", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.21.1", + "object 0.22.0", "rustc-demangle", ] @@ -373,15 +383,15 @@ checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" [[package]] name = "base64" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bincode" @@ -389,7 +399,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" dependencies = [ - "byteorder 1.3.4", + "byteorder", "serde", ] @@ -425,9 +435,9 @@ checksum = "7059804e226b3ac116519a252d7f5fb985a5ccc0e93255e036a5f7e7283323f4" dependencies = [ "failure", "hashbrown 0.1.8", - "hmac", + "hmac 0.7.1", "once_cell 0.1.8", - "pbkdf2", + "pbkdf2 0.3.0", "rand 0.6.5", "sha2 0.8.2", ] @@ -438,12 +448,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "bitmask" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" - [[package]] name = "bitvec" version = "0.17.4" @@ -456,15 +460,13 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ce5b6108f8e154604bd4eb76a2f726066c3464d5a552a4229262a18c9bb471" +checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" dependencies = [ - "byte-tools", - "byteorder 1.3.4", "crypto-mac 0.8.0", "digest 0.9.0", - "opaque-debug 0.2.3", + "opaque-debug 0.3.0", ] [[package]] @@ -479,23 +481,23 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -507,7 +509,7 @@ checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ "block-padding 0.1.5", "byte-tools", - "byteorder 1.3.4", + "byteorder", "generic-array 0.12.3", ] @@ -556,7 +558,7 @@ dependencies = [ "atomic-waker", "fastrand", "futures-lite", - "once_cell 1.4.1", + "once_cell 1.5.2", ] [[package]] @@ -565,11 +567,17 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bstr" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" +checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" dependencies = [ "memchr", ] @@ -592,12 +600,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -[[package]] -name = "byteorder" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" - [[package]] name = "byteorder" version = "1.3.4" @@ -610,7 +612,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ - "byteorder 1.3.4", + "byteorder", "either", "iovec", ] @@ -621,12 +623,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -[[package]] -name = "c_linked_list" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" - [[package]] name = "cache-padded" version = "1.1.1" @@ -635,9 +631,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" dependencies = [ "jobserver", ] @@ -702,7 +698,7 @@ dependencies = [ "chainx-rpc", "chainx-runtime", "frame-benchmarking-cli", - "futures 0.3.6", + "futures 0.3.8", "hex", "hex-literal", "jsonrpc-pubsub", @@ -717,6 +713,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-consensus-babe", + "sc-consensus-slots", "sc-executor", "sc-finality-grandpa", "sc-network", @@ -744,7 +741,7 @@ name = "chainx-executor" version = "2.0.0-beta.0" dependencies = [ "chainx-runtime", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sc-executor", "xp-io", ] @@ -788,6 +785,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-keystore", "sp-runtime", "sp-state-machine", "sp-transaction-pool", @@ -813,7 +811,7 @@ name = "chainx-runtime" version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-executive", "frame-support", "frame-system", @@ -975,6 +973,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "const_fn" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1018,7 +1022,7 @@ version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38" dependencies = [ - "byteorder 1.3.4", + "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", @@ -1097,21 +1101,21 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ - "crossbeam-utils", - "maybe-uninit", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.0", ] [[package]] @@ -1120,11 +1124,22 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", "maybe-uninit", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.0", + "crossbeam-utils 0.8.0", +] + [[package]] name = "crossbeam-epoch" version = "0.8.2" @@ -1133,13 +1148,27 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset", "scopeguard 1.1.0", ] +[[package]] +name = "crossbeam-epoch" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" +dependencies = [ + "cfg-if 1.0.0", + "const_fn", + "crossbeam-utils 0.8.0", + "lazy_static", + "memoffset", + "scopeguard 1.1.0", +] + [[package]] name = "crossbeam-queue" version = "0.2.3" @@ -1147,7 +1176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -1162,6 +1191,18 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 1.0.0", + "const_fn", + "lazy_static", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -1199,12 +1240,13 @@ dependencies = [ [[package]] name = "cuckoofilter" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd43f7cfaffe0a386636a10baea2ee05cc50df3b77bea4a456c9572a939bf1f" +checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" dependencies = [ - "byteorder 0.5.3", - "rand 0.3.23", + "byteorder", + "fnv", + "rand 0.7.3", ] [[package]] @@ -1213,7 +1255,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" dependencies = [ - "byteorder 1.3.4", + "byteorder", "digest 0.8.1", "rand_core 0.5.1", "subtle 2.3.0", @@ -1226,7 +1268,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307" dependencies = [ - "byteorder 1.3.4", + "byteorder", "digest 0.9.0", "rand_core 0.5.1", "subtle 2.3.0", @@ -1235,9 +1277,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d0e2d24e5ee3b23a01de38eefdcd978907890701f08ffffd4cb457ca4ee8d6" +checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908" [[package]] name = "derive_more" @@ -1295,8 +1337,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ - "byteorder 1.3.4", - "quick-error", + "byteorder", + "quick-error 1.2.3", ] [[package]] @@ -1328,9 +1370,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c53dc3a653e0f64081026e4bf048d48fec9fce90c66e8326ca7292df0ff2d82" +checksum = "d55796afa1b20c2945ca8eabfc421839f2b766619209f1ede813cf2484f31804" [[package]] name = "ed25519" @@ -1351,7 +1393,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.1", + "sha2 0.9.2", "zeroize", ] @@ -1411,9 +1453,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01" +checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" dependencies = [ "errno-dragonfly", "libc", @@ -1442,7 +1484,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", ] [[package]] @@ -1514,7 +1556,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b" dependencies = [ "either", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 2.0.2", "log", "num-traits", @@ -1528,7 +1570,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c" dependencies = [ - "byteorder 1.3.4", + "byteorder", "rand 0.7.3", "rustc-hex", "static_assertions", @@ -1542,11 +1584,11 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" +checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crc32fast", "libc", "libz-sys", @@ -1562,12 +1604,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d7f1c606d158d5af4479f2971f259d8dd262f03f6f7b5b37e92eec7b8de396" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", ] +[[package]] +name = "form_urlencoded" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + [[package]] name = "frame-benchmarking" version = "2.0.0" @@ -1587,20 +1638,41 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "frame-benchmarking" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +dependencies = [ + "frame-support", + "frame-system", + "linregress", + "parity-scale-codec", + "paste", + "sp-api", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", +] + [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337ff68053dc7f7af821bdd241f367c17deb2213cc1b88cda7b856e796b6690" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "chrono", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "handlebars", "parity-scale-codec", "sc-cli", "sc-client-db", "sc-executor", "sc-service", + "serde", "sp-core", "sp-externalities", + "sp-keystore", "sp-runtime", "sp-state-machine", "structopt", @@ -1609,8 +1681,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c843800f05a7ad4653bc0db53a15e3d9bdd1cf14103e15c29e8aca200dbb1188" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -1626,8 +1697,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b5640bfcb7111643807c63cd38ecdcc923d3253e525f23ab6b366002bf8ecd5" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "serde", @@ -1638,15 +1708,14 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "807c32da14bd0e5fb751095335a07938cda6f1488f57d7b0539118e3434980a8" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "bitmask", + "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "log", - "once_cell 1.4.1", + "once_cell 1.5.2", "parity-scale-codec", "paste", "serde", @@ -1664,8 +1733,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508dc2eb44a802f1876e3dc97a76aed8f18b993f75f6cb1975cb83cf45a5d981" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1676,8 +1744,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f6d1dd14477123180c47024bcc24c1a624ea8631b4f00080d14089907397f4" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1689,8 +1756,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad38379ecedd632f286c7b94a4b9a15bffb635194de4dbf2b4458bc46cee28f" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "proc-macro2", "quote", @@ -1700,8 +1766,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d172404f0e44b867f5fd14465a27f298b8828b53d7a7a555d3759e1dec3c8f0d" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1720,7 +1785,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03e3a70ce89455777c5a93c60943e8a404c0be66bd3f53605c4a4e79baa80e91" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "parity-scale-codec", @@ -1732,8 +1797,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b128f689fd9d497c3a7e881be524a8a1e2d80e2661754add6e36c9dfdcbe373" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-api", @@ -1781,9 +1845,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" [[package]] name = "futures" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e" +checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" dependencies = [ "futures-channel", "futures-core", @@ -1796,9 +1860,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74" +checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" dependencies = [ "futures-core", "futures-sink", @@ -1815,9 +1879,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b" +checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" [[package]] name = "futures-core-preview" @@ -1842,7 +1906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9" dependencies = [ "futures 0.1.30", - "futures 0.3.6", + "futures 0.3.8", "lazy_static", "log", "parking_lot 0.9.0", @@ -1853,9 +1917,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab" +checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" dependencies = [ "futures-core", "futures-task", @@ -1865,15 +1929,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c" +checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-lite" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381a7ad57b1bad34693f63f6f377e1abded7a9c85c9d3eb6771e11c60aaadab9" +checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" dependencies = [ "fastrand", "futures-core", @@ -1886,9 +1950,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f57ed14da4603b2554682e9f2ff3c65d7567b53188db96cb71538217fc64581b" +checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -1898,17 +1962,17 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd" +checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" [[package]] name = "futures-task" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd26820a9f3637f1302da8bceba3ff33adbe53464b54ca24d4e2d4f1db30f94" +checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" dependencies = [ - "once_cell 1.4.1", + "once_cell 1.5.2", ] [[package]] @@ -1925,9 +1989,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a894a0acddba51a2d49a6f4263b1e64b8c579ece8af50fa86503d52cd1eea34" +checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" dependencies = [ "futures 0.1.30", "futures-channel", @@ -1937,7 +2001,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 0.4.27", + "pin-project 1.0.1", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1963,7 +2027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" dependencies = [ "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.8", "memchr", "pin-project 0.4.27", ] @@ -1974,6 +2038,19 @@ version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +[[package]] +name = "generator" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc" +dependencies = [ + "cc", + "libc", + "log", + "rustc_version", + "winapi 0.3.9", +] + [[package]] name = "generic-array" version = "0.12.3" @@ -1993,28 +2070,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "get_if_addrs" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7" -dependencies = [ - "c_linked_list", - "get_if_addrs-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "get_if_addrs-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48" -dependencies = [ - "gcc", - "libc", -] - [[package]] name = "getrandom" version = "0.1.15" @@ -2059,9 +2114,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "glob" @@ -2071,9 +2126,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" +checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a" dependencies = [ "aho-corasick", "bstr", @@ -2101,7 +2156,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" dependencies = [ - "byteorder 1.3.4", + "byteorder", "bytes 0.4.12", "fnv", "futures 0.1.30", @@ -2115,9 +2170,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ "bytes 0.5.6", "fnv", @@ -2127,9 +2182,24 @@ dependencies = [ "http 0.2.1", "indexmap", "slab", - "tokio 0.2.22", + "tokio 0.2.23", "tokio-util", "tracing", + "tracing-futures", +] + +[[package]] +name = "handlebars" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2764f9796c0ddca4b82c07f25dd2cb3db30b9a8f47940e78e1c883d9e95c3db9" +dependencies = [ + "log", + "pest", + "pest_derive", + "quick-error 2.0.0", + "serde", + "serde_json", ] [[package]] @@ -2153,7 +2223,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" dependencies = [ - "byteorder 1.3.4", + "byteorder", "scopeguard 0.3.3", ] @@ -2182,6 +2252,9 @@ name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash 0.4.6", +] [[package]] name = "heck" @@ -2229,6 +2302,16 @@ dependencies = [ "digest 0.8.1", ] +[[package]] +name = "hmac" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" +dependencies = [ + "crypto-mac 0.8.0", + "digest 0.9.0", +] + [[package]] name = "hmac-drbg" version = "0.2.0" @@ -2237,7 +2320,7 @@ checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" dependencies = [ "digest 0.8.1", "generic-array 0.12.3", - "hmac", + "hmac 0.7.1", ] [[package]] @@ -2302,7 +2385,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ - "quick-error", + "quick-error 1.2.3", ] [[package]] @@ -2337,23 +2420,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.8" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" +checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", - "h2 0.2.6", + "h2 0.2.7", "http 0.2.1", "http-body 0.3.1", "httparse", "httpdate", "itoa", - "pin-project 0.4.27", + "pin-project 1.0.1", "socket2", - "tokio 0.2.22", + "tokio 0.2.23", "tower-service", "tracing", "want 0.3.0", @@ -2368,11 +2451,11 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.8", + "hyper 0.13.9", "log", "rustls", "rustls-native-certs", - "tokio 0.2.22", + "tokio 0.2.23", "tokio-rustls", "webpki", ] @@ -2399,6 +2482,27 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "if-addrs" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" +dependencies = [ + "if-addrs-sys", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "if-addrs-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "impl-codec" version = "0.4.2" @@ -2441,11 +2545,11 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" +checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -2463,7 +2567,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "futures-timer 2.0.2", ] @@ -2736,9 +2840,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" +checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "libloading" @@ -2758,13 +2862,13 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.28.1" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571f5a4604c1a40d75651da141dfde29ad15329f537a779528803297d2220274" +checksum = "021f703bfef6e3da78ef9828c8a244d639b8d57eedf58360922aca5ff69dfdcd" dependencies = [ "atomic", "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.8", "lazy_static", "libp2p-core", "libp2p-core-derive", @@ -2789,24 +2893,24 @@ dependencies = [ "libp2p-yamux", "multihash", "parity-multiaddr", - "parking_lot 0.10.2", - "pin-project 0.4.27", + "parking_lot 0.11.0", + "pin-project 1.0.1", "smallvec 1.4.2", "wasm-timer", ] [[package]] name = "libp2p-core" -version = "0.22.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f13ba8c7df0768af2eb391696d562c7de88cc3a35122531aaa6a7d77754d25" +checksum = "3960524389409633550567e8a9e0684d25a33f4f8408887ff897dd9fdfbdb771" dependencies = [ "asn1_der", - "bs58", + "bs58 0.3.1", "ed25519-dalek", "either", "fnv", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", @@ -2814,17 +2918,17 @@ dependencies = [ "multihash", "multistream-select", "parity-multiaddr", - "parking_lot 0.10.2", - "pin-project 0.4.27", + "parking_lot 0.11.0", + "pin-project 1.0.1", "prost", "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", - "sha2 0.8.2", + "sha2 0.9.2", "smallvec 1.4.2", "thiserror", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", "void", "zeroize", ] @@ -2841,37 +2945,38 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74029ae187f35f4b8ddf26b9779a68b340045d708528a103917cdca49a296db5" +checksum = "567962c5c5f8a1282979441300e1739ba939024010757c3dbfab4d462189df77" dependencies = [ "flate2", - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", ] [[package]] name = "libp2p-dns" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf319822e08dd65c8e060d2354e9f952895bbc433f5706c75ed010c152aee5e" +checksum = "436280f5fe21a58fcaff82c2606945579241f32bc0eaf2d39321aa4624a66e7f" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "log", ] [[package]] name = "libp2p-floodsub" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a9acb43a3e4a4e413e0c4abe0fa49308df7c6335c88534757b647199cb8a51" +checksum = "ecc175613c5915332fd6458895407ec242ea055ae3b107a586626d5e3349350a" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "libp2p-swarm", + "log", "prost", "prost-build", "rand 0.7.3", @@ -2880,15 +2985,15 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab20fcb60edebe3173bbb708c6ac3444afdf1e3152dc2866b10c4f5497f17467" +checksum = "d500ad89ba14de4d18bebdff61a0ce3e769f1c5c5a95026c5da90187e5fff5c9" dependencies = [ - "base64 0.11.0", - "byteorder 1.3.4", + "base64 0.13.0", + "byteorder", "bytes 0.5.6", "fnv", - "futures 0.3.6", + "futures 0.3.8", "futures_codec", "hex_fmt", "libp2p-core", @@ -2898,19 +3003,19 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sha2 0.8.2", + "sha2 0.9.2", "smallvec 1.4.2", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56396ee63aa9164eacf40c2c5d2bda8c4133c2f57e1b0425d51d3a4e362583b1" +checksum = "03b90b350e37f398b73d778bd94422f4e6a3afa2c1582742ce2446b8a0dba787" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "libp2p-swarm", "log", @@ -2922,15 +3027,15 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7fa9047f8b8f544278a35c2d9d45d3b2c1785f2d86d4e1629d6edf97be3955" +checksum = "fb78341f114bf686d5fe50b33ff1a804d88fb326c0d39ee1c22db4346b21fc27" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bytes 0.5.6", "either", "fnv", - "futures 0.3.6", + "futures 0.3.8", "futures_codec", "libp2p-core", "libp2p-swarm", @@ -2939,25 +3044,25 @@ dependencies = [ "prost", "prost-build", "rand 0.7.3", - "sha2 0.8.2", + "sha2 0.9.2", "smallvec 1.4.2", "uint", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", "void", "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173b5a6b2f690c29ae07798d85b9441a131ac76ddae9015ef22905b623d0c69" +checksum = "b575514fce0a3ccbd065d6aa377bd4d5102001b05c1a22a5eee49c450254ef0f" dependencies = [ "async-std", "data-encoding", "dns-parser", "either", - "futures 0.3.6", + "futures 0.3.8", "lazy_static", "libp2p-core", "libp2p-swarm", @@ -2971,49 +3076,51 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a73a799cc8410b36e40b8f4c4b6babbcb9efd3727111bf517876e4acfa612d3" +checksum = "a92b538238c80067c6417a58a07e41002b69d129355b60ec147d6337fdff0eb0" dependencies = [ "bytes 0.5.6", - "fnv", - "futures 0.3.6", + "futures 0.3.8", "futures_codec", "libp2p-core", "log", - "parking_lot 0.10.2", - "unsigned-varint 0.4.0", + "nohash-hasher", + "parking_lot 0.11.0", + "rand 0.7.3", + "smallvec 1.4.2", + "unsigned-varint 0.5.1", ] [[package]] name = "libp2p-noise" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef6c490042f549fb1025f2892dfe6083d97a77558f450c1feebe748ca9eb15a" +checksum = "93c77142e3e5b18fefa7d267305c777c9cbe9b2232ec489979390100bebcc1e6" dependencies = [ "bytes 0.5.6", - "curve25519-dalek 2.1.0", - "futures 0.3.6", + "curve25519-dalek 3.0.0", + "futures 0.3.8", "lazy_static", "libp2p-core", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.8.2", + "sha2 0.9.2", "snow", "static_assertions", - "x25519-dalek 0.6.0", + "x25519-dalek", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad063c21dfcea4518ac9e8bd4119d33a5b26c41e674f602f41f05617a368a5c8" +checksum = "7257135609e8877f4d286935cbe1e572b2018946881c3e7f63054577074a7ee7" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "libp2p-swarm", "log", @@ -3024,19 +3131,18 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903a12e99c72dbebefea258de887982adeacc7025baa1ceb10b7fa9928f54791" +checksum = "c88d59ba3e710a8c8e0535cb4a52e9e46534924cbbea4691f8c3aaad17b58c61" dependencies = [ "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.8", "futures_codec", "libp2p-core", "log", "prost", "prost-build", - "rw-stream-sink", - "unsigned-varint 0.4.0", + "unsigned-varint 0.5.1", "void", ] @@ -3046,7 +3152,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96b3c2d5d26a9500e959a0e19743897239a6c4be78dadf99b70414301a70c006" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "log", "pin-project 0.4.27", "rand 0.7.3", @@ -3056,17 +3162,17 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0c9e8a4cd69d97e9646c54313d007512f411aba8c5226cfcda16df6a6e84a3" +checksum = "02ba1aa5727ccc118c09ba5111480873f2fe5608cb304e258fd12c173ecf27c9" dependencies = [ "async-trait", "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "libp2p-swarm", "log", - "lru 0.6.0", + "lru 0.6.1", "minicbor", "rand 0.7.3", "smallvec 1.4.2", @@ -3076,12 +3182,12 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7193e444210132237b81b755ec7fe53f1c4bd2f53cf719729b94c0c72eb6eaa1" +checksum = "ffa6fa33b16956b8a58afbfebe1406866011a1ab8960765bd36868952d7be6a1" dependencies = [ "either", - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "log", "rand 0.7.3", @@ -3092,14 +3198,14 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f42ec130d7a37a7e47bf4398026b7ad9185c08ed26972e2720f8b94112796f" +checksum = "9d0b6f4ef48d9493607fae069deecce0579320a1f3de6cb056770b151018a9a5" dependencies = [ "async-std", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", - "get_if_addrs", + "if-addrs", "ipnet", "libp2p-core", "log", @@ -3108,23 +3214,23 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea7acb0a034f70d7db94c300eba3f65c0f6298820105624088a9609c9974d77" +checksum = "945bed3c989a1b290b5a0d4e8fa6e44e01840efb9a5ab3f0d3d174f0e451ac0e" dependencies = [ "async-std", - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c1faac6f92c21fbe155417957863ea822fba9e9fd5eb24c0912336a100e63f" +checksum = "66518a4455e15c283637b4d7b579aef928b75a3fc6c50a41e7e6b9fa86672ca0" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -3134,31 +3240,31 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d650534ebd99f48f6fa292ed5db10d30df2444943afde4407ceeddab8e513fca" +checksum = "edc561870477523245efaaea1b6b743c70115f10c670e62bcbbe4d3153be5f0c" dependencies = [ "async-tls", "either", - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "log", "quicksink", "rustls", "rw-stream-sink", "soketto", - "url 2.1.1", + "url 2.2.0", "webpki", - "webpki-roots 0.18.0", + "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781d9b9f043dcdabc40640807125368596b849fd4d96cdca2dcf052fdf6f33fd" +checksum = "07c0c9b6ef7a168c2ae854170b0b6b77550599afe06cc3ac390eb45c5d9c7110" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "libp2p-core", "parking_lot 0.11.0", "thiserror", @@ -3207,7 +3313,7 @@ dependencies = [ [[package]] name = "light-bitcoin" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "light-bitcoin-chain", "light-bitcoin-crypto", @@ -3221,7 +3327,7 @@ dependencies = [ [[package]] name = "light-bitcoin-chain" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "hex", "light-bitcoin-crypto", @@ -3234,22 +3340,22 @@ dependencies = [ [[package]] name = "light-bitcoin-crypto" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "digest 0.9.0", "light-bitcoin-primitives", "ripemd160", - "sha-1 0.9.1", - "sha2 0.9.1", + "sha-1 0.9.2", + "sha2 0.9.2", "siphasher", ] [[package]] name = "light-bitcoin-keys" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ - "bs58", + "bs58 0.3.1", "hex", "libsecp256k1", "light-bitcoin-crypto", @@ -3262,7 +3368,7 @@ dependencies = [ [[package]] name = "light-bitcoin-merkle" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "light-bitcoin-chain", "light-bitcoin-primitives", @@ -3273,9 +3379,9 @@ dependencies = [ [[package]] name = "light-bitcoin-primitives" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ - "byteorder 1.3.4", + "byteorder", "fixed-hash", "hex", "impl-codec", @@ -3287,7 +3393,7 @@ dependencies = [ [[package]] name = "light-bitcoin-script" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "hex", "light-bitcoin-chain", @@ -3300,7 +3406,7 @@ dependencies = [ [[package]] name = "light-bitcoin-serialization" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "light-bitcoin-primitives", "light-bitcoin-serialization-derive", @@ -3309,7 +3415,7 @@ dependencies = [ [[package]] name = "light-bitcoin-serialization-derive" version = "0.2.0" -source = "git+https://github.com/chainx-org/light-bitcoin#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" +source = "git+https://github.com/chainx-org/light-bitcoin?branch=master#b70aa84eecc2eb6a6cb9d4e8ee786e8bf9c5a63f" dependencies = [ "proc-macro2", "quote", @@ -3410,6 +3516,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "loom" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed" +dependencies = [ + "cfg-if 0.1.10", + "generator", + "scoped-tls", + "serde", + "serde_json", +] + [[package]] name = "lru" version = "0.4.3" @@ -3421,18 +3540,18 @@ dependencies = [ [[package]] name = "lru" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111b945ac72ec09eb7bc62a0fbdc3cc6e80555a7245f52a69d3921a75b53b153" +checksum = "be716eb6878ca2263eb5d00a781aa13264a794f519fe6af4fbb2668b2d5441c0" dependencies = [ - "hashbrown 0.8.2", + "hashbrown 0.9.1", ] [[package]] name = "lru_time_cache" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb241df5c4caeb888755363fc95f8a896618dc0d435e9e775f7930cb099beab" +checksum = "ebac060fafad3adedd0c66a80741a92ff4bc8e94a273df2ba3770ab206f2e29a" [[package]] name = "mach" @@ -3443,6 +3562,12 @@ dependencies = [ "libc", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "matchers" version = "0.0.1" @@ -3475,9 +3600,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memmap" @@ -3521,7 +3646,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78" dependencies = [ - "byteorder 1.3.4", + "byteorder", "keccak", "rand_core 0.5.1", "zeroize", @@ -3529,18 +3654,18 @@ dependencies = [ [[package]] name = "minicbor" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc03ad6f8f548db7194a5ff5a6f96342ecae4e3ef67d2bf18bacc0e245cd041" +checksum = "9a2ef6aa869726518c5d8206fa5d1337bda8a0442807611be617891c018fa781" dependencies = [ "minicbor-derive", ] [[package]] name = "minicbor-derive" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c214bf3d90099b52f3e4b328ae0fe34837fd0fab683ad1e10fceb4629106df48" +checksum = "2b3569c0dbfff1b8d5f1434c642b67f5bf81c0f354a3f5f8f180b549dba3c07c" dependencies = [ "proc-macro2", "quote", @@ -3596,7 +3721,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", "mio", - "miow 0.3.5", + "miow 0.3.6", "winapi 0.3.9", ] @@ -3625,9 +3750,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ "socket2", "winapi 0.3.9", @@ -3648,8 +3773,8 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "digest 0.9.0", - "sha-1 0.9.1", - "sha2 0.9.1", + "sha-1 0.9.2", + "sha2 0.9.2", "sha3", "unsigned-varint 0.5.1", ] @@ -3662,12 +3787,12 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multistream-select" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0075eaaf3102b344f122e1a2e1cedf0f3d388c5fb27a0e31eb09c1151fbbd1" +checksum = "93faf2e41f9ee62fb01680ed48f3cc26652352327aa2e59869070358f6b7dd75" dependencies = [ "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.8", "log", "pin-project 1.0.1", "smallvec 1.4.2", @@ -3721,19 +3846,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "nix" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - [[package]] name = "nodrop" version = "0.1.14" @@ -3779,9 +3891,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg 1.0.1", "num-traits", @@ -3801,9 +3913,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg 1.0.1", "libm", @@ -3838,9 +3950,9 @@ dependencies = [ [[package]] name = "object" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" [[package]] name = "once_cell" @@ -3853,9 +3965,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" dependencies = [ "parking_lot 0.11.0", ] @@ -3889,9 +4001,9 @@ dependencies = [ [[package]] name = "orml-currencies" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dacf5edc83e4b16cd9557f25203d5c0195123733500dfbbbf4d934469a9c9f8" +checksum = "e25d0216a08759868edcbf434b198a8a76cf1f04015a6e4509fbf09d5f4825c0" dependencies = [ "frame-support", "frame-system", @@ -3905,9 +4017,9 @@ dependencies = [ [[package]] name = "orml-traits" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "920768cee316bce6c870ba4adf96a3f7f00b2afce610877033173ea5a467dc1e" +checksum = "1894c45ef7dd34390c71ee63189d1bfdb873347982d33c7378a7698d818aba1f" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -3921,9 +4033,9 @@ dependencies = [ [[package]] name = "orml-utilities" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8e7a9d354df744df78a7a1cc10ecd4f92477a726f965608e43f97083bf95be" +checksum = "12b86e9fe38ffd16632353a497483fc76692999ee0b5216152e70773e7f108dd" dependencies = [ "frame-support", "parity-scale-codec", @@ -3962,8 +4074,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65706c382ae14ef2768e7411c5faaf1e0a310b4a86d17c3a93dfacb2c5987576" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -3978,10 +4089,9 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e602bfb8c4a6498274c246cd8cd5c3b19b37324a6124542d944d95a3610bd9" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "pallet-authorship", @@ -4004,10 +4114,9 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56bf116724c3adb7eee6ae49adfc28d3d38d9d34bbfdcc009497120256309a37" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4019,10 +4128,9 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7e133ae2e98e59bdd9e794ffaa3cb2e7dc43d7ebe2525dd00aed688eb3563e" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4036,10 +4144,9 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82eeef542d93dd09f356346d5b687ebe74622b50f34603f560855e3640d38811" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4052,8 +4159,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1244bfae7c6f8d568789d3c2a031baab37e280781fb06633d1f1f206991a126e" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4084,14 +4190,12 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8a3b81d434ce9ef2c34adf61afa5ecf2a6e386cd626369deda1ca2f7a3b076" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "pallet-authorship", - "pallet-finality-tracker", "pallet-session", "parity-scale-codec", "serde", @@ -4111,7 +4215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d45fdc5352cc3d52284e7117c03a48dfd8749e667f92a4b5e749dd963c9f1431" dependencies = [ "enumflags2", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "parity-scale-codec", @@ -4144,8 +4248,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d234bf46076a835b473a987f089299ffa3efd961a92b5be9384cc280fcc8c8f" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4161,8 +4264,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c6e1aed47ccc244c6d197a117efdbfe76cd5c1c3815b6aafa822542b625bef" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4176,8 +4278,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753a016a076edf8f3d5e6483092034f9c62efd3fbf86bdefbe813cb91d065777" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4192,8 +4293,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59762b04bbe918498789a48b9997702027436c3d75ccd640f2d65e592213e3d8" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4208,8 +4308,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b62b8adc02901769b7756b054fa732b6d1aad01e8a2d6873a70fdcd38c59a1" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4222,10 +4321,9 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8abd5ae3f0ca51809f1e5173877ead7b2ffe90704773d150fd27496f91f9a9" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4238,8 +4336,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8abf520fc0c3259be05f164d43d34d52c86aeef8e8c5fded40145394394fc75d" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4259,8 +4356,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13642cbbb2ea520ca2021299baec604de102a1d033dd32812c946cb03f48f47e" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4274,10 +4370,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccddd55b713f541dff6ccf063cc7ddbc4fc41e92a9fdad8ec9562a0e3b465016" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -4292,8 +4387,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fe2fc67f2eb123199a5b8fb89a8e1c30e5d6d6b1d98e0330bac85c0d8c46f1" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4310,8 +4404,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fb0463589eeb1be8a3237e7260d139240e7d113950904f5a3cae5502576078" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4329,8 +4422,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c8b6676df5a4b411a283b9ea22551094710180fa5caebeae9eea8e9dbfa620" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "parity-scale-codec", @@ -4343,8 +4435,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b08dbe44924346f0728351265fb8c5ab80dd30f664e0a2a10f83597f4090264" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4358,8 +4449,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b89975aed47941d35d289318999178b986a158010e6cf5633caa2c0588d349" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -4387,20 +4477,20 @@ dependencies = [ [[package]] name = "parity-multiaddr" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7ad66970bbab360c97179b60906e2dc4aef1f7fca8ab4e5c5db8c97b16814a" +checksum = "60d477bda9666bc37e5ac9e7e7ee3684f745ec33e6e86a5b48640e0407acda26" dependencies = [ "arrayref", - "bs58", - "byteorder 1.3.4", + "bs58 0.4.0", + "byteorder", "data-encoding", "multihash", "percent-encoding 2.1.0", "serde", "static_assertions", "unsigned-varint 0.5.1", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -4409,7 +4499,7 @@ version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" dependencies = [ - "arrayvec 0.5.1", + "arrayvec 0.5.2", "bitvec", "byte-slice-cast", "parity-scale-codec-derive", @@ -4445,7 +4535,7 @@ dependencies = [ "libc", "log", "mio-named-pipes", - "miow 0.3.5", + "miow 0.3.6", "rand 0.7.3", "tokio 0.1.22", "tokio-named-pipes", @@ -4492,7 +4582,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61" dependencies = [ - "byteorder 1.3.4", + "byteorder", "bytes 0.4.12", "httparse", "log", @@ -4501,7 +4591,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.1.1", + "url 2.2.0", ] [[package]] @@ -4632,11 +4722,20 @@ dependencies = [ name = "pbkdf2" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +dependencies = [ + "byteorder", + "crypto-mac 0.7.0", + "rayon", +] + +[[package]] +name = "pbkdf2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" dependencies = [ - "byteorder 1.3.4", - "crypto-mac 0.7.0", - "rayon", + "crypto-mac 0.8.0", ] [[package]] @@ -4663,6 +4762,49 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +dependencies = [ + "maplit", + "pest", + "sha-1 0.8.2", +] + [[package]] name = "petgraph" version = "0.5.1" @@ -4715,9 +4857,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-utils" @@ -4739,9 +4881,9 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polling" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab773feb154f12c49ffcfd66ab8bdcf9a1843f950db48b0d8be9d4393783b058" +checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" dependencies = [ "cfg-if 0.1.10", "libc", @@ -4771,15 +4913,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "primitive-types" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" +checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809" dependencies = [ "fixed-hash", "impl-codec", @@ -4822,9 +4964,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -4912,7 +5054,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f53bc2558e8376358ebdc28301546471d67336584f6438ed4b7c7457a055fd7" dependencies = [ - "byteorder 1.3.4", + "byteorder", "log", "parity-wasm", ] @@ -4923,6 +5065,12 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-error" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" + [[package]] name = "quicksink" version = "0.1.2" @@ -5161,25 +5309,25 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque", + "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.0", "lazy_static", "num_cpus", ] @@ -5212,18 +5360,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745c1787167ddae5569661d5ffb8b25ae5fedbf46717eaa92d652221cec72623" +checksum = "e17626b2f4bcf35b84bf379072a66e28cfe5c3c6ae58b38e4914bb8891dabece" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144" +checksum = "0c523ccaed8ac4b0288948849a350b37d3035827413c458b6a40ddb614bb4f72" dependencies = [ "proc-macro2", "quote", @@ -5243,9 +5391,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -5259,15 +5407,15 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" dependencies = [ - "byteorder 1.3.4", + "byteorder", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "region" @@ -5304,7 +5452,7 @@ checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" dependencies = [ "cc", "libc", - "once_cell 1.4.1", + "once_cell 1.5.2", "spin", "untrusted", "web-sys", @@ -5351,14 +5499,14 @@ dependencies = [ "base64 0.12.3", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] name = "rustc-demangle" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" [[package]] name = "rustc-hash" @@ -5412,7 +5560,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "pin-project 0.4.27", "static_assertions", ] @@ -5444,13 +5592,13 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e38e4486f8cb4c7df9679b4bdab94d51c3bd107568a75922baa31a54844c47c" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ + "async-trait", "bytes 0.5.6", "derive_more", "either", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "libp2p", "log", @@ -5466,6 +5614,7 @@ dependencies = [ "sp-authority-discovery", "sp-blockchain", "sp-core", + "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", ] @@ -5473,10 +5622,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527f6822cf592ac2b4a6ca7d04601c48d6728b8c03d9a9cc0488e4b535c69c6d" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -5498,8 +5646,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bee59dc560f30e72ee95c224e3e75299b53b619e659a38af9db2639803c08ee" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5516,17 +5663,20 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d0e4d53e723ee6bad8cadec9651086887d1d920996e1589ee7dfa767a7cba9" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "sc-chain-spec-derive", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-finality-grandpa", "sc-network", "sc-telemetry", "serde", "serde_json", "sp-chain-spec", + "sp-consensus-babe", "sp-core", "sp-runtime", ] @@ -5534,8 +5684,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38af2ca789e2d2fa2aa0ec16d27dc648fa4d64ecb10760d2f552b2c86ea7a403" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5546,29 +5695,25 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2ce2952f155bd72b85ff866c588b6bae8f1bc183275f1a7a54eee55535a640" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "ansi_term 0.12.1", "atty", "bip39", "chrono", - "derive_more", "fdlimit", - "futures 0.3.6", + "futures 0.3.8", "hex", "lazy_static", "libp2p", "log", "names", - "nix", "parity-scale-codec", - "parity-util-mem", "rand 0.7.3", "regex", "rpassword", + "sc-cli-proc-macro", "sc-client-api", - "sc-informant", "sc-keystore", "sc-network", "sc-service", @@ -5579,29 +5724,38 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-keyring", + "sp-keystore", "sp-panic-handler", "sp-runtime", - "sp-state-machine", "sp-utils", "sp-version", "structopt", - "substrate-prometheus-endpoint", - "time", - "tokio 0.2.22", + "thiserror", + "tokio 0.2.23", "tracing", "tracing-log", "tracing-subscriber", ] +[[package]] +name = "sc-cli-proc-macro" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sc-client-api" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fafb2b2861e847657c4656d2ae2249c9f3f6a76fb92a22f750325b77e1fb4c8" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "fnv", - "futures 0.3.6", + "futures 0.3.8", "hash-db", "hex-literal", "kvdb", @@ -5619,6 +5773,7 @@ dependencies = [ "sp-externalities", "sp-inherents", "sp-keyring", + "sp-keystore", "sp-runtime", "sp-state-machine", "sp-std", @@ -5633,8 +5788,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc82e81fafb162ceda7635932c8b5d65b8bc7b021e49546ab913e2e2458524d" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "blake2-rfc", "hash-db", @@ -5664,8 +5818,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6dd5b4e7a37bf78e85161bd6f01a09f0eb7cf49f2961d136885659ad6e30d49" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5676,12 +5829,11 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075c3826f181c49723215636f1b840b22c00e9be2acbaea21a86121b4dddb709" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "fork-tree", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "log", "merlin", @@ -5711,6 +5863,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-keystore", "sp-runtime", "sp-timestamp", "sp-utils", @@ -5721,17 +5874,15 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e580caef0fa657f2d7b7d083ba410d1f9dbb9c1ff21113a06ef4905d6ed7ea" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.8", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "sc-consensus-babe", "sc-consensus-epochs", - "sc-keystore", "sc-rpc-api", "serde", "sp-api", @@ -5740,14 +5891,14 @@ dependencies = [ "sp-consensus", "sp-consensus-babe", "sp-core", + "sp-keystore", "sp-runtime", ] [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f890c5e6c1dbb34d3e0bfde9242b1bf88dc44afee8746d0fa4a91e8e046f21dd" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5760,10 +5911,9 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a334a099d5cac9054ea1ef1db4be8ed5518270027798f96d2a68c5bf69af8e" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -5772,6 +5922,7 @@ dependencies = [ "sc-telemetry", "sp-api", "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", @@ -5779,13 +5930,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-trie", ] [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050ab17e248045000374952fa91b4ccc82d4da1ee615fb408d744802084cb2d7" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "sc-client-api", @@ -5799,8 +5950,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af77c7fda9659559e257fe330af26e7c2e8f61583c2a5c45f4c9db73d58a902b" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "lazy_static", @@ -5819,6 +5969,7 @@ dependencies = [ "sp-panic-handler", "sp-runtime-interface", "sp-serializer", + "sp-tasks", "sp-trie", "sp-version", "sp-wasm-interface", @@ -5828,8 +5979,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6663e4d1d2f8255e6c1994ce548365a7631a82f7ab231d0b8a122cc2a0011949" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "log", @@ -5846,8 +5996,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78aeea37a28b83af11fe621ee047758e125341db96efaf7f553a4180fe48d6b8" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "parity-scale-codec", @@ -5862,8 +6011,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c7d29c1932c5c3281d5324ead624709c1798031df72908ce6012b3651dea0a" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "parity-scale-codec", @@ -5881,13 +6029,12 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4095b26b5717265d3dca8e2d70f977dfd4085f1c352dbf82217953da90a96e46" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "finality-grandpa", "fork-tree", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -5909,8 +6056,8 @@ dependencies = [ "sp-consensus", "sp-core", "sp-finality-grandpa", - "sp-finality-tracker", "sp-inherents", + "sp-keystore", "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", @@ -5919,12 +6066,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d8c6b8454772f8ef3835c0297319c250103d7a3fba0406238c0d63b9c2f88e" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "finality-grandpa", - "futures 0.3.6", + "futures 0.3.8", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -5944,11 +6090,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81dbdbba0420bb4c0bf2a79bcbb78de5bd1349aad8467b3115f82be579b2972" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.6", + "futures 0.3.8", "log", "parity-util-mem", "sc-client-api", @@ -5963,10 +6108,12 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bbf8b58ed80e1d375aaa8ee5dedf17f68fea30c900440a695fb630a1757283" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ + "async-trait", "derive_more", + "futures 0.3.8", + "futures-util", "hex", "merlin", "parking_lot 0.10.2", @@ -5974,14 +6121,14 @@ dependencies = [ "serde_json", "sp-application-crypto", "sp-core", + "sp-keystore", "subtle 2.3.0", ] [[package]] name = "sc-light" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00ce4c6f21d572549b8b8a55757a0e548ddd670ab89d9415125a4e09c0ffa74" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "hash-db", "lazy_static", @@ -6000,20 +6147,19 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e58ccd69ea8dd0c1e1d98e5e7ed2969aaf14d45dcf98416c679a968e752850" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "async-std", "async-trait", "bitflags", - "bs58", + "bs58 0.3.1", "bytes 0.5.6", "derive_more", "either", "erased-serde", "fnv", "fork-tree", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "futures_codec", "hex", @@ -6055,10 +6201,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ddb2a1cb6cd53b46e76f61c662d1561da4a7dc16a375c37849fd1f429b6803" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "libp2p", "log", @@ -6071,14 +6216,13 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79495bd858351489fcebeb4e47821e15329ad5606f0d7983836e069005c3d9dd" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", - "hyper 0.13.8", + "hyper 0.13.9", "hyper-rustls", "log", "num_cpus", @@ -6099,10 +6243,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfaa3d62db8ad549e6d21b6e353e00e2e7338c8623c01c79e8f36b035266a4b" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "libp2p", "log", "serde_json", @@ -6113,8 +6256,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d42c942480b516b4bd4a32d1434f634126220cb00c8d482658700cc58dc22c6f" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6123,10 +6265,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc3793d8ff10dbeb0b683151a1ea33570dc994195cc29451e0b72ce35179adc" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -6143,6 +6284,7 @@ dependencies = [ "sp-blockchain", "sp-chain-spec", "sp-core", + "sp-keystore", "sp-offchain", "sp-rpc", "sp-runtime", @@ -6156,11 +6298,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb4b79b9b6b410c745a00eb4ead11b2ef0819e6eac970a5ec6415abf82777be" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.8", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -6181,8 +6322,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9118867e60870b99cc1877edb4c35878babe6696335841e5b636dcba2fdb3d" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "futures 0.1.30", "jsonrpc-core", @@ -6200,14 +6340,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04b2096d7dac26c52656cd2c85bc208d2ca3316ea2185fd775763d558a980da" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "directories", "exit-future", "futures 0.1.30", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "hash-db", "jsonrpc-core", @@ -6246,6 +6385,7 @@ dependencies = [ "sp-externalities", "sp-inherents", "sp-io", + "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", @@ -6257,14 +6397,14 @@ dependencies = [ "substrate-prometheus-endpoint", "tempfile", "tracing", + "tracing-futures", "wasm-timer", ] [[package]] name = "sc-state-db" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56341f78caf54af053889d1e863ca9b03004a3f471947805226fa8a6be9c9a59" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "parity-scale-codec", @@ -6278,10 +6418,9 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5883219d0ccec3e4d50079ba63f8accc71659b93537cff66de326a382b138c4b" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "libp2p", "log", @@ -6300,8 +6439,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695f005588c8b6957e56c86bc4624969a0c1a8e4e4d2f4fe0bb4039a26a10503" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "erased-serde", "log", @@ -6320,11 +6458,10 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31fed765b519362f7ae824a2d3a2e6ee9912ac972e8ff61838d4ff0831cb3077" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.8", "linked-hash-map", "log", "parity-util-mem", @@ -6342,11 +6479,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248d4bcde22c936b462e4aa6c32e0f49a96942b123a1a46bc60cd02fbf907002" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.8", "futures-diagnose", "intervalier", "log", @@ -6383,7 +6519,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "curve25519-dalek 2.1.0", "getrandom 0.1.15", "merlin", @@ -6423,9 +6559,9 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfde5d1531034db129e95c76ac857e2baecea3443579d493d02224950b0fb6d" +checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" dependencies = [ "proc-macro2", "quote", @@ -6532,9 +6668,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" +checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7" dependencies = [ "dtoa", "linked-hash-map", @@ -6556,12 +6692,12 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" +checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6581,12 +6717,12 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6606,11 +6742,12 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.0.9" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e" +checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127" dependencies = [ "lazy_static", + "loom", ] [[package]] @@ -6621,11 +6758,10 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook-registry" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" +checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab" dependencies = [ - "arc-swap", "libc", ] @@ -6719,16 +6855,16 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2 0.9.1", + "sha2 0.9.2", "subtle 2.3.0", - "x25519-dalek 1.1.0", + "x25519-dalek", ] [[package]] name = "socket2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" +checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d" dependencies = [ "cfg-if 0.1.10", "libc", @@ -6745,18 +6881,17 @@ dependencies = [ "base64 0.12.3", "bytes 0.5.6", "flate2", - "futures 0.3.6", + "futures 0.3.8", "httparse", "log", "rand 0.7.3", - "sha-1 0.9.1", + "sha-1 0.9.2", ] [[package]] name = "sp-allocator" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79a1db780708b6b71e9914e2b1d11b3e61c9bfb492c88b1024115e1a6661da" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", "log", @@ -6768,8 +6903,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953a3296335d9761311763dbe6855109ea4bea915e27cf5633d8b01057898302" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "hash-db", "parity-scale-codec", @@ -6784,8 +6918,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8247ca24a2a881af2ac675c8ec33584944965d6d45645bbec16fe327ce42dce6" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6797,8 +6930,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885eca124aa6ce0bba57c08bc48c4357096996d630a77f572580ef8e2e4df034" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "serde", @@ -6810,8 +6942,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "667775bc50eb214225df18c92e4ec57acc7e2dc78d7d210eb4dd930db1a73995" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "integer-sqrt", "num-traits", @@ -6824,8 +6955,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7748c0e859bf4c3dda84849a72af83c9f85bb21a7b7c085ed161516fa00d1e" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-api", @@ -6837,8 +6967,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58623adee1ed41752d76151762c80801758f88f85e4016d0338f2b01f4e7bd44" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6849,8 +6978,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d7fca8aa126a9d295843d592f44b48d8cf93880862baeff2968164598ab26c" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-api", @@ -6862,10 +6990,8 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37387284973e2edceefaa673930282801ea238e5892a2cc6aa02f7f2e7601df" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "derive_more", "log", "lru 0.4.3", "parity-scale-codec", @@ -6875,13 +7001,13 @@ dependencies = [ "sp-database", "sp-runtime", "sp-state-machine", + "thiserror", ] [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150ce7661d02d4d0509a4a8364ab3b71a5ef2faf3f97d22d4b76bc0786d9e28b" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "serde", "serde_json", @@ -6890,11 +7016,9 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b460103293bbf2f4193e43c4f031fdc099c5e27c782369bbb4dacc7765e84057" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "derive_more", - "futures 0.3.6", + "futures 0.3.8", "futures-timer 3.0.2", "libp2p", "log", @@ -6911,14 +7035,14 @@ dependencies = [ "sp-utils", "sp-version", "substrate-prometheus-endpoint", + "thiserror", "wasm-timer", ] [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8050a73302f354f45d0dee610e69ed39aadf43ab8a7528bdf3df8427276dc739" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "merlin", "parity-scale-codec", @@ -6929,6 +7053,7 @@ dependencies = [ "sp-consensus-vrf", "sp-core", "sp-inherents", + "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", @@ -6937,8 +7062,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ea323ccf4ec8aad353fbc9016a1cb8cbf0d872d33bc8874cb0753b014fb7fc" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -6947,8 +7071,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3345ee42ea5319bd6e3329bc3b5ee68b09f14d677378b27409a3a52d5ebe9990" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -6960,16 +7083,14 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92ac5c674ee2cd9219d084301b4cbb82b28a94a0f3087bf4bea0ef3067ebb5c" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "base58", "blake2-rfc", - "byteorder 1.3.4", - "derive_more", + "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.6", + "futures 0.3.8", "hash-db", "hash256-std-hasher", "hex", @@ -6995,6 +7116,7 @@ dependencies = [ "sp-std", "sp-storage", "substrate-bip39", + "thiserror", "tiny-bip39", "tiny-keccak", "twox-hash", @@ -7005,8 +7127,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1c352eceefe5bcdfc27f13a2fd038fc571b7aca5146f2cd651d40e9d2457dd" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7015,8 +7136,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3750b084e0f4677f6e834a974f30b1ba97fc2fe00185c9d03611a2228446dc" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "proc-macro2", "quote", @@ -7026,8 +7146,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d87fcd0e0fc5e025459cfe769803488d4894e36d0f8cef80b5239d2e7ef6580" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "environmental", "parity-scale-codec", @@ -7038,8 +7157,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789d960506306f34fb0a2da547956ba1f23d6a29032291a7284c943906feddcb" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "finality-grandpa", "log", @@ -7048,6 +7166,7 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-core", + "sp-keystore", "sp-runtime", "sp-std", ] @@ -7066,23 +7185,21 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365e5aee23640631e63e8634f1d804e33c8fcb521f4052910f29abaa2df1c1cf" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "derive_more", "parity-scale-codec", "parking_lot 0.10.2", "sp-core", "sp-std", + "thiserror", ] [[package]] name = "sp-io" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e1dee9244eb6cba1bef9b3a4ec288185e1380e455f1fd348b60252592c1cf0" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "hash-db", "libsecp256k1", "log", @@ -7090,6 +7207,7 @@ dependencies = [ "parking_lot 0.10.2", "sp-core", "sp-externalities", + "sp-keystore", "sp-runtime-interface", "sp-state-machine", "sp-std", @@ -7103,8 +7221,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f76feeb27b218d58523931ea2d708b622c3bd96a3be1c3a5895bba0f7a54c13" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "lazy_static", "sp-core", @@ -7112,11 +7229,26 @@ dependencies = [ "strum", ] +[[package]] +name = "sp-keystore" +version = "0.8.0" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +dependencies = [ + "async-trait", + "derive_more", + "futures 0.3.8", + "merlin", + "parity-scale-codec", + "parking_lot 0.10.2", + "schnorrkel", + "sp-core", + "sp-externalities", +] + [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54bb6d3d49dccf6ee26586a29ce8aabade8e102e51ed5009660ef7abb973eb7d" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "serde", @@ -7128,8 +7260,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d784c5576824b0ffa4cb359b7eebfd87511c49685b170b8214aabaa5f2454c87" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7140,8 +7271,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd5e101b2510ad84adaeb4589e6a94fdc741242ab1e39b89c87a647133205ad" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "sp-api", "sp-core", @@ -7151,8 +7281,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "492126eb766b3b6740e4e4929d6527d37708598b7296a664f3680c0f0c1fc573" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "backtrace", "log", @@ -7161,8 +7290,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c6678f4b42421e6dcdf3896a0c81a403c29ef1cf8d74b046d59125d40da911" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "serde", "sp-core", @@ -7171,8 +7299,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62542f8ce9d5fcb43a4dd3c3a53326d33aacf9b0bc9d353d6fe9fd5ff3031747" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "either", "hash256-std-hasher", @@ -7194,8 +7321,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7e363c480cc8c9019b84f85d10c0b56a184079d5d840d2d1d55087ad835dc6" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7211,8 +7337,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cf56a38544293e54dbe0aa7b6aed1e046bfc704b6fc3de7255897dca98ccb1" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "Inflector", "proc-macro-crate", @@ -7224,8 +7349,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643933e971979094c9d4b27b015c7250985a262e405bb9ad090336d8ceb5b2b9" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "serde", "serde_json", @@ -7234,8 +7358,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d138b1f548933003feaa967de49ed87066643073bcc41be45ef2daaa0991c133" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-api", @@ -7248,8 +7371,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b06f9839d8b4312486626bde31d6cd7763dd9b7d93ea9e70c01ca30f0998032" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7259,8 +7381,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58335de98bca196683a8ef22195a8a43b457b8bc705dba3124138ffc2ee720" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "hash-db", "log", @@ -7274,6 +7395,7 @@ dependencies = [ "sp-panic-handler", "sp-std", "sp-trie", + "thiserror", "trie-db", "trie-root", ] @@ -7281,14 +7403,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2d6e166cead2d3b1d3d8fe0e787d076b7d0296b1760a0d7d340846d0ba42c5" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" [[package]] name = "sp-storage" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4625e6f8f40995939560f48f89028f658b7929657c68d01c571c81ab5619ff" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7298,11 +7418,23 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-tasks" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +dependencies = [ + "log", + "sp-core", + "sp-externalities", + "sp-io", + "sp-runtime-interface", + "sp-std", +] + [[package]] name = "sp-timestamp" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb398f0a5d2798ad4e02450b3089534547b448d22ebe6f3b2c03f74170f58d1" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7316,8 +7448,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a5c42c5450991ca3a28c190e75122f5ccedbcb024953e7c357e7aa2afd8534" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "parity-scale-codec", @@ -7330,11 +7461,10 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b34ee48341c17c6e2f1e55f6076918f46b0c4505a99ad69ab1edda8b45bbd8" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "derive_more", - "futures 0.3.6", + "futures 0.3.8", "log", "parity-scale-codec", "serde", @@ -7346,8 +7476,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3aae57c8ae81ba978503137a8c625d2963eb425dd90dec0d96b4ed18d8bfd55" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "hash-db", "memory-db", @@ -7361,10 +7490,9 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84310a02e2ac89b5e288d7af980414fd88753e3caba92aab1983cd2819991150" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "futures-core", "futures-timer 3.0.2", "lazy_static", @@ -7374,8 +7502,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21935199c8765f0d02facc718f9c83149a70ea684fb03612e5161c682b38a301" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7387,8 +7514,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c28225e8b7ec7e260f8b46443f8731abda206334cb75c740d2407693f38167" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7499,8 +7625,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bed6646a0159b9935b5d045611560eeef842b78d7adc3ba36f5ca325a13a0236" dependencies = [ - "hmac", - "pbkdf2", + "hmac 0.7.1", + "pbkdf2 0.3.0", "schnorrkel", "sha2 0.8.2", "zeroize", @@ -7518,11 +7644,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e6202803178f25f71a3218a69341289d38c1369cc63e78dfe51577599163f7" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.6", + "futures 0.3.8", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -7542,16 +7667,15 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3e361741d066bfc29554b9f1bc8e4ac927eb4bd33dd8bb0486969edd8b0b5a" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "async-std", "derive_more", "futures-util", - "hyper 0.13.8", + "hyper 0.13.9", "log", "prometheus", - "tokio 0.2.22", + "tokio 0.2.23", ] [[package]] @@ -7574,9 +7698,9 @@ checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" [[package]] name = "syn" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ "proc-macro2", "quote", @@ -7641,18 +7765,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2", "quote", @@ -7701,18 +7825,20 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2" +checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" dependencies = [ - "failure", - "hmac", - "once_cell 1.4.1", - "pbkdf2", + "anyhow", + "hmac 0.8.1", + "once_cell 1.5.2", + "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.8.2", + "sha2 0.9.2", + "thiserror", "unicode-normalization", + "zeroize", ] [[package]] @@ -7726,9 +7852,18 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" @@ -7756,9 +7891,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff" dependencies = [ "bytes 0.5.6", "fnv", @@ -7814,7 +7949,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.30", ] @@ -7870,7 +8005,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.30", "lazy_static", "log", @@ -7891,7 +8026,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio 0.2.22", + "tokio 0.2.23", "webpki", ] @@ -7945,9 +8080,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "lazy_static", "log", @@ -7962,7 +8097,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.30", "slab", "tokio-executor 0.1.10", @@ -8012,7 +8147,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite", - "tokio 0.2.22", + "tokio 0.2.23", ] [[package]] @@ -8063,6 +8198,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tracing-futures" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +dependencies = [ + "pin-project 0.4.27", + "tracing", +] + [[package]] name = "tracing-log" version = "0.1.1" @@ -8086,9 +8231,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef0a5e15477aa303afbfac3a44cba9b6430fdaad52423b1e6c0dbbe28c3eedd" +checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -8166,13 +8311,19 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + [[package]] name = "uint" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" dependencies = [ - "byteorder 1.3.4", + "byteorder", "crunchy", "rustc-hex", "static_assertions", @@ -8198,18 +8349,18 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae" [[package]] name = "unicode-width" @@ -8260,8 +8411,10 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" dependencies = [ + "bytes 0.5.6", "futures-io", "futures-util", + "futures_codec", ] [[package]] @@ -8283,10 +8436,11 @@ dependencies = [ [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna 0.2.0", "matches", "percent-encoding 2.1.0", @@ -8433,7 +8587,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "js-sys", "parking_lot 0.11.0", "pin-utils", @@ -8635,18 +8789,18 @@ dependencies = [ [[package]] name = "wast" -version = "25.0.2" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000df4e05cdb4cbc1d0bb1e7e5ea86adb3f1295850c9effb9a47b1086a346895" +checksum = "c2c3ef5f6a72dffa44c24d5811123f704e18a1dbc83637d347b1852b41d3835c" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4766d466249e23279e92c52033429eb91141c5efea1c4478138fa6f6ef4efe3e" +checksum = "835cf59c907f67e2bbc20f50157e08f35006fe2a8444d8ec9f5683e22f937045" dependencies = [ "wast", ] @@ -8673,27 +8827,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" +checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" dependencies = [ "webpki", ] [[package]] name = "wepoll-sys" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142bc2cba3fe88be1a8fcb55c727fa4cd5b0cf2d7438722792e22f26f04bc1e0" +checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" dependencies = [ "cc", ] @@ -8760,17 +8905,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "x25519-dalek" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217" -dependencies = [ - "curve25519-dalek 2.1.0", - "rand_core 0.5.1", - "zeroize", -] - [[package]] name = "x25519-dalek" version = "1.1.0" @@ -8815,7 +8949,7 @@ dependencies = [ name = "xp-gateway-common" version = "2.0.0-beta.0" dependencies = [ - "bs58", + "bs58 0.3.1", "frame-support", "hex", "sp-core", @@ -8906,7 +9040,7 @@ dependencies = [ "bitflags", "chainx-primitives", "env_logger", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "orml-traits", @@ -8928,7 +9062,7 @@ name = "xpallet-assets-registrar" version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "parity-scale-codec", @@ -8977,7 +9111,7 @@ version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", "env_logger", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "pallet-balances", @@ -9025,9 +9159,9 @@ dependencies = [ name = "xpallet-gateway-bitcoin" version = "2.0.0-beta.0" dependencies = [ - "bs58", + "bs58 0.3.1", "chainx-primitives", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "hex", @@ -9060,7 +9194,7 @@ name = "xpallet-gateway-common" version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "hex", @@ -9120,7 +9254,7 @@ name = "xpallet-gateway-records" version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "orml-utilities", @@ -9195,7 +9329,7 @@ version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", "env_logger", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "pallet-balances", @@ -9250,7 +9384,7 @@ version = "2.0.0-beta.0" dependencies = [ "chainx-primitives", "env_logger", - "frame-benchmarking", + "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", "pallet-balances", @@ -9376,7 +9510,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c" dependencies = [ - "futures 0.3.6", + "futures 0.3.8", "log", "nohash-hasher", "parking_lot 0.11.0", diff --git a/Cargo.toml b/Cargo.toml index a556b4a0f..997049b04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,89 @@ cli = { package = "chainx-cli", path = "cli" } [target.'cfg(target_arch="x86_64")'.dependencies] cli = { package = "chainx-cli", path = "cli", features = [ "wasmtime" ] } +[patch.crates-io] +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-cli = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-client-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-client-db = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-consensus = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-executor = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-informant = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-keystore = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-network = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-offchain = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-service = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } + +sp-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-consensus = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-core = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-inherents = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-io = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-keystore = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-offchain = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-runtime = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-session = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-staking = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-std = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-storage = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-tracing = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-trie = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-version = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } + +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +frame-executive = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +frame-support = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +frame-system = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } + +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } + +pallet-authorship = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-babe = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-balances = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-collective = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-indices = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-membership = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-offences = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-session = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-utility = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } + [workspace] members = [ "cli", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 78a1cb53e..2d9ed5fb9 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,6 +24,7 @@ sc-chain-spec = "2.0.0" sc-client-api = "2.0.0" sc-consensus = "0.8.0" sc-consensus-babe = "0.8.0" +sc-consensus-slots = "0.8.0" sc-executor = "0.8.0" sc-finality-grandpa = "0.8.0" sc-network = "0.8.0" diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 99fef83da..be195deb0 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -33,9 +33,6 @@ pub enum Subcommand { /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), - /// Build a chain specification with a light client sync state. - BuildSyncSpec(sc_cli::BuildSyncSpecCmd), - /// Validate blocks. CheckBlock(sc_cli::CheckBlockCmd), diff --git a/cli/src/command.rs b/cli/src/command.rs index 11ce9d12d..a4c5c860b 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -5,7 +5,7 @@ use sc_service::PartialComponents; use crate::chain_spec; use crate::cli::{Cli, Subcommand}; -use crate::service::{self, new_full_base, new_partial, NewFullBase}; +use crate::service::{self, new_partial}; impl SubstrateCli for Cli { fn impl_name() -> String { @@ -94,9 +94,11 @@ pub fn run() -> sc_cli::Result<()> { let chain_spec = &runner.config().chain_spec; set_default_ss58_version(chain_spec); - runner.run_node_until_exit(|config| match config.role { - Role::Light => service::new_light(config), - _ => service::new_full(config), + runner.run_node_until_exit(|config| async move { + match config.role { + Role::Light => service::new_light(config), + _ => service::new_full(config), + } }) } Some(Subcommand::Benchmark(cmd)) => { @@ -127,26 +129,6 @@ pub fn run() -> sc_cli::Result<()> { runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) } - Some(Subcommand::BuildSyncSpec(cmd)) => { - let runner = cli.create_runner(cmd)?; - set_default_ss58_version(&runner.config().chain_spec); - - runner.async_run(|config| { - let chain_spec = config.chain_spec.cloned_box(); - let network_config = config.network.clone(); - let NewFullBase { - task_manager, - client, - network_status_sinks, - .. - } = new_full_base(config)?; - - Ok(( - cmd.run(chain_spec, network_config, client, network_status_sinks), - task_manager, - )) - }) - } Some(Subcommand::CheckBlock(cmd)) => { let runner = cli.create_runner(cmd)?; set_default_ss58_version(&runner.config().chain_spec); diff --git a/cli/src/service.rs b/cli/src/service.rs index 5547bc534..1c75be334 100644 --- a/cli/src/service.rs +++ b/cli/src/service.rs @@ -10,11 +10,7 @@ use futures::prelude::*; use sc_client_api::{ExecutorProvider, RemoteBackend}; use sc_finality_grandpa::FinalityProofProvider as GrandpaFinalityProofProvider; use sc_network::{Event, NetworkService}; -use sc_service::{ - config::{Configuration, Role}, - error::Error as ServiceError, - TaskManager, -}; +use sc_service::{config::Configuration, error::Error as ServiceError, TaskManager}; use sp_inherents::InherentDataProviders; use sp_runtime::traits::Block as BlockT; @@ -52,7 +48,7 @@ pub fn new_partial( >, ServiceError, > { - let (client, backend, keystore, task_manager) = + let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::(&config)?; let client = Arc::new(client); @@ -112,7 +108,7 @@ pub fn new_partial( let client = client.clone(); let pool = transaction_pool.clone(); let select_chain = select_chain.clone(); - let keystore = keystore.clone(); + let keystore = keystore_container.sync_keystore(); let rpc_extensions_builder = Box::new(move |deny_unsafe, subscription_executor| { let deps = chainx_rpc::FullDeps { @@ -143,7 +139,7 @@ pub fn new_partial( client, backend, task_manager, - keystore, + keystore_container, select_chain, import_queue, transaction_pool, @@ -168,7 +164,7 @@ pub fn new_full_base(config: Configuration) -> Result backend, mut task_manager, import_queue, - keystore, + keystore_container, select_chain, transaction_pool, inherent_data_providers, @@ -202,6 +198,8 @@ pub fn new_full_base(config: Configuration) -> Result let role = config.role.clone(); let force_authoring = config.force_authoring; + let backoff_authoring_blocks = + Some(sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging::default()); let name = config.network.node_name.clone(); let enable_grandpa = !config.disable_grandpa; let prometheus_registry = config.prometheus_registry().cloned(); @@ -211,7 +209,7 @@ pub fn new_full_base(config: Configuration) -> Result config, backend: backend.clone(), client: client.clone(), - keystore: keystore.clone(), + keystore: keystore_container.sync_keystore(), network: network.clone(), rpc_extensions_builder: Box::new(rpc_extensions_builder), transaction_pool: transaction_pool.clone(), @@ -227,6 +225,7 @@ pub fn new_full_base(config: Configuration) -> Result if role.is_authority() { let proposer = sc_basic_authorship::ProposerFactory::new( + task_manager.spawn_handle(), client.clone(), transaction_pool.clone(), prometheus_registry.as_ref(), @@ -236,7 +235,7 @@ pub fn new_full_base(config: Configuration) -> Result sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()); let babe_config = sc_consensus_babe::BabeParams { - keystore: keystore.clone(), + keystore: keystore_container.sync_keystore(), client: client.clone(), select_chain, env: proposer, @@ -244,6 +243,7 @@ pub fn new_full_base(config: Configuration) -> Result sync_oracle: network.clone(), inherent_data_providers: inherent_data_providers.clone(), force_authoring, + backoff_authoring_blocks, babe_link, can_author_with, }; @@ -255,45 +255,36 @@ pub fn new_full_base(config: Configuration) -> Result } // Spawn authority discovery module. - if matches!(role, Role::Authority{..} | Role::Sentry {..}) { - let (sentries, authority_discovery_role) = match role { - sc_service::config::Role::Authority { ref sentry_nodes } => ( - sentry_nodes.clone(), - sc_authority_discovery::Role::Authority(keystore.clone()), - ), - sc_service::config::Role::Sentry { .. } => { - (vec![], sc_authority_discovery::Role::Sentry) - } - _ => unreachable!("Due to outer matches! constraint; qed."), - }; - - let dht_event_stream = network - .event_stream("authority-discovery") - .filter_map(|e| async move { - match e { - Event::Dht(e) => Some(e), - _ => None, - } - }) - .boxed(); + if role.is_authority() { + let authority_discovery_role = + sc_authority_discovery::Role::PublishAndDiscover(keystore_container.keystore()); + let dht_event_stream = + network + .event_stream("authority-discovery") + .filter_map(|e| async move { + match e { + Event::Dht(e) => Some(e), + _ => None, + } + }); let (authority_discovery_worker, _service) = sc_authority_discovery::new_worker_and_service( client.clone(), network.clone(), - sentries, - dht_event_stream, + Box::pin(dht_event_stream), authority_discovery_role, prometheus_registry.clone(), ); - task_manager - .spawn_handle() - .spawn("authority-discovery-worker", authority_discovery_worker); + task_manager.spawn_handle().spawn( + "authority-discovery-worker", + authority_discovery_worker.run(), + ); } // if the node isn't actively participating in consensus then it doesn't // need a keystore, regardless of which protocol we use below. let keystore = if role.is_authority() { - Some(keystore as sp_core::traits::BareCryptoStorePtr) + Some(keystore_container.sync_keystore()) } else { None }; @@ -319,7 +310,6 @@ pub fn new_full_base(config: Configuration) -> Result config, link: grandpa_link, network: network.clone(), - inherent_data_providers: inherent_data_providers.clone(), telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()), voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), prometheus_registry, @@ -333,11 +323,7 @@ pub fn new_full_base(config: Configuration) -> Result sc_finality_grandpa::run_grandpa_voter(grandpa_config)?, ); } else { - sc_finality_grandpa::setup_disabled_grandpa( - client.clone(), - &inherent_data_providers, - network.clone(), - )?; + sc_finality_grandpa::setup_disabled_grandpa(network.clone())?; } network_starter.start_network(); @@ -358,7 +344,7 @@ pub fn new_full(config: Configuration) -> Result { /// Builds a new service for a light client. pub fn new_light(config: Configuration) -> Result { - let (client, backend, keystore, mut task_manager, on_demand) = + let (client, backend, keystore_container, mut task_manager, on_demand) = sc_service::new_light_parts::(&config)?; let select_chain = sc_consensus::LongestChain::new(backend.clone()); @@ -446,7 +432,7 @@ pub fn new_light(config: Configuration) -> Result { client: client.clone(), transaction_pool: transaction_pool.clone(), config, - keystore, + keystore: keystore_container.sync_keystore(), backend, network_status_sinks, system_rpc_tx, diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 0e288e835..efd112970 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -27,6 +27,7 @@ sp-blockchain = "2.0.0" sp-block-builder = "2.0.0" sp-consensus = "0.8.0" sp-consensus-babe = "0.8.0" +sp-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } sp-runtime = "2.0.0" sp-state-machine = "0.8.0" sp-transaction-pool = "2.0.0" diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index a6090f3b0..41f494737 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -43,7 +43,7 @@ pub struct BabeDeps { /// BABE pending epoch changes. pub shared_epoch_changes: sc_consensus_epochs::SharedEpochChanges, /// The keystore that manages the keys of the node. - pub keystore: sc_keystore::KeyStorePtr, + pub keystore: sp_keystore::SyncCryptoStorePtr, } /// Extra dependencies for GRANDPA diff --git a/runtime/src/impls.rs b/runtime/src/impls.rs index f9fcd71d0..3e0ec30d3 100644 --- a/runtime/src/impls.rs +++ b/runtime/src/impls.rs @@ -5,7 +5,7 @@ use codec::{Decode, Encode}; use sp_runtime::{ - traits::{Convert, DispatchInfoOf, SignedExtension}, + traits::{DispatchInfoOf, SignedExtension}, transaction_validity::{ InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction, }, @@ -14,7 +14,7 @@ use sp_runtime::{ use frame_support::{ parameter_types, - traits::{Currency, ExistenceRequirement, Imbalance, OnUnbalanced, WithdrawReason}, + traits::{Currency, ExistenceRequirement, Imbalance, OnUnbalanced, WithdrawReasons}, }; use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment}; @@ -60,28 +60,6 @@ impl OnUnbalanced for DealWithFees { } } -/// Struct that handles the conversion of Balance -> `u64`. This is used for staking's election -/// calculation. -pub struct CurrencyToVoteHandler; - -impl CurrencyToVoteHandler { - fn factor() -> Balance { - (Balances::total_issuance() / u64::max_value() as Balance).max(1) - } -} - -impl Convert for CurrencyToVoteHandler { - fn convert(x: Balance) -> u64 { - (x / Self::factor()) as u64 - } -} - -impl Convert for CurrencyToVoteHandler { - fn convert(x: u128) -> Balance { - x * Self::factor() - } -} - parameter_types! { pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); pub AdjustmentVariable: Multiplier = Multiplier::saturating_from_rational(1, 100_000); @@ -123,7 +101,7 @@ impl ChargeExtraFee { match Balances::withdraw( who, fee, - WithdrawReason::TransactionPayment.into(), + WithdrawReasons::TRANSACTION_PAYMENT.into(), ExistenceRequirement::KeepAlive, ) { Ok(fee) => { diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 93c28ddee..75033f7e3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -99,7 +99,7 @@ pub mod impls; mod weights; use self::constants::{currency::*, fee::WeightToFee, time::*}; -use self::impls::{ChargeExtraFee, CurrencyToVoteHandler, DealWithFees, SlowAdjustingFeeUpdate}; +use self::impls::{ChargeExtraFee, DealWithFees, SlowAdjustingFeeUpdate}; /// This runtime version. pub const VERSION: RuntimeVersion = RuntimeVersion { @@ -240,7 +240,7 @@ impl frame_system::Trait for Runtime { /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); /// Weight information for the extrinsics of this pallet. - type SystemWeightInfo = weights::frame_system::WeightInfo; + type SystemWeightInfo = (); } parameter_types! { @@ -396,8 +396,7 @@ parameter_types! { } impl pallet_transaction_payment::Trait for Runtime { - type Currency = Balances; - type OnTransactionPayment = DealWithFees; + type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; @@ -504,7 +503,7 @@ impl pallet_offences::Trait for Runtime { impl pallet_utility::Trait for Runtime { type Event = Event; type Call = Call; - type WeightInfo = weights::pallet_utility::WeightInfo; + type WeightInfo = (); } parameter_types! { @@ -541,6 +540,7 @@ parameter_types! { // One cent: $10,000 / MB pub const PreimageByteDeposit: Balance = 1 * CENTS; pub const MaxVotes: u32 = 100; + pub const MaxProposals: u32 = 100; } impl pallet_democracy::Trait for Runtime { @@ -572,6 +572,14 @@ impl pallet_democracy::Trait for Runtime { // To cancel a proposal which has been passed, 2/3 of the council must agree to it. type CancellationOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, CouncilCollective>; + // To cancel a proposal before it has been passed, the technical committee must be unanimous or + // Root must agree. + type CancelProposalOrigin = EnsureOneOf< + AccountId, + pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCollective>, + EnsureRoot, + >; + type BlacklistOrigin = EnsureRoot; // Any single technical committee member may veto a coming council proposal, however they can // only do it once and it lasts only for the cooloff period. type VetoOrigin = pallet_collective::EnsureMember; @@ -582,7 +590,8 @@ impl pallet_democracy::Trait for Runtime { type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; - type WeightInfo = weights::pallet_democracy::WeightInfo; + type WeightInfo = (); + type MaxProposals = MaxProposals; } parameter_types! { @@ -623,7 +632,7 @@ impl pallet_elections_phragmen::Trait for Runtime { // NOTE: this implies that council's genesis members cannot be set directly and must come from // this module. type InitializeMembers = Council; - type CurrencyToVote = CurrencyToVoteHandler; + type CurrencyToVote = frame_support::traits::U128CurrencyToVote; type CandidacyBond = CandidacyBond; type VotingBond = VotingBond; type LoserCandidate = (); diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index f46863e4a..e5b5b6e33 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,9 +1,9 @@ // Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. -pub mod frame_system; +// pub mod frame_system; pub mod pallet_balances; pub mod pallet_collective; -pub mod pallet_democracy; +// pub mod pallet_democracy; pub mod pallet_elections_phragmen; pub mod pallet_identity; pub mod pallet_im_online; @@ -13,7 +13,7 @@ pub mod pallet_scheduler; pub mod pallet_session; pub mod pallet_timestamp; pub mod pallet_treasury; -pub mod pallet_utility; +// pub mod pallet_utility; pub mod xpallet_assets_registrar; pub mod xpallet_dex_spot; diff --git a/xpallets/genesis-builder/src/lib.rs b/xpallets/genesis-builder/src/lib.rs index 7f9c89baa..caad2322a 100644 --- a/xpallets/genesis-builder/src/lib.rs +++ b/xpallets/genesis-builder/src/lib.rs @@ -11,8 +11,9 @@ use frame_support::{decl_module, decl_storage}; #[cfg(feature = "std")] use xp_genesis_builder::AllParams; -use xp_logging::info; +#[cfg(feature = "std")] use xpallet_assets::BalanceOf as AssetBalanceOf; +#[cfg(feature = "std")] use xpallet_mining_staking::BalanceOf as StakingBalanceOf; pub trait Trait: @@ -39,7 +40,7 @@ decl_storage! { xstaking::initialize::(&config.params.xstaking); xmining_asset::initialize::(&config.params.xmining_asset); - info!( + xp_logging::info!( "Took {:?}ms to orchestrate the exported state from ChainX 1.0", now.elapsed().as_millis() ); diff --git a/xpallets/transaction-fee/src/lib.rs b/xpallets/transaction-fee/src/lib.rs index 5216f7628..9db45e429 100644 --- a/xpallets/transaction-fee/src/lib.rs +++ b/xpallets/transaction-fee/src/lib.rs @@ -17,7 +17,7 @@ use sp_std::prelude::*; use frame_support::{ decl_event, decl_module, - traits::{Currency, Get}, + traits::Get, weights::{ DispatchInfo, GetDispatchInfo, Pays, PostDispatchInfo, Weight, WeightToFeePolynomial, }, @@ -29,9 +29,7 @@ use sp_runtime::{ pub use self::types::{FeeDetails, InclusionFee}; -type BalanceOf = <::Currency as Currency< - ::AccountId, ->>::Balance; +type BalanceOf = <::OnChargeTransaction as pallet_transaction_payment::OnChargeTransaction>::Balance; pub trait Trait: pallet_transaction_payment::Trait {} From aac8bcd66044c6f423d7dc03974b910b5c2622d5 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Mon, 16 Nov 2020 18:15:55 +0800 Subject: [PATCH 02/18] Make the failed extrinsic log message distinguishable --- runtime/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 75033f7e3..7f995bfa8 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1031,7 +1031,7 @@ impl_runtime_apis! { impl sp_block_builder::BlockBuilder for Runtime { fn apply_extrinsic(extrinsic: ::Extrinsic) -> ApplyExtrinsicResult { Executive::apply_extrinsic(extrinsic).map_err(|err| { - frame_support::debug::error!(target: xp_logging::RUNTIME_TARGET, "[apply_extrinsic] {:?}", err); + frame_support::debug::error!(target: xp_logging::RUNTIME_TARGET, "Apply extrinsic failed: {:?}", err); err }) } From 22bd0bb8a607ba80c5bdd0d3c96d0c486d45c329 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Mon, 16 Nov 2020 18:35:22 +0800 Subject: [PATCH 03/18] Use the default SubstrateWeight for Substrate pallets --- Cargo.lock | 8 +- Cargo.toml | 2 + runtime/src/lib.rs | 28 ++-- runtime/src/weights/mod.rs | 15 -- runtime/src/weights/pallet_balances.rs | 47 ------ runtime/src/weights/pallet_collective.rs | 97 ----------- runtime/src/weights/pallet_democracy.rs | 151 ------------------ .../src/weights/pallet_elections_phragmen.rs | 88 ---------- runtime/src/weights/pallet_identity.rs | 136 ---------------- runtime/src/weights/pallet_im_online.rs | 34 ---- runtime/src/weights/pallet_indices.rs | 52 ------ runtime/src/weights/pallet_multisig.rs | 89 ----------- runtime/src/weights/pallet_scheduler.rs | 51 ------ runtime/src/weights/pallet_session.rs | 37 ----- runtime/src/weights/pallet_timestamp.rs | 34 ---- runtime/src/weights/pallet_treasury.rs | 140 ---------------- runtime/src/weights/pallet_utility.rs | 34 ---- 17 files changed, 19 insertions(+), 1024 deletions(-) delete mode 100644 runtime/src/weights/pallet_balances.rs delete mode 100644 runtime/src/weights/pallet_collective.rs delete mode 100644 runtime/src/weights/pallet_democracy.rs delete mode 100644 runtime/src/weights/pallet_elections_phragmen.rs delete mode 100644 runtime/src/weights/pallet_identity.rs delete mode 100644 runtime/src/weights/pallet_im_online.rs delete mode 100644 runtime/src/weights/pallet_indices.rs delete mode 100644 runtime/src/weights/pallet_multisig.rs delete mode 100644 runtime/src/weights/pallet_scheduler.rs delete mode 100644 runtime/src/weights/pallet_session.rs delete mode 100644 runtime/src/weights/pallet_timestamp.rs delete mode 100644 runtime/src/weights/pallet_treasury.rs delete mode 100644 runtime/src/weights/pallet_utility.rs diff --git a/Cargo.lock b/Cargo.lock index e65e51afb..44e68c477 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4211,11 +4211,10 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d45fdc5352cc3d52284e7117c03a48dfd8749e667f92a4b5e749dd963c9f1431" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "enumflags2", - "frame-benchmarking 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4228,8 +4227,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a29b883f805fa2330742b5d99263eab68583e009be1a2420efab1c3237a08e5" +source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", diff --git a/Cargo.toml b/Cargo.toml index 997049b04..0a377187d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,6 +79,8 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", rev = "77 pallet-democracy = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } pallet-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-identity = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } pallet-indices = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } pallet-membership = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } pallet-multisig = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 7f995bfa8..cf761b992 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -252,7 +252,7 @@ impl pallet_timestamp::Trait for Runtime { type Moment = u64; type OnTimestampSet = Babe; type MinimumPeriod = MinimumPeriod; - type WeightInfo = weights::pallet_timestamp::WeightInfo; + type WeightInfo = pallet_timestamp::weights::SubstrateWeight; } parameter_types! { @@ -264,7 +264,7 @@ impl pallet_indices::Trait for Runtime { type Currency = Balances; type Deposit = IndexDeposit; type Event = Event; - type WeightInfo = weights::pallet_indices::WeightInfo; + type WeightInfo = pallet_indices::weights::SubstrateWeight; } impl pallet_authority_discovery::Trait for Runtime {} @@ -370,7 +370,7 @@ impl pallet_session::Trait for Runtime { type SessionHandler = ::KeyTypeIdProviders; type Keys = SessionKeys; type DisabledValidatorsThreshold = DisabledValidatorsThreshold; - type WeightInfo = weights::pallet_session::WeightInfo; + type WeightInfo = pallet_session::weights::SubstrateWeight; } parameter_types! { @@ -388,7 +388,7 @@ impl pallet_balances::Trait for Runtime { type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; - type WeightInfo = weights::pallet_balances::WeightInfo; + type WeightInfo = pallet_balances::weights::SubstrateWeight; } parameter_types! { @@ -417,7 +417,7 @@ impl pallet_im_online::Trait for Runtime { type SessionDuration = SessionDuration; type ReportUnresponsiveness = Offences; type UnsignedPriority = ImOnlineUnsignedPriority; - type WeightInfo = weights::pallet_im_online::WeightInfo; + type WeightInfo = pallet_im_online::weights::SubstrateWeight; } /// Dummy implementation for the trait bound of pallet_im_online. @@ -503,7 +503,7 @@ impl pallet_offences::Trait for Runtime { impl pallet_utility::Trait for Runtime { type Event = Event; type Call = Call; - type WeightInfo = (); + type WeightInfo = pallet_utility::weights::SubstrateWeight; } parameter_types! { @@ -521,7 +521,7 @@ impl pallet_multisig::Trait for Runtime { type DepositBase = DepositBase; type DepositFactor = DepositFactor; type MaxSignatories = MaxSignatories; - type WeightInfo = weights::pallet_multisig::WeightInfo; + type WeightInfo = pallet_multisig::weights::SubstrateWeight; } impl pallet_sudo::Trait for Runtime { @@ -590,7 +590,7 @@ impl pallet_democracy::Trait for Runtime { type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; - type WeightInfo = (); + type WeightInfo = pallet_democracy::weights::SubstrateWeight; type MaxProposals = MaxProposals; } @@ -609,7 +609,7 @@ impl pallet_collective::Trait for Runtime { type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; type DefaultVote = pallet_collective::PrimeDefaultVote; - type WeightInfo = weights::pallet_collective::WeightInfo; + type WeightInfo = pallet_collective::weights::SubstrateWeight; } parameter_types! { @@ -641,7 +641,7 @@ impl pallet_elections_phragmen::Trait for Runtime { type DesiredMembers = DesiredMembers; type DesiredRunnersUp = DesiredRunnersUp; type TermDuration = TermDuration; - type WeightInfo = weights::pallet_elections_phragmen::WeightInfo; + type WeightInfo = pallet_elections_phragmen::weights::SubstrateWeight; } parameter_types! { @@ -659,7 +659,7 @@ impl pallet_collective::Trait for Runtime { type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; type DefaultVote = pallet_collective::PrimeDefaultVote; - type WeightInfo = weights::pallet_collective::WeightInfo; + type WeightInfo = pallet_collective::weights::SubstrateWeight; } type EnsureRootOrHalfCouncil = EnsureOneOf< @@ -727,7 +727,7 @@ impl pallet_treasury::Trait for Runtime { type BountyValueMinimum = BountyValueMinimum; type MaximumReasonLength = MaximumReasonLength; type BurnDestination = (); - type WeightInfo = weights::pallet_treasury::WeightInfo; + type WeightInfo = pallet_treasury::weights::SubstrateWeight; } parameter_types! { @@ -743,7 +743,7 @@ impl pallet_scheduler::Trait for Runtime { type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type MaxScheduledPerBlock = MaxScheduledPerBlock; - type WeightInfo = weights::pallet_scheduler::WeightInfo; + type WeightInfo = pallet_scheduler::weights::SubstrateWeight; } parameter_types! { @@ -767,7 +767,7 @@ impl pallet_identity::Trait for Runtime { type Slashed = Treasury; type ForceOrigin = EnsureRootOrHalfCouncil; type RegistrarOrigin = EnsureRootOrHalfCouncil; - type WeightInfo = weights::pallet_identity::WeightInfo; + type WeightInfo = pallet_identity::weights::SubstrateWeight; } /////////////////////////////////////////// diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index e5b5b6e33..33495d3ea 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,20 +1,5 @@ // Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. -// pub mod frame_system; -pub mod pallet_balances; -pub mod pallet_collective; -// pub mod pallet_democracy; -pub mod pallet_elections_phragmen; -pub mod pallet_identity; -pub mod pallet_im_online; -pub mod pallet_indices; -pub mod pallet_multisig; -pub mod pallet_scheduler; -pub mod pallet_session; -pub mod pallet_timestamp; -pub mod pallet_treasury; -// pub mod pallet_utility; - pub mod xpallet_assets_registrar; pub mod xpallet_dex_spot; pub mod xpallet_mining_asset; diff --git a/runtime/src/weights/pallet_balances.rs b/runtime/src/weights/pallet_balances.rs deleted file mode 100644 index 9d9c3d20e..000000000 --- a/runtime/src/weights/pallet_balances.rs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_balances::WeightInfo for WeightInfo { - fn transfer() -> Weight { - (65949000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn transfer_keep_alive() -> Weight { - (46665000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_balance_creating() -> Weight { - (27086000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_balance_killing() -> Weight { - (33424000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn force_transfer() -> Weight { - (65343000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_collective.rs b/runtime/src/weights/pallet_collective.rs deleted file mode 100644 index 9a013c3ed..000000000 --- a/runtime/src/weights/pallet_collective.rs +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_collective::WeightInfo for WeightInfo { - fn set_members(m: u32, n: u32, p: u32) -> Weight { - (0 as Weight) - .saturating_add((21040000 as Weight).saturating_mul(m as Weight)) - .saturating_add((173000 as Weight).saturating_mul(n as Weight)) - .saturating_add((31595000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) - } - fn execute(b: u32, m: u32) -> Weight { - (43359000 as Weight) - .saturating_add((4000 as Weight).saturating_mul(b as Weight)) - .saturating_add((123000 as Weight).saturating_mul(m as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - } - fn propose_execute(b: u32, m: u32) -> Weight { - (54134000 as Weight) - .saturating_add((4000 as Weight).saturating_mul(b as Weight)) - .saturating_add((239000 as Weight).saturating_mul(m as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - } - fn propose_proposed(b: u32, m: u32, p: u32) -> Weight { - (90650000 as Weight) - .saturating_add((5000 as Weight).saturating_mul(b as Weight)) - .saturating_add((152000 as Weight).saturating_mul(m as Weight)) - .saturating_add((970000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(4 as Weight)) - } - fn vote(m: u32) -> Weight { - (74460000 as Weight) - .saturating_add((290000 as Weight).saturating_mul(m as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn close_early_disapproved(m: u32, p: u32) -> Weight { - (86360000 as Weight) - .saturating_add((232000 as Weight).saturating_mul(m as Weight)) - .saturating_add((954000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn close_early_approved(b: u32, m: u32, p: u32) -> Weight { - (123653000 as Weight) - .saturating_add((1000 as Weight).saturating_mul(b as Weight)) - .saturating_add((287000 as Weight).saturating_mul(m as Weight)) - .saturating_add((920000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn close_disapproved(m: u32, p: u32) -> Weight { - (95395000 as Weight) - .saturating_add((236000 as Weight).saturating_mul(m as Weight)) - .saturating_add((965000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn close_approved(b: u32, m: u32, p: u32) -> Weight { - (135284000 as Weight) - .saturating_add((4000 as Weight).saturating_mul(b as Weight)) - .saturating_add((218000 as Weight).saturating_mul(m as Weight)) - .saturating_add((951000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(5 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn disapprove_proposal(p: u32) -> Weight { - (50500000 as Weight) - .saturating_add((966000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_democracy.rs b/runtime/src/weights/pallet_democracy.rs deleted file mode 100644 index b7a06b2df..000000000 --- a/runtime/src/weights/pallet_democracy.rs +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Weights for the Democracy Pallet -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_democracy::WeightInfo for WeightInfo { - fn propose() -> Weight { - (49113000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn second(s: u32) -> Weight { - (42067000 as Weight) - .saturating_add((220000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn vote_new(r: u32) -> Weight { - (54159000 as Weight) - .saturating_add((252000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn vote_existing(r: u32) -> Weight { - (54145000 as Weight) - .saturating_add((262000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn emergency_cancel() -> Weight { - (31071000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn external_propose(v: u32) -> Weight { - (14282000 as Weight) - .saturating_add((109000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn external_propose_majority() -> Weight { - (3478000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn external_propose_default() -> Weight { - (3442000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn fast_track() -> Weight { - (30820000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn veto_external(v: u32) -> Weight { - (30971000 as Weight) - .saturating_add((184000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn cancel_referendum() -> Weight { - (20431000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn cancel_queued(r: u32) -> Weight { - (42438000 as Weight) - .saturating_add((3284000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn on_initialize_base(r: u32) -> Weight { - (70826000 as Weight) - .saturating_add((10716000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn delegate(r: u32) -> Weight { - (72046000 as Weight) - .saturating_add((7837000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(4 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) - } - fn undelegate(r: u32) -> Weight { - (41028000 as Weight) - .saturating_add((7810000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) - } - fn clear_public_proposals() -> Weight { - (3643000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn note_preimage(b: u32) -> Weight { - (46629000 as Weight) - .saturating_add((4000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn note_imminent_preimage(b: u32) -> Weight { - (31147000 as Weight) - .saturating_add((3000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn reap_preimage(b: u32) -> Weight { - (42848000 as Weight) - .saturating_add((3000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn unlock_remove(r: u32) -> Weight { - (45333000 as Weight) - .saturating_add((171000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn unlock_set(r: u32) -> Weight { - (44424000 as Weight) - .saturating_add((291000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn remove_vote(r: u32) -> Weight { - (28250000 as Weight) - .saturating_add((283000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn remove_other_vote(r: u32) -> Weight { - (28250000 as Weight) - .saturating_add((283000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_elections_phragmen.rs b/runtime/src/weights/pallet_elections_phragmen.rs deleted file mode 100644 index 90e42d23c..000000000 --- a/runtime/src/weights/pallet_elections_phragmen.rs +++ /dev/null @@ -1,88 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_elections_phragmen::WeightInfo for WeightInfo { - fn vote(v: u32) -> Weight { - (91_489_000 as Weight) - .saturating_add((199_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(5 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn vote_update(v: u32) -> Weight { - (56_511_000 as Weight) - .saturating_add((245_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(5 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn remove_voter() -> Weight { - (76_714_000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn report_defunct_voter_correct(c: u32, v: u32) -> Weight { - (0 as Weight) - .saturating_add((1_743_000 as Weight).saturating_mul(c as Weight)) - .saturating_add((31_750_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(7 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn report_defunct_voter_incorrect(c: u32, v: u32) -> Weight { - (0 as Weight) - .saturating_add((1_733_000 as Weight).saturating_mul(c as Weight)) - .saturating_add((31_861_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn submit_candidacy(c: u32) -> Weight { - (74_714_000 as Weight) - .saturating_add((315_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn renounce_candidacy_candidate(c: u32) -> Weight { - (50_408_000 as Weight) - .saturating_add((159_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn renounce_candidacy_members() -> Weight { - (79_626_000 as Weight) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(4 as Weight)) - } - fn renounce_candidacy_runners_up() -> Weight { - (49_715_000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn remove_member_with_replacement() -> Weight { - (76_572_000 as Weight) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn remove_member_wrong_refund() -> Weight { - (8_777_000 as Weight).saturating_add(DbWeight::get().reads(1 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_identity.rs b/runtime/src/weights/pallet_identity.rs deleted file mode 100644 index 9bb3abec6..000000000 --- a/runtime/src/weights/pallet_identity.rs +++ /dev/null @@ -1,136 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_identity::WeightInfo for WeightInfo { - fn add_registrar(r: u32) -> Weight { - (39_603_000 as Weight) - .saturating_add((418_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_identity(r: u32, x: u32) -> Weight { - (110_679_000 as Weight) - .saturating_add((389_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((2_985_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_subs_new(s: u32) -> Weight { - (78_697_000 as Weight) - .saturating_add((15_225_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(DbWeight::get().writes(1 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - fn set_subs_old(p: u32) -> Weight { - (71_308_000 as Weight) - .saturating_add((5_772_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) - } - fn clear_identity(r: u32, s: u32, x: u32) -> Weight { - (91_553_000 as Weight) - .saturating_add((284_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((5_749_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((1_621_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - fn request_judgement(r: u32, x: u32) -> Weight { - (110_856_000 as Weight) - .saturating_add((496_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((3_221_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn cancel_request(r: u32, x: u32) -> Weight { - (96_857_000 as Weight) - .saturating_add((311_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((3_204_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_fee(r: u32) -> Weight { - (16_276_000 as Weight) - .saturating_add((381_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_account_id(r: u32) -> Weight { - (18_530_000 as Weight) - .saturating_add((391_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_fields(r: u32) -> Weight { - (16_359_000 as Weight) - .saturating_add((379_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn provide_judgement(r: u32, x: u32) -> Weight { - (72_869_000 as Weight) - .saturating_add((423_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((3_187_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn kill_identity(r: u32, s: u32, x: u32) -> Weight { - (123_199_000 as Weight) - .saturating_add((71_000 as Weight).saturating_mul(r as Weight)) - .saturating_add((5_730_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((2_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) - } - fn add_sub(s: u32) -> Weight { - (110_070_000 as Weight) - .saturating_add((262_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn rename_sub(s: u32) -> Weight { - (37_130_000 as Weight) - .saturating_add((79_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn remove_sub(s: u32) -> Weight { - (103_295_000 as Weight) - .saturating_add((235_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn quit_sub(s: u32) -> Weight { - (65_716_000 as Weight) - .saturating_add((227_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_im_online.rs b/runtime/src/weights/pallet_im_online.rs deleted file mode 100644 index 3743e28f7..000000000 --- a/runtime/src/weights/pallet_im_online.rs +++ /dev/null @@ -1,34 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_im_online::WeightInfo for WeightInfo { - fn validate_unsigned_and_then_heartbeat(k: u32, e: u32) -> Weight { - (139830000 as Weight) - .saturating_add((211000 as Weight).saturating_mul(k as Weight)) - .saturating_add((654000 as Weight).saturating_mul(e as Weight)) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_indices.rs b/runtime/src/weights/pallet_indices.rs deleted file mode 100644 index 9e432c056..000000000 --- a/runtime/src/weights/pallet_indices.rs +++ /dev/null @@ -1,52 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_indices::WeightInfo for WeightInfo { - fn claim() -> Weight { - (56_237_000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn transfer() -> Weight { - (63_665_000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn free() -> Weight { - (50_736_000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn force_transfer() -> Weight { - (52_361_000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn freeze() -> Weight { - (46_483_000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_multisig.rs b/runtime/src/weights/pallet_multisig.rs deleted file mode 100644 index 7c8fe1971..000000000 --- a/runtime/src/weights/pallet_multisig.rs +++ /dev/null @@ -1,89 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2019-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_multisig::WeightInfo for WeightInfo { - fn as_multi_threshold_1(z: u32) -> Weight { - (17_161_000 as Weight).saturating_add((1_000 as Weight).saturating_mul(z as Weight)) - } - fn as_multi_create(s: u32, z: u32) -> Weight { - (79_857_000 as Weight) - .saturating_add((131_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn as_multi_create_store(s: u32, z: u32) -> Weight { - (90_218_000 as Weight) - .saturating_add((129_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((3_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn as_multi_approve(s: u32, z: u32) -> Weight { - (48_402_000 as Weight) - .saturating_add((132_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn as_multi_approve_store(s: u32, z: u32) -> Weight { - (88_390_000 as Weight) - .saturating_add((120_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((3_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn as_multi_complete(s: u32, z: u32) -> Weight { - (98_960_000 as Weight) - .saturating_add((276_000 as Weight).saturating_mul(s as Weight)) - .saturating_add((6_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn approve_as_multi_create(s: u32) -> Weight { - (80_185_000 as Weight) - .saturating_add((121_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn approve_as_multi_approve(s: u32) -> Weight { - (48_386_000 as Weight) - .saturating_add((143_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn approve_as_multi_complete(s: u32) -> Weight { - (177_181_000 as Weight) - .saturating_add((273_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn cancel_as_multi(s: u32) -> Weight { - (126_334_000 as Weight) - .saturating_add((124_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_scheduler.rs b/runtime/src/weights/pallet_scheduler.rs deleted file mode 100644 index eb73654be..000000000 --- a/runtime/src/weights/pallet_scheduler.rs +++ /dev/null @@ -1,51 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_scheduler::WeightInfo for WeightInfo { - fn schedule(s: u32) -> Weight { - (37_835_000 as Weight) - .saturating_add((81_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn cancel(s: u32) -> Weight { - (34_707_000 as Weight) - .saturating_add((3_125_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn schedule_named(s: u32) -> Weight { - (48_065_000 as Weight) - .saturating_add((110_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn cancel_named(s: u32) -> Weight { - (38_776_000 as Weight) - .saturating_add((3_138_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_session.rs b/runtime/src/weights/pallet_session.rs deleted file mode 100644 index 8905a4f00..000000000 --- a/runtime/src/weights/pallet_session.rs +++ /dev/null @@ -1,37 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_session::WeightInfo for WeightInfo { - fn set_keys() -> Weight { - (88_411_000 as Weight) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn purge_keys() -> Weight { - (51_843_000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } -} diff --git a/runtime/src/weights/pallet_timestamp.rs b/runtime/src/weights/pallet_timestamp.rs deleted file mode 100644 index 40ef6d89b..000000000 --- a/runtime/src/weights/pallet_timestamp.rs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 - -#![allow(unused_parens)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_timestamp::WeightInfo for WeightInfo { - // WARNING! Some components were not used: ["t"] - fn set() -> Weight { - (9133000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["t"] - fn on_finalize() -> Weight { - (5915000 as Weight) - } -} diff --git a/runtime/src/weights/pallet_treasury.rs b/runtime/src/weights/pallet_treasury.rs deleted file mode 100644 index f573a9633..000000000 --- a/runtime/src/weights/pallet_treasury.rs +++ /dev/null @@ -1,140 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_treasury::WeightInfo for WeightInfo { - fn propose_spend() -> Weight { - (79604000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn reject_proposal() -> Weight { - (61001000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn approve_proposal() -> Weight { - (17835000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn report_awesome(r: u32) -> Weight { - (101602000 as Weight) - .saturating_add((2000 as Weight).saturating_mul(r as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - // WARNING! Some components were not used: ["r"] - fn retract_tip() -> Weight { - (82970000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn tip_new(r: u32, t: u32) -> Weight { - (63995000 as Weight) - .saturating_add((2000 as Weight).saturating_mul(r as Weight)) - .saturating_add((153000 as Weight).saturating_mul(t as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn tip(t: u32) -> Weight { - (46765000 as Weight) - .saturating_add((711000 as Weight).saturating_mul(t as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn close_tip(t: u32) -> Weight { - (160874000 as Weight) - .saturating_add((379000 as Weight).saturating_mul(t as Weight)) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn propose_bounty(d: u32) -> Weight { - (86198000 as Weight) - .saturating_add((1000 as Weight).saturating_mul(d as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(4 as Weight)) - } - fn approve_bounty() -> Weight { - (23063000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn propose_curator() -> Weight { - (18890000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn unassign_curator() -> Weight { - (66768000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn accept_curator() -> Weight { - (69131000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn award_bounty() -> Weight { - (48184000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn claim_bounty() -> Weight { - (243104000 as Weight) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn close_bounty_proposed() -> Weight { - (65917000 as Weight) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn close_bounty_active() -> Weight { - (157232000 as Weight) - .saturating_add(DbWeight::get().reads(3 as Weight)) - .saturating_add(DbWeight::get().writes(4 as Weight)) - } - fn extend_bounty_expiry() -> Weight { - (46216000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn on_initialize_proposals(p: u32) -> Weight { - (119765000 as Weight) - .saturating_add((108368000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) - } - fn on_initialize_bounties(b: u32) -> Weight { - (112536000 as Weight) - .saturating_add((107132000 as Weight).saturating_mul(b as Weight)) - .saturating_add(DbWeight::get().reads(2 as Weight)) - .saturating_add(DbWeight::get().reads((3 as Weight).saturating_mul(b as Weight))) - .saturating_add(DbWeight::get().writes(2 as Weight)) - .saturating_add(DbWeight::get().writes((3 as Weight).saturating_mul(b as Weight))) - } -} diff --git a/runtime/src/weights/pallet_utility.rs b/runtime/src/weights/pallet_utility.rs deleted file mode 100644 index f8d11f805..000000000 --- a/runtime/src/weights/pallet_utility.rs +++ /dev/null @@ -1,34 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl pallet_utility::WeightInfo for WeightInfo { - fn batch(c: u32) -> Weight { - (16461000 as Weight).saturating_add((1982000 as Weight).saturating_mul(c as Weight)) - } - // WARNING! Some components were not used: ["u"] - fn as_derivative() -> Weight { - (4086000 as Weight) - } -} From 2ddb3bc5fa947b675d30d01c743a4801bdc7cbee Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Mon, 16 Nov 2020 18:59:54 +0800 Subject: [PATCH 04/18] Fix runtime-benchmarks building --- Cargo.lock | 1 + runtime/Cargo.toml | 2 ++ runtime/src/lib.rs | 14 ++++++-------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44e68c477..7293030ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -817,6 +817,7 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "hex-literal", "orml-currencies", "orml-traits", "pallet-authority-discovery", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index bfb603905..2c796558c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -9,6 +9,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] } +hex-literal = { version = "0.3.1", optional = true } serde = { version = "1.0.101", optional = true, features = ["derive"] } smallvec = "1.4.1" static_assertions = "1.1.0" @@ -178,6 +179,7 @@ std = [ "xpallet-transaction-fee-rpc-runtime-api/std", ] runtime-benchmarks = [ + "hex-literal", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system-benchmarking", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index cf761b992..6923efeff 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -1319,23 +1319,21 @@ impl_runtime_apis! { let whitelist: Vec = vec![ // // Block Number - // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(), + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(), // // Total Issuance - // hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), + hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(), // // Execution Phase - // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(), // // Event Count - // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(), // // System Events - // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(), // // Treasury Account - // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(), + hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95ecffd7b6c0f78751baa9d281e0bfa3a6d6f646c70792f74727372790000000000000000000000000000000000000000").to_vec().into(), ]; let mut batches = Vec::::new(); let params = (&config, &whitelist); - // Substrate - add_benchmark!(params, batches, pallet_balances, Balances); add_benchmark!(params, batches, xpallet_assets, XAssets); add_benchmark!(params, batches, xpallet_assets_registrar, XAssetsRegistrar); From b948997149924235927dc8890c01ac82f5069498 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Mon, 16 Nov 2020 19:06:25 +0800 Subject: [PATCH 05/18] Remove finality-tracker module --- Cargo.lock | 29 ----------------------------- runtime/Cargo.toml | 2 -- runtime/src/lib.rs | 12 ------------ 3 files changed, 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7293030ee..269c9ff36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -827,7 +827,6 @@ dependencies = [ "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", - "pallet-finality-tracker", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -4171,23 +4170,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-finality-tracker" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9414e60c78b94ae77ea8ccc4a86e3d5ebd1de93c236d3dd899abacefe5d7e82" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "serde", - "sp-finality-tracker", - "sp-inherents", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-grandpa" version = "2.0.0" @@ -7170,17 +7152,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-finality-tracker" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5433473273a116241010551b9acfdbd7d33a9fdcda45c390eb707971568154" -dependencies = [ - "parity-scale-codec", - "sp-inherents", - "sp-std", -] - [[package]] name = "sp-inherents" version = "2.0.0" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 2c796558c..8536ac865 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -41,7 +41,6 @@ pallet-balances = { version = "2.0.0", default-features = false } pallet-collective = { version = "2.0.0", default-features = false } pallet-democracy = { version = "2.0.0", default-features = false } pallet-elections-phragmen = { version = "2.0.0", default-features = false } -pallet-finality-tracker = { version = "2.0.0", default-features = false } pallet-grandpa = { version = "2.0.0", default-features = false } pallet-identity = { version = "2.0.0", default-features = false } pallet-im-online = { version = "2.0.0", default-features = false } @@ -130,7 +129,6 @@ std = [ "pallet-collective/std", "pallet-democracy/std", "pallet-elections-phragmen/std", - "pallet-finality-tracker/std", "pallet-grandpa/std", "pallet-identity/std", "pallet-im-online/std", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 6923efeff..80698e501 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -323,17 +323,6 @@ impl pallet_grandpa::Trait for Runtime { type WeightInfo = (); } -parameter_types! { - pub WindowSize: BlockNumber = pallet_finality_tracker::DEFAULT_WINDOW_SIZE.into(); - pub ReportLatency: BlockNumber = pallet_finality_tracker::DEFAULT_REPORT_LATENCY.into(); -} - -impl pallet_finality_tracker::Trait for Runtime { - type OnFinalizationStalled = (); - type WindowSize = WindowSize; - type ReportLatency = ReportLatency; -} - parameter_types! { pub const Offset: BlockNumber = 0; pub const DisabledValidatorsThreshold: Perbill = Perbill::from_percent(17); @@ -923,7 +912,6 @@ construct_runtime!( Offences: pallet_offences::{Module, Call, Storage, Event}, Historical: pallet_session_historical::{Module}, Session: pallet_session::{Module, Call, Storage, Event, Config}, - FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent}, Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event}, ImOnline: pallet_im_online::{Module, Call, Storage, Event, ValidateUnsigned, Config}, AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config}, From 8583d7bb946e455ca549ced1b2c430f976388710 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 07:45:38 +0800 Subject: [PATCH 06/18] Update wasm-builder-runner to 2.0.0 --- Cargo.lock | 54 +++++++++++++++++++++++----------------------- runtime/Cargo.toml | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 269c9ff36..a7bb6150b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1641,7 +1641,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support", "frame-system", @@ -1662,7 +1662,7 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "chrono", - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "handlebars", "parity-scale-codec", "sc-cli", @@ -1697,7 +1697,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "parity-scale-codec", "serde", @@ -1733,7 +1733,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1744,7 +1744,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1756,7 +1756,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "proc-macro2", "quote", @@ -4091,7 +4091,7 @@ name = "pallet-babe" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "pallet-authorship", @@ -4116,7 +4116,7 @@ name = "pallet-balances" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4130,7 +4130,7 @@ name = "pallet-collective" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4146,7 +4146,7 @@ name = "pallet-democracy" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4175,7 +4175,7 @@ name = "pallet-grandpa" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "pallet-authorship", @@ -4197,7 +4197,7 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "enumflags2", - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4304,7 +4304,7 @@ name = "pallet-scheduler" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "parity-scale-codec", @@ -4353,7 +4353,7 @@ name = "pallet-timestamp" version = "2.0.0" source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -6899,7 +6899,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7117,7 +7117,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "proc-macro2", "quote", @@ -7127,7 +7127,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "environmental", "parity-scale-codec", @@ -7202,7 +7202,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "async-trait", "derive_more", @@ -7251,7 +7251,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "backtrace", "log", @@ -7307,7 +7307,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "Inflector", "proc-macro-crate", @@ -7378,7 +7378,7 @@ source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7404,7 +7404,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7418,7 +7418,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "log", "parity-scale-codec", @@ -7446,7 +7446,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "hash-db", "memory-db", @@ -7484,7 +7484,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7650,9 +7650,9 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" -version = "1.0.6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a" +checksum = "54cab12167e32b38a62c5ea5825aa0874cde315f907a46aad2b05aa8ef3d862f" [[package]] name = "subtle" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 8536ac865..13b34c384 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -96,7 +96,7 @@ xpallet-transaction-fee = { path = "../xpallets/transaction-fee", default-featur xpallet-transaction-fee-rpc-runtime-api = { path = "../xpallets/transaction-fee/rpc/runtime-api", default-features = false } [build-dependencies] -wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.6", default-features = false } +wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0", default-features = false } [features] default = ["std", "pallet-session/historical"] From c6eda9f9e732c210d47f09287f851a76ecb28094 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 09:48:46 +0800 Subject: [PATCH 07/18] Add run_benchmarks.sh --- scripts/run_benchmarks.sh | 27 +++++++++ scripts/xpallet-weight-template.hbs | 85 +++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 scripts/run_benchmarks.sh create mode 100644 scripts/xpallet-weight-template.hbs diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh new file mode 100644 index 000000000..d61f970da --- /dev/null +++ b/scripts/run_benchmarks.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +cd "$(dirname "$0")" + +cd .. + +cargo build --release --features=runtime-benchmarks + +bench_run() { + pallet=$1 + output=$2 + # cargo run --release --features=runtime-benchmarks -- benchmark \ + ./target/release/chainx benchmark \ + --chain=dev \ + --steps=50 \ + --repeat=20 \ + --pallet="$pallet" \ + --extrinsic="*" \ + --execution=wasm \ + --wasm-execution=compiled \ + --heap-pages=4096 \ + --output="$output" \ + --template=./scripts/xpallet-weight-template.hbs +} + +bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs +# bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/scripts/xpallet-weight-template.hbs b/scripts/xpallet-weight-template.hbs new file mode 100644 index 000000000..8a3400d2e --- /dev/null +++ b/scripts/xpallet-weight-template.hbs @@ -0,0 +1,85 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for {{pallet}} +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}} +//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}} +//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}} + +// Executed Command: +{{#each args as |arg|~}} +// {{arg}} +{{/each}} + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for {{pallet}}. +pub trait WeightInfo { + {{~#each benchmarks as |benchmark|}} + fn {{benchmark.name~}} + ( + {{~#each benchmark.components as |c| ~}} + {{c.name}}: u32, {{/each~}} + ) -> Weight; + {{~/each}} +} + +/// Weights for {{pallet}} using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + {{~#each benchmarks as |benchmark|}} + fn {{benchmark.name~}} + ( + {{~#each benchmark.components as |c| ~}} + {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}} + ) -> Weight { + ({{underscore benchmark.base_weight}} as Weight) + {{~#each benchmark.component_weight as |cw|}} + .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)) + {{~/each}} + {{~#if (ne benchmark.base_reads "0")}} + .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight)) + {{~/if}} + {{~#each benchmark.component_reads as |cr|}} + .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight))) + {{~/each}} + {{~#if (ne benchmark.base_writes "0")}} + .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight)) + {{~/if}} + {{~#each benchmark.component_writes as |cw|}} + .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))) + {{~/each}} + } + {{~/each}} +} + +// For backwards compatibility and tests +impl WeightInfo for () { + {{~#each benchmarks as |benchmark|}} + fn {{benchmark.name~}} + ( + {{~#each benchmark.components as |c| ~}} + {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}} + ) -> Weight { + ({{underscore benchmark.base_weight}} as Weight) + {{~#each benchmark.component_weight as |cw|}} + .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)) + {{~/each}} + {{~#if (ne benchmark.base_reads "0")}} + .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight)) + {{~/if}} + {{~#each benchmark.component_reads as |cr|}} + .saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight))) + {{~/each}} + {{~#if (ne benchmark.base_writes "0")}} + .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight)) + {{~/if}} + {{~#each benchmark.component_writes as |cw|}} + .saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))) + {{~/each}} + } + {{~/each}} +} From ea8954c81642b2f53f2d72a750a937aa9fc5cb93 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 09:58:39 +0800 Subject: [PATCH 08/18] Apply suggestions --- rpc/Cargo.toml | 3 ++- runtime/src/impls.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index efd112970..f83b763c9 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -27,7 +27,8 @@ sp-blockchain = "2.0.0" sp-block-builder = "2.0.0" sp-consensus = "0.8.0" sp-consensus-babe = "0.8.0" -sp-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +# sp-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-keystore = "0.8.0" sp-runtime = "2.0.0" sp-state-machine = "0.8.0" sp-transaction-pool = "2.0.0" diff --git a/runtime/src/impls.rs b/runtime/src/impls.rs index 3e0ec30d3..a59bcabb2 100644 --- a/runtime/src/impls.rs +++ b/runtime/src/impls.rs @@ -101,7 +101,7 @@ impl ChargeExtraFee { match Balances::withdraw( who, fee, - WithdrawReasons::TRANSACTION_PAYMENT.into(), + WithdrawReasons::TRANSACTION_PAYMENT, ExistenceRequirement::KeepAlive, ) { Ok(fee) => { From 29498ed01c0f3addf83be8b49a52f9840282bb7f Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 10:06:44 +0800 Subject: [PATCH 09/18] Remove useless comment --- rpc/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index f83b763c9..1c22cb1c5 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -27,7 +27,6 @@ sp-blockchain = "2.0.0" sp-block-builder = "2.0.0" sp-consensus = "0.8.0" sp-consensus-babe = "0.8.0" -# sp-keystore = { git = "https://github.com/paritytech/substrate.git", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } sp-keystore = "0.8.0" sp-runtime = "2.0.0" sp-state-machine = "0.8.0" From b69ae0c41249a6b43b6a81992b021119f6571d0b Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 10:36:18 +0800 Subject: [PATCH 10/18] Regenerate weights for xpallet-mining-staking --- runtime/src/lib.rs | 2 +- runtime/src/weights/mod.rs | 1 - runtime/src/weights/xpallet_mining_staking.rs | 66 ------- scripts/run_benchmarks.sh | 7 +- scripts/xpallet-weight-template.hbs | 5 +- xpallets/mining/staking/src/benchmarking.rs | 8 +- xpallets/mining/staking/src/lib.rs | 4 +- xpallets/mining/staking/src/weight_info.rs | 57 ------ xpallets/mining/staking/src/weights.rs | 167 ++++++++++++++++++ 9 files changed, 182 insertions(+), 135 deletions(-) delete mode 100644 runtime/src/weights/xpallet_mining_staking.rs delete mode 100644 xpallets/mining/staking/src/weight_info.rs create mode 100644 xpallets/mining/staking/src/weights.rs diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 80698e501..87d36bc7d 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -865,7 +865,7 @@ impl xpallet_mining_staking::Trait for Runtime { type AssetMining = XMiningAsset; type DetermineRewardPotAccount = xpallet_mining_staking::SimpleValidatorRewardPotAccountDeterminer; - type WeightInfo = weights::xpallet_mining_staking::WeightInfo; + type WeightInfo = xpallet_mining_staking::weights::SubstrateWeight; } pub struct ReferralGetter; diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 33495d3ea..41ed2c62f 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -3,4 +3,3 @@ pub mod xpallet_assets_registrar; pub mod xpallet_dex_spot; pub mod xpallet_mining_asset; -pub mod xpallet_mining_staking; diff --git a/runtime/src/weights/xpallet_mining_staking.rs b/runtime/src/weights/xpallet_mining_staking.rs deleted file mode 100644 index c15099073..000000000 --- a/runtime/src/weights/xpallet_mining_staking.rs +++ /dev/null @@ -1,66 +0,0 @@ -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl xpallet_mining_staking::WeightInfo for WeightInfo { - fn register() -> Weight { - (349383000 as Weight) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn bond() -> Weight { - (1099756000 as Weight) - .saturating_add(DbWeight::get().reads(13 as Weight)) - .saturating_add(DbWeight::get().writes(7 as Weight)) - } - fn unbond() -> Weight { - (912974000 as Weight) - .saturating_add(DbWeight::get().reads(10 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn unlock_unbonded_withdrawal() -> Weight { - (682720000 as Weight) - .saturating_add(DbWeight::get().reads(8 as Weight)) - .saturating_add(DbWeight::get().writes(6 as Weight)) - } - fn rebond() -> Weight { - (917283000 as Weight) - .saturating_add(DbWeight::get().reads(11 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn claim() -> Weight { - (927528000 as Weight) - .saturating_add(DbWeight::get().reads(9 as Weight)) - .saturating_add(DbWeight::get().writes(6 as Weight)) - } - fn chill() -> Weight { - (385264000 as Weight) - .saturating_add(DbWeight::get().reads(5 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn validate() -> Weight { - (103680000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_validator_count() -> Weight { - (14988000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_minimum_validator_count() -> Weight { - (11813000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_bonding_duration() -> Weight { - (11251000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_validator_bonding_duration() -> Weight { - (12221000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } -} diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh index d61f970da..99e1213ad 100644 --- a/scripts/run_benchmarks.sh +++ b/scripts/run_benchmarks.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + cd "$(dirname "$0")" cd .. @@ -9,7 +11,6 @@ cargo build --release --features=runtime-benchmarks bench_run() { pallet=$1 output=$2 - # cargo run --release --features=runtime-benchmarks -- benchmark \ ./target/release/chainx benchmark \ --chain=dev \ --steps=50 \ @@ -23,5 +24,5 @@ bench_run() { --template=./scripts/xpallet-weight-template.hbs } -bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs -# bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs +# bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs +bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/scripts/xpallet-weight-template.hbs b/scripts/xpallet-weight-template.hbs index 8a3400d2e..5bf4b1d22 100644 --- a/scripts/xpallet-weight-template.hbs +++ b/scripts/xpallet-weight-template.hbs @@ -13,7 +13,10 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; use sp_std::marker::PhantomData; /// Weight functions needed for {{pallet}}. diff --git a/xpallets/mining/staking/src/benchmarking.rs b/xpallets/mining/staking/src/benchmarking.rs index 48a033d42..643bcf131 100644 --- a/xpallets/mining/staking/src/benchmarking.rs +++ b/xpallets/mining/staking/src/benchmarking.rs @@ -144,28 +144,28 @@ benchmarks! { } set_validator_count { - let c in 0 .. 1000; + let c = 1000; }: _(RawOrigin::Root, c) verify { assert_eq!(ValidatorCount::get(), c); } set_minimum_validator_count { - let c in 0 .. 1000; + let c = 1000; }: _(RawOrigin::Root, c) verify { assert_eq!(MinimumValidatorCount::get(), c); } set_bonding_duration { - let c in 0 .. 100; + let c = 100; }: _(RawOrigin::Root, c.into()) verify { assert_eq!(BondingDuration::::get(), c.into()); } set_validator_bonding_duration { - let c in 0 .. 1000; + let c = 1000; }: _(RawOrigin::Root, c.into()) verify { assert_eq!(ValidatorBondingDuration::::get(), c.into()); diff --git a/xpallets/mining/staking/src/lib.rs b/xpallets/mining/staking/src/lib.rs index 7fe5bad6d..165cea1bc 100644 --- a/xpallets/mining/staking/src/lib.rs +++ b/xpallets/mining/staking/src/lib.rs @@ -19,7 +19,7 @@ mod reward; mod rpc; mod slashing; mod types; -mod weight_info; +pub mod weights; #[cfg(any(feature = "runtime-benchmarks", test))] mod benchmarking; @@ -53,7 +53,7 @@ use self::constants::*; pub use self::impls::{IdentificationTuple, SimpleValidatorRewardPotAccountDeterminer}; pub use self::rpc::*; pub use self::types::*; -pub use self::weight_info::WeightInfo; +pub use self::weights::WeightInfo; pub type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; diff --git a/xpallets/mining/staking/src/weight_info.rs b/xpallets/mining/staking/src/weight_info.rs deleted file mode 100644 index 7d715dc50..000000000 --- a/xpallets/mining/staking/src/weight_info.rs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. - -use frame_support::weights::Weight; - -pub trait WeightInfo { - fn register() -> Weight; - fn bond() -> Weight; - fn unbond() -> Weight; - fn unlock_unbonded_withdrawal() -> Weight; - fn rebond() -> Weight; - fn claim() -> Weight; - fn chill() -> Weight; - fn validate() -> Weight; - fn set_validator_count() -> Weight; - fn set_minimum_validator_count() -> Weight; - fn set_bonding_duration() -> Weight; - fn set_validator_bonding_duration() -> Weight; -} - -impl WeightInfo for () { - fn register() -> Weight { - 1_000_000_000 - } - fn bond() -> Weight { - 1_000_000_000 - } - fn unbond() -> Weight { - 1_000_000_000 - } - fn unlock_unbonded_withdrawal() -> Weight { - 1_000_000_000 - } - fn rebond() -> Weight { - 1_000_000_000 - } - fn claim() -> Weight { - 1_000_000_000 - } - fn chill() -> Weight { - 1_000_000_000 - } - fn validate() -> Weight { - 1_000_000_000 - } - fn set_validator_count() -> Weight { - 1_000_000_000 - } - fn set_minimum_validator_count() -> Weight { - 1_000_000_000 - } - fn set_bonding_duration() -> Weight { - 1_000_000_000 - } - fn set_validator_bonding_duration() -> Weight { - 1_000_000_000 - } -} diff --git a/xpallets/mining/staking/src/weights.rs b/xpallets/mining/staking/src/weights.rs new file mode 100644 index 000000000..06e4bc3bf --- /dev/null +++ b/xpallets/mining/staking/src/weights.rs @@ -0,0 +1,167 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for xpallet_mining_staking +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-17, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/chainx +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=xpallet_mining_staking +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./xpallets/mining/staking/src/weights.rs +// --template=./scripts/xpallet-weight-template.hbs + + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for xpallet_mining_staking. +pub trait WeightInfo { + fn register() -> Weight; + fn bond() -> Weight; + fn unbond() -> Weight; + fn unlock_unbonded_withdrawal() -> Weight; + fn rebond() -> Weight; + fn claim() -> Weight; + fn chill() -> Weight; + fn validate() -> Weight; + fn set_validator_count() -> Weight; + fn set_minimum_validator_count() -> Weight; + fn set_bonding_duration() -> Weight; + fn set_validator_bonding_duration() -> Weight; +} + +/// Weights for xpallet_mining_staking using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn register() -> Weight { + (1_143_524_000 as Weight) + .saturating_add(T::DbWeight::get().reads(92 as Weight)) + .saturating_add(T::DbWeight::get().writes(7 as Weight)) + } + fn bond() -> Weight { + (157_415_000 as Weight) + .saturating_add(T::DbWeight::get().reads(9 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) + } + fn unbond() -> Weight { + (117_021_000 as Weight) + .saturating_add(T::DbWeight::get().reads(6 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn unlock_unbonded_withdrawal() -> Weight { + (105_278_000 as Weight) + .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn rebond() -> Weight { + (244_986_000 as Weight) + .saturating_add(T::DbWeight::get().reads(10 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) + } + fn claim() -> Weight { + (139_539_000 as Weight) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn chill() -> Weight { + (1_553_851_000 as Weight) + .saturating_add(T::DbWeight::get().reads(55 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn validate() -> Weight { + (25_113_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_validator_count() -> Weight { + (3_582_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_minimum_validator_count() -> Weight { + (3_521_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_bonding_duration() -> Weight { + (3_442_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_validator_bonding_duration() -> Weight { + (3_434_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn register() -> Weight { + (1_143_524_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(92 as Weight)) + .saturating_add(RocksDbWeight::get().writes(7 as Weight)) + } + fn bond() -> Weight { + (157_415_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(9 as Weight)) + .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + } + fn unbond() -> Weight { + (117_021_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(6 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn unlock_unbonded_withdrawal() -> Weight { + (105_278_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(4 as Weight)) + .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + } + fn rebond() -> Weight { + (244_986_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(10 as Weight)) + .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + } + fn claim() -> Weight { + (139_539_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(5 as Weight)) + .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + } + fn chill() -> Weight { + (1_553_851_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(55 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn validate() -> Weight { + (25_113_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_validator_count() -> Weight { + (3_582_000 as Weight) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_minimum_validator_count() -> Weight { + (3_521_000 as Weight) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_bonding_duration() -> Weight { + (3_442_000 as Weight) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_validator_bonding_duration() -> Weight { + (3_434_000 as Weight) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } +} From 8a2bd329e0622d9bb2af3b2d4c006a4203ccb7ff Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 10:52:54 +0800 Subject: [PATCH 11/18] Run rustfmt on the generated weights.rs --- scripts/run_benchmarks.sh | 2 + xpallets/mining/staking/src/weights.rs | 57 +++++++++++--------------- 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh index 99e1213ad..54051a694 100644 --- a/scripts/run_benchmarks.sh +++ b/scripts/run_benchmarks.sh @@ -22,6 +22,8 @@ bench_run() { --heap-pages=4096 \ --output="$output" \ --template=./scripts/xpallet-weight-template.hbs + + rustfmt "$output" } # bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs diff --git a/xpallets/mining/staking/src/weights.rs b/xpallets/mining/staking/src/weights.rs index 06e4bc3bf..84a17f29a 100644 --- a/xpallets/mining/staking/src/weights.rs +++ b/xpallets/mining/staking/src/weights.rs @@ -19,7 +19,6 @@ // --output=./xpallets/mining/staking/src/weights.rs // --template=./scripts/xpallet-weight-template.hbs - #![allow(unused_parens)] #![allow(unused_imports)] @@ -49,119 +48,111 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (1_143_524_000 as Weight) + (1_086_661_000 as Weight) .saturating_add(T::DbWeight::get().reads(92 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (157_415_000 as Weight) + (158_028_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (117_021_000 as Weight) + (119_498_000 as Weight) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (105_278_000 as Weight) + (97_237_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (244_986_000 as Weight) + (157_128_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (139_539_000 as Weight) + (125_663_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (1_553_851_000 as Weight) + (889_373_000 as Weight) .saturating_add(T::DbWeight::get().reads(55 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (25_113_000 as Weight) + (26_882_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_582_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_404_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_521_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_394_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_442_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_410_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_434_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_334_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } } // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (1_143_524_000 as Weight) + (1_086_661_000 as Weight) .saturating_add(RocksDbWeight::get().reads(92 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (157_415_000 as Weight) + (158_028_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (117_021_000 as Weight) + (119_498_000 as Weight) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (105_278_000 as Weight) + (97_237_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (244_986_000 as Weight) + (157_128_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (139_539_000 as Weight) + (125_663_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (1_553_851_000 as Weight) + (889_373_000 as Weight) .saturating_add(RocksDbWeight::get().reads(55 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (25_113_000 as Weight) + (26_882_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_582_000 as Weight) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_404_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_521_000 as Weight) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_394_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_442_000 as Weight) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_410_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_434_000 as Weight) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_334_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } } From 05c1291fbf33cc146ff3b77b1bafd91b8d441192 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 13:04:25 +0800 Subject: [PATCH 12/18] Regenerate weights for xpallet-dex-spt --- runtime/src/lib.rs | 2 +- runtime/src/weights/mod.rs | 1 - runtime/src/weights/xpallet_dex_spot.rs | 43 --------- scripts/run_benchmarks.sh | 1 + xpallets/dex/spot/src/benchmarking.rs | 3 + xpallets/dex/spot/src/lib.rs | 8 +- xpallets/dex/spot/src/weight_info.rs | 37 -------- xpallets/dex/spot/src/weights.rs | 111 ++++++++++++++++++++++++ xpallets/mining/staking/src/weights.rs | 48 +++++----- 9 files changed, 144 insertions(+), 110 deletions(-) delete mode 100644 runtime/src/weights/xpallet_dex_spot.rs mode change 100644 => 100755 scripts/run_benchmarks.sh delete mode 100644 xpallets/dex/spot/src/weight_info.rs create mode 100644 xpallets/dex/spot/src/weights.rs diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 87d36bc7d..a64dc9ac3 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -836,7 +836,7 @@ impl xpallet_gateway_bitcoin::Trait for Runtime { impl xpallet_dex_spot::Trait for Runtime { type Event = Event; type Price = Balance; - type WeightInfo = weights::xpallet_dex_spot::WeightInfo; + type WeightInfo = xpallet_dex_spot::weights::SubstrateWeight; } pub struct SimpleTreasuryAccount; diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 41ed2c62f..463098181 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,5 +1,4 @@ // Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. pub mod xpallet_assets_registrar; -pub mod xpallet_dex_spot; pub mod xpallet_mining_asset; diff --git a/runtime/src/weights/xpallet_dex_spot.rs b/runtime/src/weights/xpallet_dex_spot.rs deleted file mode 100644 index 808249769..000000000 --- a/runtime/src/weights/xpallet_dex_spot.rs +++ /dev/null @@ -1,43 +0,0 @@ -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl xpallet_dex_spot::WeightInfo for WeightInfo { - fn put_order() -> Weight { - (1561152000 as Weight) - .saturating_add(DbWeight::get().reads(15 as Weight)) - .saturating_add(DbWeight::get().writes(8 as Weight)) - } - fn cancel_order() -> Weight { - (1283570000 as Weight) - .saturating_add(DbWeight::get().reads(12 as Weight)) - .saturating_add(DbWeight::get().writes(7 as Weight)) - } - fn force_cancel_order() -> Weight { - (1324347000 as Weight) - .saturating_add(DbWeight::get().reads(12 as Weight)) - .saturating_add(DbWeight::get().writes(7 as Weight)) - } - fn set_handicap() -> Weight { - (33505000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn set_price_fluctuation() -> Weight { - (166833000 as Weight) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn add_trading_pair() -> Weight { - (293704000 as Weight) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn update_trading_pair() -> Weight { - (296593000 as Weight) - .saturating_add(DbWeight::get().reads(5 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } -} diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh old mode 100644 new mode 100755 index 54051a694..fb0ecb1ac --- a/scripts/run_benchmarks.sh +++ b/scripts/run_benchmarks.sh @@ -26,5 +26,6 @@ bench_run() { rustfmt "$output" } +bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs # bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/xpallets/dex/spot/src/benchmarking.rs b/xpallets/dex/spot/src/benchmarking.rs index 14fa845e8..36ce21473 100644 --- a/xpallets/dex/spot/src/benchmarking.rs +++ b/xpallets/dex/spot/src/benchmarking.rs @@ -97,7 +97,10 @@ benchmarks! { let pair = CurrencyPair::new(EOS, ETH); }: _(RawOrigin::Root, pair.clone(), 2, 1, 100.into(), true) verify { + #[cfg(test)] assert_eq!(Module::::trading_pair_count(), 3); + #[cfg(feature = "runtime-benchmarks")] + assert_eq!(Module::::trading_pair_count(), 2); assert_eq!( Module::::get_trading_pair_by_currency_pair(&pair) .unwrap() diff --git a/xpallets/dex/spot/src/lib.rs b/xpallets/dex/spot/src/lib.rs index 25c1c00ad..b9f3bed2b 100644 --- a/xpallets/dex/spot/src/lib.rs +++ b/xpallets/dex/spot/src/lib.rs @@ -8,7 +8,7 @@ mod execution; mod rpc; mod types; -mod weight_info; +pub mod weights; #[cfg(any(feature = "runtime-benchmarks", test))] mod benchmarking; @@ -39,9 +39,9 @@ use chainx_primitives::AssetId; use xp_logging::info; use xpallet_assets::AssetErr; -pub use rpc::*; -pub use types::*; -pub use weight_info::WeightInfo; +pub use self::rpc::*; +pub use self::types::*; +pub use self::weights::WeightInfo; /// Maximum of backlog orders. const MAX_BACKLOG_ORDER: usize = 1000; diff --git a/xpallets/dex/spot/src/weight_info.rs b/xpallets/dex/spot/src/weight_info.rs deleted file mode 100644 index 81c2261ab..000000000 --- a/xpallets/dex/spot/src/weight_info.rs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. - -use frame_support::weights::Weight; - -pub trait WeightInfo { - fn put_order() -> Weight; - fn cancel_order() -> Weight; - fn force_cancel_order() -> Weight; - fn set_handicap() -> Weight; - fn set_price_fluctuation() -> Weight; - fn add_trading_pair() -> Weight; - fn update_trading_pair() -> Weight; -} - -impl WeightInfo for () { - fn put_order() -> Weight { - 1_000_000_000 - } - fn cancel_order() -> Weight { - 1_000_000_000 - } - fn force_cancel_order() -> Weight { - 1_000_000_000 - } - fn set_handicap() -> Weight { - 1_000_000_000 - } - fn set_price_fluctuation() -> Weight { - 1_000_000_000 - } - fn add_trading_pair() -> Weight { - 1_000_000_000 - } - fn update_trading_pair() -> Weight { - 1_000_000_000 - } -} diff --git a/xpallets/dex/spot/src/weights.rs b/xpallets/dex/spot/src/weights.rs new file mode 100644 index 000000000..7f00ff522 --- /dev/null +++ b/xpallets/dex/spot/src/weights.rs @@ -0,0 +1,111 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for xpallet_dex_spot +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-17, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/chainx +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=xpallet_dex_spot +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./xpallets/dex/spot/src/weights.rs +// --template=./scripts/xpallet-weight-template.hbs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for xpallet_dex_spot. +pub trait WeightInfo { + fn put_order() -> Weight; + fn cancel_order() -> Weight; + fn force_cancel_order() -> Weight; + fn set_handicap() -> Weight; + fn set_price_fluctuation() -> Weight; + fn add_trading_pair() -> Weight; + fn update_trading_pair() -> Weight; +} + +/// Weights for xpallet_dex_spot using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn put_order() -> Weight { + (177_688_000 as Weight) + .saturating_add(T::DbWeight::get().reads(11 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn cancel_order() -> Weight { + (163_168_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) + } + fn force_cancel_order() -> Weight { + (162_831_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) + } + fn set_handicap() -> Weight { + (5_365_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_price_fluctuation() -> Weight { + (21_852_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn add_trading_pair() -> Weight { + (42_298_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn update_trading_pair() -> Weight { + (31_926_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn put_order() -> Weight { + (177_688_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(11 as Weight)) + .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + } + fn cancel_order() -> Weight { + (163_168_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(8 as Weight)) + .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + } + fn force_cancel_order() -> Weight { + (162_831_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(8 as Weight)) + .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + } + fn set_handicap() -> Weight { + (5_365_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_price_fluctuation() -> Weight { + (21_852_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn add_trading_pair() -> Weight { + (42_298_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn update_trading_pair() -> Weight { + (31_926_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } +} diff --git a/xpallets/mining/staking/src/weights.rs b/xpallets/mining/staking/src/weights.rs index 84a17f29a..d26532c79 100644 --- a/xpallets/mining/staking/src/weights.rs +++ b/xpallets/mining/staking/src/weights.rs @@ -48,111 +48,111 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (1_086_661_000 as Weight) + (1_080_696_000 as Weight) .saturating_add(T::DbWeight::get().reads(92 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (158_028_000 as Weight) + (151_811_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (119_498_000 as Weight) + (116_069_000 as Weight) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (97_237_000 as Weight) + (95_306_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (157_128_000 as Weight) + (159_030_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (125_663_000 as Weight) + (122_740_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (889_373_000 as Weight) + (868_728_000 as Weight) .saturating_add(T::DbWeight::get().reads(55 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (26_882_000 as Weight) + (24_015_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_404_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_286_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_394_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_190_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_410_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_298_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_334_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_213_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } } // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (1_086_661_000 as Weight) + (1_080_696_000 as Weight) .saturating_add(RocksDbWeight::get().reads(92 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (158_028_000 as Weight) + (151_811_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (119_498_000 as Weight) + (116_069_000 as Weight) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (97_237_000 as Weight) + (95_306_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (157_128_000 as Weight) + (159_030_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (125_663_000 as Weight) + (122_740_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (889_373_000 as Weight) + (868_728_000 as Weight) .saturating_add(RocksDbWeight::get().reads(55 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (26_882_000 as Weight) + (24_015_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_404_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_286_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_394_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_190_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_410_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_298_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_334_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_213_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } } From 2b577a7bd0feb3affc4c8ae4954619f28d3a0b40 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 13:13:45 +0800 Subject: [PATCH 13/18] Regenerate weights for xpallet-assets-registrar --- runtime/src/lib.rs | 2 +- runtime/src/weights/frame_system.rs | 57 ------------ runtime/src/weights/mod.rs | 1 - .../src/weights/xpallet_assets_registrar.rs | 30 ------- scripts/run_benchmarks.sh | 7 +- xpallets/assets-registrar/src/lib.rs | 4 +- xpallets/assets-registrar/src/weight_info.rs | 26 ------ xpallets/assets-registrar/src/weights.rs | 86 +++++++++++++++++++ 8 files changed, 93 insertions(+), 120 deletions(-) delete mode 100644 runtime/src/weights/frame_system.rs delete mode 100644 runtime/src/weights/xpallet_assets_registrar.rs delete mode 100644 xpallets/assets-registrar/src/weight_info.rs create mode 100644 xpallets/assets-registrar/src/weights.rs diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a64dc9ac3..13daea68a 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -788,7 +788,7 @@ impl xpallet_assets_registrar::Trait for Runtime { type Event = Event; type NativeAssetId = ChainXAssetId; type RegistrarHandler = XMiningAsset; - type WeightInfo = weights::xpallet_assets_registrar::WeightInfo; + type WeightInfo = xpallet_assets_registrar::weights::SubstrateWeight; } impl xpallet_assets::Trait for Runtime { diff --git a/runtime/src/weights/frame_system.rs b/runtime/src/weights/frame_system.rs deleted file mode 100644 index d9d03fa9e..000000000 --- a/runtime/src/weights/frame_system.rs +++ /dev/null @@ -1,57 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) 2017-2020 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc5 - -#![allow(unused_parens)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl frame_system::WeightInfo for WeightInfo { - // WARNING! Some components were not used: ["b"] - fn remark() -> Weight { - (1305000 as Weight) - } - fn set_heap_pages() -> Weight { - (2023000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["d"] - fn set_changes_trie_config() -> Weight { - (10026000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(2 as Weight)) - } - fn set_storage(i: u32) -> Weight { - (0 as Weight) - .saturating_add((656000 as Weight).saturating_mul(i as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) - } - fn kill_storage(i: u32) -> Weight { - (4327000 as Weight) - .saturating_add((478000 as Weight).saturating_mul(i as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) - } - fn kill_prefix(p: u32) -> Weight { - (8349000 as Weight) - .saturating_add((838000 as Weight).saturating_mul(p as Weight)) - .saturating_add(DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) - } - fn suicide() -> Weight { - (29247000 as Weight) - } -} diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 463098181..81fd3cb24 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -1,4 +1,3 @@ // Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. -pub mod xpallet_assets_registrar; pub mod xpallet_mining_asset; diff --git a/runtime/src/weights/xpallet_assets_registrar.rs b/runtime/src/weights/xpallet_assets_registrar.rs deleted file mode 100644 index 3250b80db..000000000 --- a/runtime/src/weights/xpallet_assets_registrar.rs +++ /dev/null @@ -1,30 +0,0 @@ -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl xpallet_assets_registrar::WeightInfo for WeightInfo { - fn register() -> Weight { - (331853000 as Weight) - .saturating_add(DbWeight::get().reads(7 as Weight)) - .saturating_add(DbWeight::get().writes(8 as Weight)) - } - fn deregister() -> Weight { - (177795000 as Weight) - .saturating_add(DbWeight::get().reads(6 as Weight)) - .saturating_add(DbWeight::get().writes(4 as Weight)) - } - fn recover() -> Weight { - (238223000 as Weight) - .saturating_add(DbWeight::get().reads(7 as Weight)) - .saturating_add(DbWeight::get().writes(5 as Weight)) - } - fn update_asset_info() -> Weight { - (93039000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } -} diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh index fb0ecb1ac..8947415b8 100755 --- a/scripts/run_benchmarks.sh +++ b/scripts/run_benchmarks.sh @@ -26,6 +26,7 @@ bench_run() { rustfmt "$output" } -bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs -# bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs -bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs +bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs +bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs +# bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs +bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/xpallets/assets-registrar/src/lib.rs b/xpallets/assets-registrar/src/lib.rs index b17c18364..41e19d0d1 100644 --- a/xpallets/assets-registrar/src/lib.rs +++ b/xpallets/assets-registrar/src/lib.rs @@ -14,7 +14,7 @@ mod benchmarking; mod tests; mod types; mod verifier; -mod weight_info; +pub mod weights; use sp_std::prelude::*; @@ -31,7 +31,7 @@ use chainx_primitives::{AssetId, Desc, Token}; use xp_logging::info; pub use self::types::AssetInfo; -pub use self::weight_info::WeightInfo; +pub use self::weights::WeightInfo; pub use xp_assets_registrar::{Chain, RegistrarHandler}; /// The module's config trait. diff --git a/xpallets/assets-registrar/src/weight_info.rs b/xpallets/assets-registrar/src/weight_info.rs deleted file mode 100644 index fec9b7774..000000000 --- a/xpallets/assets-registrar/src/weight_info.rs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. - -use frame_support::weights::Weight; - -/// Weight information for extrinsics in this pallet. -pub trait WeightInfo { - fn register() -> Weight; - fn deregister() -> Weight; - fn recover() -> Weight; - fn update_asset_info() -> Weight; -} - -impl WeightInfo for () { - fn register() -> Weight { - 1_000_000_000 - } - fn deregister() -> Weight { - 1_000_000_000 - } - fn recover() -> Weight { - 1_000_000_000 - } - fn update_asset_info() -> Weight { - 1_000_000_000 - } -} diff --git a/xpallets/assets-registrar/src/weights.rs b/xpallets/assets-registrar/src/weights.rs new file mode 100644 index 000000000..b24e8e3b6 --- /dev/null +++ b/xpallets/assets-registrar/src/weights.rs @@ -0,0 +1,86 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for xpallet_assets_registrar +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-17, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/chainx +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=xpallet_assets_registrar +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./xpallets/assets-registrar/src/weights.rs +// --template=./scripts/xpallet-weight-template.hbs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for xpallet_assets_registrar. +pub trait WeightInfo { + fn register() -> Weight; + fn deregister() -> Weight; + fn recover() -> Weight; + fn update_asset_info() -> Weight; +} + +/// Weights for xpallet_assets_registrar using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn register() -> Weight { + (60_518_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn deregister() -> Weight { + (38_025_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) + } + fn recover() -> Weight { + (50_427_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn update_asset_info() -> Weight { + (17_502_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn register() -> Weight { + (60_518_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + } + fn deregister() -> Weight { + (38_025_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + } + fn recover() -> Weight { + (50_427_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn update_asset_info() -> Weight { + (17_502_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } +} From 5109a9704a3336945ebc94dcb4868bee6afa9d62 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 15:31:46 +0800 Subject: [PATCH 14/18] Regenerate weights for xpallet-mining-asset --- runtime/src/lib.rs | 4 +- runtime/src/weights/mod.rs | 3 - runtime/src/weights/xpallet_mining_asset.rs | 31 ------- ...{run_benchmarks.sh => generate_weights.sh} | 2 +- xpallets/assets-registrar/src/weights.rs | 16 ++-- xpallets/dex/spot/src/weights.rs | 28 +++---- xpallets/mining/asset/src/benchmarking.rs | 32 ++++++-- xpallets/mining/asset/src/lib.rs | 4 +- xpallets/mining/asset/src/tests.rs | 16 ++-- xpallets/mining/asset/src/weights.rs | 82 +++++++++++++++++++ xpallets/mining/staking/src/weights.rs | 48 +++++------ 11 files changed, 162 insertions(+), 104 deletions(-) delete mode 100644 runtime/src/weights/mod.rs delete mode 100644 runtime/src/weights/xpallet_mining_asset.rs rename scripts/{run_benchmarks.sh => generate_weights.sh} (91%) create mode 100644 xpallets/mining/asset/src/weights.rs diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 13daea68a..fea1ffe3f 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -95,8 +95,6 @@ pub use xpallet_mining_staking::VoteWeight; pub mod constants; /// Implementations of some helper traits passed into runtime modules as associated types. pub mod impls; -/// Weights for pallets used in the runtime. -mod weights; use self::constants::{currency::*, fee::WeightToFee, time::*}; use self::impls::{ChargeExtraFee, DealWithFees, SlowAdjustingFeeUpdate}; @@ -883,7 +881,7 @@ impl xpallet_mining_asset::Trait for Runtime { type TreasuryAccount = SimpleTreasuryAccount; type DetermineRewardPotAccount = xpallet_mining_asset::SimpleAssetRewardPotAccountDeterminer; - type WeightInfo = weights::xpallet_mining_asset::WeightInfo; + type WeightInfo = xpallet_mining_asset::weights::SubstrateWeight; } impl xpallet_genesis_builder::Trait for Runtime {} diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs deleted file mode 100644 index 81fd3cb24..000000000 --- a/runtime/src/weights/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. - -pub mod xpallet_mining_asset; diff --git a/runtime/src/weights/xpallet_mining_asset.rs b/runtime/src/weights/xpallet_mining_asset.rs deleted file mode 100644 index 3b0ccb353..000000000 --- a/runtime/src/weights/xpallet_mining_asset.rs +++ /dev/null @@ -1,31 +0,0 @@ -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0-rc6 - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub struct WeightInfo; -impl xpallet_mining_asset::WeightInfo for WeightInfo { - fn claim() -> Weight { - (1136347000 as Weight) - .saturating_add(DbWeight::get().reads(16 as Weight)) - .saturating_add(DbWeight::get().writes(7 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_claim_staking_requirement() -> Weight { - (52052000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_claim_frequency_limit() -> Weight { - (40637000 as Weight) - .saturating_add(DbWeight::get().reads(1 as Weight)) - .saturating_add(DbWeight::get().writes(1 as Weight)) - } - // WARNING! Some components were not used: ["c"] - fn set_asset_power() -> Weight { - (19683000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } -} diff --git a/scripts/run_benchmarks.sh b/scripts/generate_weights.sh similarity index 91% rename from scripts/run_benchmarks.sh rename to scripts/generate_weights.sh index 8947415b8..d408f5514 100755 --- a/scripts/run_benchmarks.sh +++ b/scripts/generate_weights.sh @@ -28,5 +28,5 @@ bench_run() { bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs -# bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs +bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/xpallets/assets-registrar/src/weights.rs b/xpallets/assets-registrar/src/weights.rs index b24e8e3b6..5ed8d6453 100644 --- a/xpallets/assets-registrar/src/weights.rs +++ b/xpallets/assets-registrar/src/weights.rs @@ -40,22 +40,22 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (60_518_000 as Weight) + (60_607_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn deregister() -> Weight { - (38_025_000 as Weight) + (36_717_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn recover() -> Weight { - (50_427_000 as Weight) + (49_562_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn update_asset_info() -> Weight { - (17_502_000 as Weight) + (17_448_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -64,22 +64,22 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (60_518_000 as Weight) + (60_607_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn deregister() -> Weight { - (38_025_000 as Weight) + (36_717_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } fn recover() -> Weight { - (50_427_000 as Weight) + (49_562_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn update_asset_info() -> Weight { - (17_502_000 as Weight) + (17_448_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } diff --git a/xpallets/dex/spot/src/weights.rs b/xpallets/dex/spot/src/weights.rs index 7f00ff522..a7469f7d7 100644 --- a/xpallets/dex/spot/src/weights.rs +++ b/xpallets/dex/spot/src/weights.rs @@ -43,33 +43,33 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn put_order() -> Weight { - (177_688_000 as Weight) + (194_334_000 as Weight) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn cancel_order() -> Weight { - (163_168_000 as Weight) + (197_004_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn force_cancel_order() -> Weight { - (162_831_000 as Weight) + (178_573_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn set_handicap() -> Weight { - (5_365_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (8_457_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_price_fluctuation() -> Weight { - (21_852_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (35_301_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn add_trading_pair() -> Weight { - (42_298_000 as Weight) + (45_623_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn update_trading_pair() -> Weight { - (31_926_000 as Weight) + (32_430_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -78,33 +78,33 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn put_order() -> Weight { - (177_688_000 as Weight) + (194_334_000 as Weight) .saturating_add(RocksDbWeight::get().reads(11 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn cancel_order() -> Weight { - (163_168_000 as Weight) + (197_004_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn force_cancel_order() -> Weight { - (162_831_000 as Weight) + (178_573_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn set_handicap() -> Weight { - (5_365_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (8_457_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_price_fluctuation() -> Weight { - (21_852_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (35_301_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn add_trading_pair() -> Weight { - (42_298_000 as Weight) + (45_623_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn update_trading_pair() -> Weight { - (31_926_000 as Weight) + (32_430_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } diff --git a/xpallets/mining/asset/src/benchmarking.rs b/xpallets/mining/asset/src/benchmarking.rs index 635ef1985..9ec8bbce8 100644 --- a/xpallets/mining/asset/src/benchmarking.rs +++ b/xpallets/mining/asset/src/benchmarking.rs @@ -2,7 +2,7 @@ pub use frame_benchmarking::{account, benchmarks}; use frame_system::RawOrigin; -use xp_protocol::X_BTC; +use xp_protocol::{X_BTC, X_DOT}; use super::*; @@ -15,40 +15,56 @@ benchmarks! { } claim { + xpallet_assets_registrar::Module::::register( + frame_system::RawOrigin::Root.into(), + X_DOT, + xpallet_assets_registrar::AssetInfo::new::( + b"X-DOT".to_vec(), + b"Polkadot".to_vec(), + xpallet_assets_registrar::Chain::Polkadot, + 10, + b"Polkadot".to_vec(), + ).unwrap(), + true, + true, + ).unwrap(); + + FixedAssetPowerOf::insert(X_DOT, 100); + let miner = account("miner", u, SEED); - xpallet_assets::Module::::issue(&X_BTC, &miner, 1000.into())?; + xpallet_assets::Module::::issue(&X_DOT, &miner, 1000.into())?; - let reward_pot = T::DetermineRewardPotAccount::reward_pot_account_for(&X_BTC); + let reward_pot = T::DetermineRewardPotAccount::reward_pot_account_for(&X_DOT); ::Currency::make_free_balance_be(&reward_pot, 100.into()); ::Currency::issue(100.into()); - Module::::set_claim_staking_requirement(RawOrigin::Root.into(), X_BTC, 0)?; + Module::::set_claim_staking_requirement(RawOrigin::Root.into(), X_DOT, 0)?; let block_number: T::BlockNumber = frame_system::Module::::block_number(); frame_system::Module::::set_block_number(block_number + 100.into()); - }: _(RawOrigin::Signed(miner.clone()), X_BTC) + }: _(RawOrigin::Signed(miner.clone()), X_DOT) verify { // 10% belongs to the referral/treasury, 90% is the miner's reward. assert!(Module::::free_balance(&miner) == 90.into()); } set_claim_staking_requirement { - let c in 0 .. 1000; + let c = 1000; }: _(RawOrigin::Root, X_BTC, c) verify { assert_eq!(ClaimRestrictionOf::::get(X_BTC).staking_requirement, c); } set_claim_frequency_limit { - let c in 0 .. 1000; + let c = 1000; }: _(RawOrigin::Root, X_BTC, c.into()) verify { assert_eq!(ClaimRestrictionOf::::get(X_BTC).frequency_limit, c.into()); } set_asset_power { - let c in 0 .. 1000; + let c = 1000; }: _(RawOrigin::Root, X_BTC, c) verify { assert_eq!(FixedAssetPowerOf::get(X_BTC), c); diff --git a/xpallets/mining/asset/src/lib.rs b/xpallets/mining/asset/src/lib.rs index 2811f15e4..c1ff82a95 100644 --- a/xpallets/mining/asset/src/lib.rs +++ b/xpallets/mining/asset/src/lib.rs @@ -8,7 +8,7 @@ mod impls; mod rpc; mod types; -mod weight_info; +pub mod weights; #[cfg(any(feature = "runtime-benchmarks", test))] mod benchmarking; @@ -41,7 +41,7 @@ use xpallet_support::traits::TreasuryAccount; pub use self::impls::SimpleAssetRewardPotAccountDeterminer; pub use self::rpc::*; pub use self::types::*; -pub use self::weight_info::WeightInfo; +pub use self::weights::WeightInfo; pub trait Trait: xpallet_assets::Trait { /// The overarching event type. diff --git a/xpallets/mining/asset/src/tests.rs b/xpallets/mining/asset/src/tests.rs index a315a5af0..720d3dc00 100644 --- a/xpallets/mining/asset/src/tests.rs +++ b/xpallets/mining/asset/src/tests.rs @@ -83,7 +83,7 @@ fn t_xbtc_set_claim_staking_requirement(new: StakingRequirement) { fn assert_xbtc_reward_pot_balance(value: Balance) { assert_eq!( Balances::free_balance( - &DummyAssetRewardPotAccountDeterminer::reward_pot_account_for(&xp_protocol::X_BTC) + &DummyAssetRewardPotAccountDeterminer::reward_pot_account_for(&X_BTC) ), value ); @@ -367,11 +367,7 @@ fn total_issuance_should_work() { } fn t_set_xbtc_asset_power(new: FixedAssetPower) { - assert_ok!(XMiningAsset::set_asset_power( - Origin::root(), - xp_protocol::X_BTC, - new - )); + assert_ok!(XMiningAsset::set_asset_power(Origin::root(), X_BTC, new)); } #[test] @@ -437,18 +433,18 @@ fn asset_mining_reward_should_work() { // Disable the staking requirement. assert_ok!(XMiningAsset::set_claim_staking_requirement( Origin::root(), - xp_protocol::X_BTC, + X_BTC, 0 )); assert_eq!(Balances::free_balance(&t_1), 0); - assert_ok!(XMiningAsset::claim(Origin::signed(t_1), xp_protocol::X_BTC)); + assert_ok!(XMiningAsset::claim(Origin::signed(t_1), X_BTC)); assert_eq!( Balances::free_balance(&t_1), xbtc_pot_balance - xbtc_pot_balance / 10 ); - let referral = DummyGatewayReferralGetter::referral_of(&t_1, xp_protocol::X_BTC) - .unwrap_or(TREASURY_ACCOUNT); + let referral = + DummyGatewayReferralGetter::referral_of(&t_1, X_BTC).unwrap_or(TREASURY_ACCOUNT); assert_eq!(Balances::free_balance(&referral), xbtc_pot_balance / 10); assert_eq!(Balances::free_balance(&TREASURY_ACCOUNT), treasury_balance); }); diff --git a/xpallets/mining/asset/src/weights.rs b/xpallets/mining/asset/src/weights.rs new file mode 100644 index 000000000..6a5b6c491 --- /dev/null +++ b/xpallets/mining/asset/src/weights.rs @@ -0,0 +1,82 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for xpallet_mining_asset +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-17, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/chainx +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=xpallet_mining_asset +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./xpallets/mining/asset/src/weights.rs +// --template=./scripts/xpallet-weight-template.hbs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for xpallet_mining_asset. +pub trait WeightInfo { + fn claim() -> Weight; + fn set_claim_staking_requirement() -> Weight; + fn set_claim_frequency_limit() -> Weight; + fn set_asset_power() -> Weight; +} + +/// Weights for xpallet_mining_asset using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn claim() -> Weight { + (210_160_000 as Weight) + .saturating_add(T::DbWeight::get().reads(11 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn set_claim_staking_requirement() -> Weight { + (17_656_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_claim_frequency_limit() -> Weight { + (14_741_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn set_asset_power() -> Weight { + (7_315_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn claim() -> Weight { + (210_160_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(11 as Weight)) + .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + } + fn set_claim_staking_requirement() -> Weight { + (17_656_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_claim_frequency_limit() -> Weight { + (14_741_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn set_asset_power() -> Weight { + (7_315_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } +} diff --git a/xpallets/mining/staking/src/weights.rs b/xpallets/mining/staking/src/weights.rs index d26532c79..37a25e3a1 100644 --- a/xpallets/mining/staking/src/weights.rs +++ b/xpallets/mining/staking/src/weights.rs @@ -48,111 +48,111 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (1_080_696_000 as Weight) + (1_551_400_000 as Weight) .saturating_add(T::DbWeight::get().reads(92 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (151_811_000 as Weight) + (192_396_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (116_069_000 as Weight) + (189_102_000 as Weight) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (95_306_000 as Weight) + (115_035_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (159_030_000 as Weight) + (238_811_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (122_740_000 as Weight) + (201_664_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (868_728_000 as Weight) + (1_217_599_000 as Weight) .saturating_add(T::DbWeight::get().reads(55 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (24_015_000 as Weight) + (29_077_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_286_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_507_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_190_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_491_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_298_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_487_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_213_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_492_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } } // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (1_080_696_000 as Weight) + (1_551_400_000 as Weight) .saturating_add(RocksDbWeight::get().reads(92 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (151_811_000 as Weight) + (192_396_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (116_069_000 as Weight) + (189_102_000 as Weight) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (95_306_000 as Weight) + (115_035_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (159_030_000 as Weight) + (238_811_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (122_740_000 as Weight) + (201_664_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (868_728_000 as Weight) + (1_217_599_000 as Weight) .saturating_add(RocksDbWeight::get().reads(55 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (24_015_000 as Weight) + (29_077_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_286_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_507_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_190_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_491_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_298_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_487_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_213_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_492_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } } From 2220203f4eda33e7782a049810550c2a875f3128 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 15:48:55 +0800 Subject: [PATCH 15/18] Regenerate weights for xpallet-gateway-{common, records} --- runtime/src/lib.rs | 4 +- scripts/generate_weights.sh | 11 ++- xpallets/assets-registrar/src/weights.rs | 16 ++-- xpallets/dex/spot/src/weights.rs | 28 +++--- xpallets/gateway/common/src/lib.rs | 4 +- xpallets/gateway/common/src/weight_info.rs | 44 --------- xpallets/gateway/common/src/weights.rs | 100 ++++++++++++++++++++ xpallets/gateway/records/src/lib.rs | 4 +- xpallets/gateway/records/src/weight_info.rs | 34 ------- xpallets/gateway/records/src/weights.rs | 86 +++++++++++++++++ 10 files changed, 221 insertions(+), 110 deletions(-) delete mode 100644 xpallets/gateway/common/src/weight_info.rs create mode 100644 xpallets/gateway/common/src/weights.rs delete mode 100644 xpallets/gateway/records/src/weight_info.rs create mode 100644 xpallets/gateway/records/src/weights.rs diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index fea1ffe3f..df56e0780 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -801,7 +801,7 @@ impl xpallet_assets::Trait for Runtime { impl xpallet_gateway_records::Trait for Runtime { type Event = Event; - type WeightInfo = (); + type WeightInfo = xpallet_gateway_records::weights::SubstrateWeight; } pub struct MultisigProvider; @@ -817,7 +817,7 @@ impl xpallet_gateway_common::Trait for Runtime { type DetermineMultisigAddress = MultisigProvider; type Bitcoin = XGatewayBitcoin; type BitcoinTrustee = XGatewayBitcoin; - type WeightInfo = (); + type WeightInfo = xpallet_gateway_common::weights::SubstrateWeight; } impl xpallet_gateway_bitcoin::Trait for Runtime { diff --git a/scripts/generate_weights.sh b/scripts/generate_weights.sh index d408f5514..0c3c39903 100755 --- a/scripts/generate_weights.sh +++ b/scripts/generate_weights.sh @@ -26,7 +26,10 @@ bench_run() { rustfmt "$output" } -bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs -bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs -bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs -bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs +# bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs +# bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs +# bench_run xpallet_gateway_bitcoin ./xpallets/gateway/bitcoin/src/weights.rs +bench_run xpallet_gateway_common ./xpallets/gateway/common/src/weights.rs +bench_run xpallet_gateway_records ./xpallets/gateway/records/src/weights.rs +# bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs +# bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/xpallets/assets-registrar/src/weights.rs b/xpallets/assets-registrar/src/weights.rs index 5ed8d6453..95050cb33 100644 --- a/xpallets/assets-registrar/src/weights.rs +++ b/xpallets/assets-registrar/src/weights.rs @@ -40,22 +40,22 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (60_607_000 as Weight) + (60_795_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn deregister() -> Weight { - (36_717_000 as Weight) + (38_398_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn recover() -> Weight { - (49_562_000 as Weight) + (51_032_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn update_asset_info() -> Weight { - (17_448_000 as Weight) + (17_882_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -64,22 +64,22 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (60_607_000 as Weight) + (60_795_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn deregister() -> Weight { - (36_717_000 as Weight) + (38_398_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } fn recover() -> Weight { - (49_562_000 as Weight) + (51_032_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn update_asset_info() -> Weight { - (17_448_000 as Weight) + (17_882_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } diff --git a/xpallets/dex/spot/src/weights.rs b/xpallets/dex/spot/src/weights.rs index a7469f7d7..da580892d 100644 --- a/xpallets/dex/spot/src/weights.rs +++ b/xpallets/dex/spot/src/weights.rs @@ -43,33 +43,33 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn put_order() -> Weight { - (194_334_000 as Weight) + (185_233_000 as Weight) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn cancel_order() -> Weight { - (197_004_000 as Weight) + (168_575_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn force_cancel_order() -> Weight { - (178_573_000 as Weight) + (169_479_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn set_handicap() -> Weight { - (8_457_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (5_348_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_price_fluctuation() -> Weight { - (35_301_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (21_589_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn add_trading_pair() -> Weight { - (45_623_000 as Weight) + (41_771_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn update_trading_pair() -> Weight { - (32_430_000 as Weight) + (31_754_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -78,33 +78,33 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn put_order() -> Weight { - (194_334_000 as Weight) + (185_233_000 as Weight) .saturating_add(RocksDbWeight::get().reads(11 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn cancel_order() -> Weight { - (197_004_000 as Weight) + (168_575_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn force_cancel_order() -> Weight { - (178_573_000 as Weight) + (169_479_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn set_handicap() -> Weight { - (8_457_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (5_348_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_price_fluctuation() -> Weight { - (35_301_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (21_589_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn add_trading_pair() -> Weight { - (45_623_000 as Weight) + (41_771_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn update_trading_pair() -> Weight { - (32_430_000 as Weight) + (31_754_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } diff --git a/xpallets/gateway/common/src/lib.rs b/xpallets/gateway/common/src/lib.rs index 0367aeddf..1007914af 100644 --- a/xpallets/gateway/common/src/lib.rs +++ b/xpallets/gateway/common/src/lib.rs @@ -14,7 +14,7 @@ pub mod traits; pub mod trustees; pub mod types; pub mod utils; -mod weight_info; +pub mod weights; use sp_runtime::traits::StaticLookup; use sp_std::{collections::btree_map::BTreeMap, convert::TryFrom, prelude::*}; @@ -38,7 +38,7 @@ use crate::types::{ GenericTrusteeIntentionProps, GenericTrusteeSessionInfo, TrusteeInfoConfig, TrusteeIntentionProps, }; -use crate::weight_info::WeightInfo; +pub use crate::weights::WeightInfo; pub trait Trait: xpallet_gateway_records::Trait { type Event: From> + Into<::Event>; diff --git a/xpallets/gateway/common/src/weight_info.rs b/xpallets/gateway/common/src/weight_info.rs deleted file mode 100644 index 868533f9c..000000000 --- a/xpallets/gateway/common/src/weight_info.rs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub trait WeightInfo { - fn withdraw() -> Weight; - fn setup_trustee() -> Weight; - fn transition_trustee_session(u: u32) -> Weight; - fn set_withdrawal_state() -> Weight; - fn set_trustee_info_config() -> Weight; - fn force_set_binding() -> Weight; -} - -impl WeightInfo for () { - fn withdraw() -> Weight { - (1474990000 as Weight) - .saturating_add(DbWeight::get().reads(14 as Weight)) - .saturating_add(DbWeight::get().writes(8 as Weight)) - } - fn setup_trustee() -> Weight { - (198467000 as Weight) - .saturating_add(DbWeight::get().reads(5 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn transition_trustee_session(u: u32) -> Weight { - (1215766000 as Weight) - .saturating_add((326000 as Weight).saturating_mul(u as Weight)) - .saturating_add(DbWeight::get().reads(8 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } - fn set_withdrawal_state() -> Weight { - (819458000 as Weight) - .saturating_add(DbWeight::get().reads(15 as Weight)) - .saturating_add(DbWeight::get().writes(8 as Weight)) - } - fn set_trustee_info_config() -> Weight { - (19710000 as Weight).saturating_add(DbWeight::get().writes(1 as Weight)) - } - fn force_set_binding() -> Weight { - (94894000 as Weight) - .saturating_add(DbWeight::get().reads(4 as Weight)) - .saturating_add(DbWeight::get().writes(3 as Weight)) - } -} diff --git a/xpallets/gateway/common/src/weights.rs b/xpallets/gateway/common/src/weights.rs new file mode 100644 index 000000000..523eb7332 --- /dev/null +++ b/xpallets/gateway/common/src/weights.rs @@ -0,0 +1,100 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for xpallet_gateway_common +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-17, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/chainx +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=xpallet_gateway_common +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./xpallets/gateway/common/src/weights.rs +// --template=./scripts/xpallet-weight-template.hbs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for xpallet_gateway_common. +pub trait WeightInfo { + fn withdraw() -> Weight; + fn setup_trustee() -> Weight; + fn transition_trustee_session(u: u32) -> Weight; + fn set_withdrawal_state() -> Weight; + fn set_trustee_info_config() -> Weight; + fn force_set_binding() -> Weight; +} + +/// Weights for xpallet_gateway_common using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn withdraw() -> Weight { + (203_876_000 as Weight) + .saturating_add(T::DbWeight::get().reads(10 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn setup_trustee() -> Weight { + (41_858_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn transition_trustee_session(_u: u32) -> Weight { + (175_659_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) + } + fn set_withdrawal_state() -> Weight { + (183_608_000 as Weight) + .saturating_add(T::DbWeight::get().reads(11 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn set_trustee_info_config() -> Weight { + (6_049_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + fn force_set_binding() -> Weight { + (26_771_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn withdraw() -> Weight { + (203_876_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(10 as Weight)) + .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + } + fn setup_trustee() -> Weight { + (41_858_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn transition_trustee_session(_u: u32) -> Weight { + (175_659_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(8 as Weight)) + .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + } + fn set_withdrawal_state() -> Weight { + (183_608_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(11 as Weight)) + .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + } + fn set_trustee_info_config() -> Weight { + (6_049_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } + fn force_set_binding() -> Weight { + (26_771_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + } +} diff --git a/xpallets/gateway/records/src/lib.rs b/xpallets/gateway/records/src/lib.rs index 55db58694..509600ffe 100644 --- a/xpallets/gateway/records/src/lib.rs +++ b/xpallets/gateway/records/src/lib.rs @@ -10,7 +10,7 @@ mod mock; #[cfg(test)] mod tests; mod types; -mod weight_info; +pub mod weights; use sp_std::{collections::btree_map::BTreeMap, prelude::*}; @@ -31,7 +31,7 @@ use xpallet_assets::{AssetType, BalanceOf, Chain}; use xpallet_support::try_addr; pub use self::types::{Withdrawal, WithdrawalRecord, WithdrawalRecordId, WithdrawalState}; -use crate::weight_info::WeightInfo; +pub use self::weights::WeightInfo; pub type WithdrawalRecordOf = WithdrawalRecord< ::AccountId, diff --git a/xpallets/gateway/records/src/weight_info.rs b/xpallets/gateway/records/src/weight_info.rs deleted file mode 100644 index 585018816..000000000 --- a/xpallets/gateway/records/src/weight_info.rs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. - -use frame_support::weights::{constants::RocksDbWeight as DbWeight, Weight}; - -pub trait WeightInfo { - fn root_deposit() -> Weight; - fn root_withdraw() -> Weight; - fn set_withdrawal_state() -> Weight; - fn set_withdrawal_state_list(u: u32) -> Weight; -} - -impl WeightInfo for () { - fn root_deposit() -> Weight { - (646702000 as Weight) - .saturating_add(DbWeight::get().reads(12 as Weight)) - .saturating_add(DbWeight::get().writes(6 as Weight)) - } - fn root_withdraw() -> Weight { - (599782000 as Weight) - .saturating_add(DbWeight::get().reads(9 as Weight)) - .saturating_add(DbWeight::get().writes(7 as Weight)) - } - fn set_withdrawal_state() -> Weight { - (605412000 as Weight) - .saturating_add(DbWeight::get().reads(11 as Weight)) - .saturating_add(DbWeight::get().writes(8 as Weight)) - } - fn set_withdrawal_state_list(u: u32) -> Weight { - (602878000 as Weight) - .saturating_add((54000 as Weight).saturating_mul(u as Weight)) - .saturating_add(DbWeight::get().reads(11 as Weight)) - .saturating_add(DbWeight::get().writes(8 as Weight)) - } -} diff --git a/xpallets/gateway/records/src/weights.rs b/xpallets/gateway/records/src/weights.rs new file mode 100644 index 000000000..a2c2d6f85 --- /dev/null +++ b/xpallets/gateway/records/src/weights.rs @@ -0,0 +1,86 @@ +// Copyright 2019-2020 ChainX Project Authors. Licensed under GPL-3.0. + +//! Weights for xpallet_gateway_records +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 2.0.0 +//! DATE: 2020-11-17, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/chainx +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=xpallet_gateway_records +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --output=./xpallets/gateway/records/src/weights.rs +// --template=./scripts/xpallet-weight-template.hbs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for xpallet_gateway_records. +pub trait WeightInfo { + fn root_deposit() -> Weight; + fn root_withdraw() -> Weight; + fn set_withdrawal_state() -> Weight; + fn set_withdrawal_state_list(u: u32) -> Weight; +} + +/// Weights for xpallet_gateway_records using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + fn root_deposit() -> Weight { + (169_275_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(4 as Weight)) + } + fn root_withdraw() -> Weight { + (125_082_000 as Weight) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().writes(5 as Weight)) + } + fn set_withdrawal_state() -> Weight { + (165_024_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } + fn set_withdrawal_state_list(_u: u32) -> Weight { + (164_074_000 as Weight) + .saturating_add(T::DbWeight::get().reads(8 as Weight)) + .saturating_add(T::DbWeight::get().writes(6 as Weight)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn root_deposit() -> Weight { + (169_275_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(8 as Weight)) + .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + } + fn root_withdraw() -> Weight { + (125_082_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(5 as Weight)) + .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + } + fn set_withdrawal_state() -> Weight { + (165_024_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(8 as Weight)) + .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + } + fn set_withdrawal_state_list(_u: u32) -> Weight { + (164_074_000 as Weight) + .saturating_add(RocksDbWeight::get().reads(8 as Weight)) + .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + } +} From 0682c2491976fa89e466fc9ff8193225db78cf64 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Tue, 17 Nov 2020 15:52:02 +0800 Subject: [PATCH 16/18] Only xpallet-gateway-bitcoin weights generation failed --- scripts/generate_weights.sh | 8 ++-- xpallets/assets-registrar/src/weights.rs | 16 ++++---- xpallets/dex/spot/src/weights.rs | 28 +++++++------- xpallets/gateway/common/src/weights.rs | 30 ++++++++------- xpallets/gateway/records/src/weights.rs | 16 ++++---- xpallets/mining/asset/src/weights.rs | 16 ++++---- xpallets/mining/staking/src/weights.rs | 48 ++++++++++++------------ 7 files changed, 82 insertions(+), 80 deletions(-) diff --git a/scripts/generate_weights.sh b/scripts/generate_weights.sh index 0c3c39903..d9ec3453f 100755 --- a/scripts/generate_weights.sh +++ b/scripts/generate_weights.sh @@ -26,10 +26,10 @@ bench_run() { rustfmt "$output" } -# bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs -# bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs +bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs +bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs # bench_run xpallet_gateway_bitcoin ./xpallets/gateway/bitcoin/src/weights.rs bench_run xpallet_gateway_common ./xpallets/gateway/common/src/weights.rs bench_run xpallet_gateway_records ./xpallets/gateway/records/src/weights.rs -# bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs -# bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs +bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs +bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs diff --git a/xpallets/assets-registrar/src/weights.rs b/xpallets/assets-registrar/src/weights.rs index 95050cb33..2086aace0 100644 --- a/xpallets/assets-registrar/src/weights.rs +++ b/xpallets/assets-registrar/src/weights.rs @@ -40,22 +40,22 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (60_795_000 as Weight) + (61_545_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn deregister() -> Weight { - (38_398_000 as Weight) + (38_118_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } fn recover() -> Weight { - (51_032_000 as Weight) + (50_145_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn update_asset_info() -> Weight { - (17_882_000 as Weight) + (17_836_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -64,22 +64,22 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (60_795_000 as Weight) + (61_545_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn deregister() -> Weight { - (38_398_000 as Weight) + (38_118_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } fn recover() -> Weight { - (51_032_000 as Weight) + (50_145_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn update_asset_info() -> Weight { - (17_882_000 as Weight) + (17_836_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } diff --git a/xpallets/dex/spot/src/weights.rs b/xpallets/dex/spot/src/weights.rs index da580892d..43c55bd77 100644 --- a/xpallets/dex/spot/src/weights.rs +++ b/xpallets/dex/spot/src/weights.rs @@ -43,33 +43,33 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn put_order() -> Weight { - (185_233_000 as Weight) + (180_981_000 as Weight) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn cancel_order() -> Weight { - (168_575_000 as Weight) + (168_611_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn force_cancel_order() -> Weight { - (169_479_000 as Weight) + (168_783_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn set_handicap() -> Weight { - (5_348_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (5_404_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_price_fluctuation() -> Weight { - (21_589_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (22_471_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn add_trading_pair() -> Weight { - (41_771_000 as Weight) + (43_760_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn update_trading_pair() -> Weight { - (31_754_000 as Weight) + (32_554_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -78,33 +78,33 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn put_order() -> Weight { - (185_233_000 as Weight) + (180_981_000 as Weight) .saturating_add(RocksDbWeight::get().reads(11 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn cancel_order() -> Weight { - (168_575_000 as Weight) + (168_611_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn force_cancel_order() -> Weight { - (169_479_000 as Weight) + (168_783_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn set_handicap() -> Weight { - (5_348_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (5_404_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_price_fluctuation() -> Weight { - (21_589_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (22_471_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn add_trading_pair() -> Weight { - (41_771_000 as Weight) + (43_760_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn update_trading_pair() -> Weight { - (31_754_000 as Weight) + (32_554_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } diff --git a/xpallets/gateway/common/src/weights.rs b/xpallets/gateway/common/src/weights.rs index 523eb7332..dd17a3124 100644 --- a/xpallets/gateway/common/src/weights.rs +++ b/xpallets/gateway/common/src/weights.rs @@ -42,59 +42,61 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn withdraw() -> Weight { - (203_876_000 as Weight) + (191_233_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn setup_trustee() -> Weight { - (41_858_000 as Weight) + (40_920_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn transition_trustee_session(_u: u32) -> Weight { - (175_659_000 as Weight) + fn transition_trustee_session(u: u32) -> Weight { + (135_412_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(u as Weight)) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn set_withdrawal_state() -> Weight { - (183_608_000 as Weight) + (176_775_000 as Weight) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn set_trustee_info_config() -> Weight { - (6_049_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (5_504_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn force_set_binding() -> Weight { - (26_771_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (25_600_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } } // For backwards compatibility and tests impl WeightInfo for () { fn withdraw() -> Weight { - (203_876_000 as Weight) + (191_233_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn setup_trustee() -> Weight { - (41_858_000 as Weight) + (40_920_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } - fn transition_trustee_session(_u: u32) -> Weight { - (175_659_000 as Weight) + fn transition_trustee_session(u: u32) -> Weight { + (135_412_000 as Weight) + .saturating_add((2_000 as Weight).saturating_mul(u as Weight)) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn set_withdrawal_state() -> Weight { - (183_608_000 as Weight) + (176_775_000 as Weight) .saturating_add(RocksDbWeight::get().reads(11 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn set_trustee_info_config() -> Weight { - (6_049_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (5_504_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn force_set_binding() -> Weight { - (26_771_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (25_600_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } } diff --git a/xpallets/gateway/records/src/weights.rs b/xpallets/gateway/records/src/weights.rs index a2c2d6f85..ec2221f2a 100644 --- a/xpallets/gateway/records/src/weights.rs +++ b/xpallets/gateway/records/src/weights.rs @@ -40,22 +40,22 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn root_deposit() -> Weight { - (169_275_000 as Weight) + (170_712_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn root_withdraw() -> Weight { - (125_082_000 as Weight) + (124_796_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn set_withdrawal_state() -> Weight { - (165_024_000 as Weight) + (162_875_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } fn set_withdrawal_state_list(_u: u32) -> Weight { - (164_074_000 as Weight) + (160_181_000 as Weight) .saturating_add(T::DbWeight::get().reads(8 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } @@ -64,22 +64,22 @@ impl WeightInfo for SubstrateWeight { // For backwards compatibility and tests impl WeightInfo for () { fn root_deposit() -> Weight { - (169_275_000 as Weight) + (170_712_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn root_withdraw() -> Weight { - (125_082_000 as Weight) + (124_796_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn set_withdrawal_state() -> Weight { - (165_024_000 as Weight) + (162_875_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } fn set_withdrawal_state_list(_u: u32) -> Weight { - (164_074_000 as Weight) + (160_181_000 as Weight) .saturating_add(RocksDbWeight::get().reads(8 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } diff --git a/xpallets/mining/asset/src/weights.rs b/xpallets/mining/asset/src/weights.rs index 6a5b6c491..cc5215961 100644 --- a/xpallets/mining/asset/src/weights.rs +++ b/xpallets/mining/asset/src/weights.rs @@ -40,43 +40,43 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn claim() -> Weight { - (210_160_000 as Weight) + (191_172_000 as Weight) .saturating_add(T::DbWeight::get().reads(11 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn set_claim_staking_requirement() -> Weight { - (17_656_000 as Weight) + (9_345_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_claim_frequency_limit() -> Weight { - (14_741_000 as Weight) + (9_296_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_asset_power() -> Weight { - (7_315_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (4_635_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } } // For backwards compatibility and tests impl WeightInfo for () { fn claim() -> Weight { - (210_160_000 as Weight) + (191_172_000 as Weight) .saturating_add(RocksDbWeight::get().reads(11 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn set_claim_staking_requirement() -> Weight { - (17_656_000 as Weight) + (9_345_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_claim_frequency_limit() -> Weight { - (14_741_000 as Weight) + (9_296_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_asset_power() -> Weight { - (7_315_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (4_635_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } } diff --git a/xpallets/mining/staking/src/weights.rs b/xpallets/mining/staking/src/weights.rs index 37a25e3a1..c8cd77112 100644 --- a/xpallets/mining/staking/src/weights.rs +++ b/xpallets/mining/staking/src/weights.rs @@ -48,111 +48,111 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register() -> Weight { - (1_551_400_000 as Weight) + (1_064_196_000 as Weight) .saturating_add(T::DbWeight::get().reads(92 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (192_396_000 as Weight) + (150_738_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (189_102_000 as Weight) + (114_325_000 as Weight) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (115_035_000 as Weight) + (93_178_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (238_811_000 as Weight) + (153_104_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (201_664_000 as Weight) + (120_070_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (1_217_599_000 as Weight) + (859_263_000 as Weight) .saturating_add(T::DbWeight::get().reads(55 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (29_077_000 as Weight) + (24_138_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_507_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_242_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_491_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_192_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_487_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_167_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_492_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_195_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) } } // For backwards compatibility and tests impl WeightInfo for () { fn register() -> Weight { - (1_551_400_000 as Weight) + (1_064_196_000 as Weight) .saturating_add(RocksDbWeight::get().reads(92 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } fn bond() -> Weight { - (192_396_000 as Weight) + (150_738_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn unbond() -> Weight { - (189_102_000 as Weight) + (114_325_000 as Weight) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } fn unlock_unbonded_withdrawal() -> Weight { - (115_035_000 as Weight) + (93_178_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn rebond() -> Weight { - (238_811_000 as Weight) + (153_104_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } fn claim() -> Weight { - (201_664_000 as Weight) + (120_070_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } fn chill() -> Weight { - (1_217_599_000 as Weight) + (859_263_000 as Weight) .saturating_add(RocksDbWeight::get().reads(55 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn validate() -> Weight { - (29_077_000 as Weight) + (24_138_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_count() -> Weight { - (3_507_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_242_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_minimum_validator_count() -> Weight { - (3_491_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_192_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_bonding_duration() -> Weight { - (3_487_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_167_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn set_validator_bonding_duration() -> Weight { - (3_492_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) + (3_195_000 as Weight).saturating_add(RocksDbWeight::get().writes(1 as Weight)) } } From 7d95ea0b588c2a0162de711a7aaed44293e72d1e Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Wed, 18 Nov 2020 11:04:00 +0800 Subject: [PATCH 17/18] Remove build-sync-spec --- Cargo.lock | 20 ++++++++++++++++---- cli/src/config.rs | 3 +-- runtime/src/lib.rs | 2 +- scripts/generate_weights.sh | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88c4e5b9c..21320d2db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4237,7 +4237,7 @@ dependencies = [ "serde", "sp-core", "sp-io", - "sp-keyring", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "sp-runtime", "sp-std", ] @@ -5704,7 +5704,7 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", - "sp-keyring", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "sp-keystore", "sp-panic-handler", "sp-runtime", @@ -5753,7 +5753,7 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", - "sp-keyring", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -7188,6 +7188,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "sp-keyring" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f76feeb27b218d58523931ea2d708b622c3bd96a3be1c3a5895bba0f7a54c13" +dependencies = [ + "lazy_static", + "sp-core", + "sp-runtime", + "strum", +] + [[package]] name = "sp-keyring" version = "2.0.0" @@ -9146,7 +9158,7 @@ dependencies = [ "serde_json", "sp-core", "sp-io", - "sp-keyring", + "sp-keyring 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-runtime", "sp-std", "xp-assets-registrar", diff --git a/cli/src/config.rs b/cli/src/config.rs index 9c187f11f..d667e25c6 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -18,10 +18,9 @@ fn read_config_file(path: &Path) -> Result, Box; } parameter_types! { diff --git a/scripts/generate_weights.sh b/scripts/generate_weights.sh index d9ec3453f..6533827c3 100755 --- a/scripts/generate_weights.sh +++ b/scripts/generate_weights.sh @@ -29,7 +29,7 @@ bench_run() { bench_run xpallet_assets_registrar ./xpallets/assets-registrar/src/weights.rs bench_run xpallet_dex_spot ./xpallets/dex/spot/src/weights.rs # bench_run xpallet_gateway_bitcoin ./xpallets/gateway/bitcoin/src/weights.rs -bench_run xpallet_gateway_common ./xpallets/gateway/common/src/weights.rs +bench_run xpallet_gateway_common ./xpallets/gateway/common/src/weights.rs bench_run xpallet_gateway_records ./xpallets/gateway/records/src/weights.rs bench_run xpallet_mining_asset ./xpallets/mining/asset/src/weights.rs bench_run xpallet_mining_staking ./xpallets/mining/staking/src/weights.rs From 013a61dc18228a62da2f5543c637863dff31eaa0 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Wed, 18 Nov 2020 11:36:04 +0800 Subject: [PATCH 18/18] Update to https://github.com/paritytech/substrate/commit/11ace4ef8b2ad176293ad6db2b3dd795befd2c79 --- Cargo.lock | 352 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 158 ++++++++++++------------ 2 files changed, 255 insertions(+), 255 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21320d2db..368943d82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1604,7 +1604,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", ] @@ -1641,7 +1641,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -1659,10 +1659,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "chrono", - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "handlebars", "parity-scale-codec", "sc-cli", @@ -1681,7 +1681,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -1697,7 +1697,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "12.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "serde", @@ -1708,7 +1708,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "bitflags", "frame-metadata", @@ -1733,7 +1733,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support-procedural-tools", "proc-macro2", @@ -1744,7 +1744,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1756,7 +1756,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "proc-macro2", "quote", @@ -1766,7 +1766,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1797,7 +1797,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-api", @@ -2862,9 +2862,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.29.1" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021f703bfef6e3da78ef9828c8a244d639b8d57eedf58360922aca5ff69dfdcd" +checksum = "e3c2b4c99f8798be90746fc226acf95d3e6cff0655883634cc30dab1f64f438b" dependencies = [ "atomic", "bytes 0.5.6", @@ -2901,12 +2901,12 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3960524389409633550567e8a9e0684d25a33f4f8408887ff897dd9fdfbdb771" +checksum = "1b8186060d6bd415e4e928e6cb44c4fe7e7a7dd53437bd936ce7e5f421e45a51" dependencies = [ "asn1_der", - "bs58 0.3.1", + "bs58 0.4.0", "ed25519-dalek", "either", "fnv", @@ -2945,9 +2945,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567962c5c5f8a1282979441300e1739ba939024010757c3dbfab4d462189df77" +checksum = "34aea69349e70a58ef9ecd21ac12c5eaa36255ac6986828079d26393f9e618cb" dependencies = [ "flate2", "futures 0.3.8", @@ -2956,9 +2956,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436280f5fe21a58fcaff82c2606945579241f32bc0eaf2d39321aa4624a66e7f" +checksum = "0baeff71fb5cb1fe1604f74a712a44b66a8c5900f4022411a1d550f09d6bb776" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -2967,9 +2967,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc175613c5915332fd6458895407ec242ea055ae3b107a586626d5e3349350a" +checksum = "db0f925a45f310b678e70faf71a10023b829d02eb9cc2628a63de928936f3ade" dependencies = [ "cuckoofilter", "fnv", @@ -2985,9 +2985,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d500ad89ba14de4d18bebdff61a0ce3e769f1c5c5a95026c5da90187e5fff5c9" +checksum = "efeb65567174974f551a91f9f5719445b6695cad56f6a7a47a27111f37efb6b8" dependencies = [ "base64 0.13.0", "byteorder", @@ -3011,9 +3011,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b90b350e37f398b73d778bd94422f4e6a3afa2c1582742ce2446b8a0dba787" +checksum = "e074124669840484de564901d47f2d0892e73f6d8ee7c37e9c2644af1b217bf4" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -3027,9 +3027,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78341f114bf686d5fe50b33ff1a804d88fb326c0d39ee1c22db4346b21fc27" +checksum = "78a2653b2e3254a3bbeb66bfc3f0dca7d6cba6aa2a96791db114003dec1b5394" dependencies = [ "arrayvec 0.5.2", "bytes 0.5.6", @@ -3054,9 +3054,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b575514fce0a3ccbd065d6aa377bd4d5102001b05c1a22a5eee49c450254ef0f" +checksum = "786b068098794322239f8f04df88a52daeb7863b2e77501c4d85d32e0a8f2d26" dependencies = [ "async-std", "data-encoding", @@ -3076,9 +3076,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92b538238c80067c6417a58a07e41002b69d129355b60ec147d6337fdff0eb0" +checksum = "ed764eab613a8fb6b7dcf6c796f55a06fef2270e528329903e25cd3311b99663" dependencies = [ "bytes 0.5.6", "futures 0.3.8", @@ -3094,9 +3094,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c77142e3e5b18fefa7d267305c777c9cbe9b2232ec489979390100bebcc1e6" +checksum = "fb441fb015ec16690099c5d910fcba271d357763b3dcb784db7b27bbb0b68372" dependencies = [ "bytes 0.5.6", "curve25519-dalek 3.0.0", @@ -3116,9 +3116,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7257135609e8877f4d286935cbe1e572b2018946881c3e7f63054577074a7ee7" +checksum = "82e5c50936cfdbe96a514e8992f304fa44cd3a681b6f779505f1ae62b3474705" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -3131,9 +3131,9 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88d59ba3e710a8c8e0535cb4a52e9e46534924cbbea4691f8c3aaad17b58c61" +checksum = "21026557c335d3639591f247b19b7536195772034ec7e9c463137227f95eaaa1" dependencies = [ "bytes 0.5.6", "futures 0.3.8", @@ -3162,9 +3162,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02ba1aa5727ccc118c09ba5111480873f2fe5608cb304e258fd12c173ecf27c9" +checksum = "2dd9a1e0e6563dec1c9e702f7e68bdaa43da62a84536aa06372d3fed3e25d4ca" dependencies = [ "async-trait", "bytes 0.5.6", @@ -3182,9 +3182,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa6fa33b16956b8a58afbfebe1406866011a1ab8960765bd36868952d7be6a1" +checksum = "565f0e06674b4033c978471e4083d5aaa8e03cef0719a0ec0905aaeaad39a919" dependencies = [ "either", "futures 0.3.8", @@ -3198,9 +3198,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0b6f4ef48d9493607fae069deecce0579320a1f3de6cb056770b151018a9a5" +checksum = "33f3dce259c0d3127af5167f45c275b6c047320efdd0e40fde947482487af0a3" dependencies = [ "async-std", "futures 0.3.8", @@ -3214,9 +3214,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945bed3c989a1b290b5a0d4e8fa6e44e01840efb9a5ab3f0d3d174f0e451ac0e" +checksum = "5e0aba04370a00d8d0236e350bc862926c1b42542a169aa6a481e660e5b990fe" dependencies = [ "async-std", "futures 0.3.8", @@ -3226,9 +3226,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66518a4455e15c283637b4d7b579aef928b75a3fc6c50a41e7e6b9fa86672ca0" +checksum = "6c703816f4170477a375b49c56d349e535ce68388f81ba1d9a3c8e2517effa82" dependencies = [ "futures 0.3.8", "js-sys", @@ -3240,9 +3240,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc561870477523245efaaea1b6b743c70115f10c670e62bcbbe4d3153be5f0c" +checksum = "8d5e7268a959748040a0cf7456ad655be55b87f0ceda03bdb5b53674726b28f7" dependencies = [ "async-tls", "either", @@ -3260,9 +3260,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c0c9b6ef7a168c2ae854170b0b6b77550599afe06cc3ac390eb45c5d9c7110" +checksum = "1a0798cbb58535162c40858493d09af06eac42a26e4966e58de0df701f559348" dependencies = [ "futures 0.3.8", "libp2p-core", @@ -3654,18 +3654,18 @@ dependencies = [ [[package]] name = "minicbor" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2ef6aa869726518c5d8206fa5d1337bda8a0442807611be617891c018fa781" +checksum = "0164190d1771b1458c3742075b057ed55d25cd9dfb930aade99315a1eb1fe12d" dependencies = [ "minicbor-derive", ] [[package]] name = "minicbor-derive" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3569c0dbfff1b8d5f1434c642b67f5bf81c0f354a3f5f8f180b549dba3c07c" +checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9" dependencies = [ "proc-macro2", "quote", @@ -4074,7 +4074,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4089,9 +4089,9 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "pallet-authorship", @@ -4114,9 +4114,9 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "parity-scale-codec", @@ -4128,9 +4128,9 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "parity-scale-codec", @@ -4144,9 +4144,9 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "parity-scale-codec", @@ -4159,7 +4159,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4173,9 +4173,9 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "pallet-authorship", @@ -4194,10 +4194,10 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "enumflags2", - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "parity-scale-codec", @@ -4210,7 +4210,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4229,7 +4229,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4237,7 +4237,7 @@ dependencies = [ "serde", "sp-core", "sp-io", - "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "sp-runtime", "sp-std", ] @@ -4245,7 +4245,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4274,7 +4274,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4289,7 +4289,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4302,9 +4302,9 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "parity-scale-codec", @@ -4317,7 +4317,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4337,7 +4337,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4351,9 +4351,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ - "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "frame-benchmarking 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -4368,7 +4368,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4385,7 +4385,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4403,7 +4403,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "parity-scale-codec", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -4430,7 +4430,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-support", "frame-system", @@ -5573,7 +5573,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "async-trait", "bytes 0.5.6", @@ -5603,7 +5603,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -5627,7 +5627,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5644,7 +5644,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -5665,7 +5665,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5676,7 +5676,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5704,7 +5704,7 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", - "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "sp-keystore", "sp-panic-handler", "sp-runtime", @@ -5721,7 +5721,7 @@ dependencies = [ [[package]] name = "sc-cli-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5732,7 +5732,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "fnv", @@ -5753,7 +5753,7 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", - "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81)", + "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79)", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -5769,7 +5769,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "blake2-rfc", "hash-db", @@ -5799,7 +5799,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5810,7 +5810,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "fork-tree", @@ -5855,7 +5855,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "futures 0.3.8", @@ -5879,7 +5879,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5892,7 +5892,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -5917,7 +5917,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "sc-client-api", @@ -5931,7 +5931,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "lazy_static", @@ -5960,7 +5960,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "log", @@ -5977,7 +5977,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "parity-scale-codec", @@ -5992,7 +5992,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "parity-scale-codec", @@ -6010,7 +6010,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "finality-grandpa", @@ -6047,7 +6047,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "finality-grandpa", @@ -6071,7 +6071,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "ansi_term 0.12.1", "futures 0.3.8", @@ -6089,7 +6089,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "async-trait", "derive_more", @@ -6109,7 +6109,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "hash-db", "lazy_static", @@ -6128,7 +6128,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "async-std", "async-trait", @@ -6182,7 +6182,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6197,7 +6197,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "bytes 0.5.6", "fnv", @@ -6224,7 +6224,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "libp2p", @@ -6237,7 +6237,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6246,7 +6246,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "hash-db", @@ -6279,7 +6279,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "futures 0.3.8", @@ -6303,7 +6303,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.1.30", "jsonrpc-core", @@ -6321,7 +6321,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "directories", @@ -6385,7 +6385,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "parity-scale-codec", @@ -6399,7 +6399,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -6420,7 +6420,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "erased-serde", "log", @@ -6439,7 +6439,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "futures 0.3.8", @@ -6460,7 +6460,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "futures 0.3.8", @@ -6872,7 +6872,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "log", @@ -6884,7 +6884,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "hash-db", "parity-scale-codec", @@ -6899,7 +6899,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -6911,7 +6911,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "serde", @@ -6923,7 +6923,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "integer-sqrt", "num-traits", @@ -6936,7 +6936,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-api", @@ -6948,7 +6948,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -6959,7 +6959,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-api", @@ -6971,7 +6971,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "lru 0.4.3", @@ -6988,7 +6988,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "serde", "serde_json", @@ -6997,7 +6997,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "futures-timer 3.0.2", @@ -7023,7 +7023,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "merlin", "parity-scale-codec", @@ -7043,7 +7043,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7052,7 +7052,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7064,7 +7064,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "base58", "blake2-rfc", @@ -7108,7 +7108,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7117,7 +7117,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "proc-macro2", "quote", @@ -7127,7 +7127,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "environmental", "parity-scale-codec", @@ -7138,7 +7138,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "finality-grandpa", "log", @@ -7155,7 +7155,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "parking_lot 0.10.2", @@ -7167,7 +7167,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "hash-db", @@ -7203,7 +7203,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "lazy_static", "sp-core", @@ -7214,7 +7214,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "async-trait", "derive_more", @@ -7230,7 +7230,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "serde", @@ -7242,7 +7242,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7253,7 +7253,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "sp-api", "sp-core", @@ -7263,7 +7263,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "backtrace", "log", @@ -7272,7 +7272,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "serde", "sp-core", @@ -7281,7 +7281,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "either", "hash256-std-hasher", @@ -7303,7 +7303,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7319,7 +7319,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "Inflector", "proc-macro-crate", @@ -7331,7 +7331,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "serde", "serde_json", @@ -7340,7 +7340,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-api", @@ -7353,7 +7353,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7363,7 +7363,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "hash-db", "log", @@ -7385,12 +7385,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" [[package]] name = "sp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7403,7 +7403,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "sp-core", @@ -7416,7 +7416,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7430,7 +7430,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "log", "parity-scale-codec", @@ -7443,7 +7443,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "derive_more", "futures 0.3.8", @@ -7458,7 +7458,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "hash-db", "memory-db", @@ -7472,7 +7472,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "futures 0.3.8", "futures-core", @@ -7484,7 +7484,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7496,7 +7496,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate.git?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7626,7 +7626,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.8", @@ -7649,7 +7649,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?rev=77007ed87727a761169d4c57cbeae0151d9efb81#77007ed87727a761169d4c57cbeae0151d9efb81" +source = "git+https://github.com/paritytech/substrate?rev=11ace4ef8b2ad176293ad6db2b3dd795befd2c79#11ace4ef8b2ad176293ad6db2b3dd795befd2c79" dependencies = [ "async-std", "derive_more", diff --git a/Cargo.toml b/Cargo.toml index 0a377187d..e3540bc15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,89 +12,89 @@ cli = { package = "chainx-cli", path = "cli" } cli = { package = "chainx-cli", path = "cli", features = [ "wasmtime" ] } [patch.crates-io] -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-cli = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-client-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-client-db = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-consensus = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-executor = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-informant = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-keystore = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-network = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-offchain = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-service = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-cli = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-client-api = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-client-db = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-consensus = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-executor = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-informant = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-keystore = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-network = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-offchain = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-rpc = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-service = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } -sp-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-consensus = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-core = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-inherents = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-io = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-keystore = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-offchain = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-runtime = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-session = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-staking = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-std = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-storage = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-tracing = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-trie = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -sp-version = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +sp-api = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-consensus = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-core = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-inherents = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-io = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-keystore = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-offchain = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-rpc = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-runtime = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-session = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-staking = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-std = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-storage = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-tracing = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-trie = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +sp-version = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -frame-executive = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -frame-support = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -frame-system = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +frame-executive = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +frame-support = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +frame-system = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-babe = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-balances = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-collective = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-identity = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-indices = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-membership = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-offences = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-session = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } -pallet-utility = { git = "https://github.com/paritytech/substrate", rev = "77007ed87727a761169d4c57cbeae0151d9efb81" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-babe = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-balances = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-collective = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-grandpa = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-identity = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-indices = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-membership = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-offences = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-session = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } +pallet-utility = { git = "https://github.com/paritytech/substrate", rev = "11ace4ef8b2ad176293ad6db2b3dd795befd2c79" } [workspace] members = [