diff --git a/Cargo.lock b/Cargo.lock index 69e0303c3..cb2592d94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,7 +164,7 @@ checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -274,6 +274,17 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "blake2b_simd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -433,7 +444,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -461,6 +472,12 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +[[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" + [[package]] name = "core-foundation" version = "0.9.3" @@ -497,9 +514,9 @@ dependencies = [ [[package]] name = "cranelift-entity" -version = "0.92.1" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e39cfc857e7e539aa623e03bb6bec11f54aef3dfdef41adcfa7b594af3b54" +checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705" dependencies = [ "serde", ] @@ -611,7 +628,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -628,14 +645,14 @@ checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "darling" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -643,27 +660,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -684,7 +701,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -695,7 +712,7 @@ checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -706,7 +723,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -774,7 +791,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -888,6 +905,19 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "expander" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" +dependencies = [ + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -948,9 +978,8 @@ dependencies = [ [[package]] name = "frame-benchmarking" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bfff1ee5fffa0b87013729ea98632fe8ead95d405e0f198b4fa5aec10230e2" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "frame-support", "frame-support-procedural", @@ -962,44 +991,42 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", "static_assertions", ] [[package]] name = "frame-election-provider-solution-type" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1633711d915518b574fd447027cb54466e6e04ccd1e19613036e3bd37c163654" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "frame-election-provider-support" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a89f7bf905426cf6873303311cbafa87f26f00c8386cf1984db5a340087061c" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "frame-election-provider-solution-type", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -1016,11 +1043,11 @@ dependencies = [ [[package]] name = "frame-support" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a607f6869bc1b0294906d2dc3a9959992f9e6a4db91b262da85266f8b15e94" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "bitflags", + "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", @@ -1033,25 +1060,24 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io", - "sp-runtime", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-weights", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-weights 4.0.0", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45eed853d66d7d14d7ad65a740f62c67c1b0bb8bdf3594073fe40979c1aeea3" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "Inflector", "cfg-expr", @@ -1060,52 +1086,55 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4272f469300e22c33f15502980016e876669a93080f21e0bd2da1bc7cefc87f" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a881492b8dfdd6065d7d8537b8f79cd27aff8c501c759ac12b0295d139ff3d2" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "frame-system" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4afe7a289497c4d694a9fdbfdd57ba54ef75a44e06dd67772c2afed2c66675c" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version", - "sp-weights", + "sp-weights 4.0.0", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "funty" version = "2.0.0" @@ -1184,7 +1213,7 @@ checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1318,6 +1347,12 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +[[package]] +name = "hash-db" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4" + [[package]] name = "hash256-std-hasher" version = "0.15.2" @@ -1341,6 +1376,9 @@ name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] [[package]] name = "heck" @@ -1552,7 +1590,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1916,10 +1954,19 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ - "hash-db", + "hash-db 0.15.2", "hashbrown 0.12.3", ] +[[package]] +name = "memory-db" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" +dependencies = [ + "hash-db 0.16.0", +] + [[package]] name = "memory_units" version = "0.4.0" @@ -1983,7 +2030,7 @@ checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2141,9 +2188,8 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-election-provider-multi-phase" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b891b5c0bf52eaf892c0bdef84bd7e611236b7f5a36984ca4e250e8b0e149cb" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -2154,27 +2200,26 @@ dependencies = [ "parity-scale-codec", "rand 0.8.5", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461c994ec35f63337c3e2a4dbb2bcb2fbbf81b350df1f9c77fa1a9f265950a20" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime", + "sp-runtime 7.0.0", ] [[package]] @@ -2201,7 +2246,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2286,7 +2331,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2377,7 +2422,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "version_check", ] @@ -2394,9 +2439,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -2549,14 +2594,14 @@ checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "regex" -version = "1.7.2" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -2574,9 +2619,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rfc6979" @@ -2736,7 +2781,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2882,29 +2927,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.159" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 2.0.4", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -3053,70 +3098,140 @@ dependencies = [ [[package]] name = "sp-api" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2907bc9290f2a5bf2e8817b221ccc6a572b8f2fb7523266f34b048bb979568db" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ - "hash-db", + "hash-db 0.16.0", "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "sp-version", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e620b045c0a4fa640fa50623d7da6575115d8a70c54926cfd99f3f7727d323" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ + "Inflector", "blake2", + "expander", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "sp-application-crypto" -version = "17.0.0" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f08604ba4bd856311946722958711a08bded5c929e1227f7a697c58deb09468" +checksum = "65e5d5ec374fc23f4e1b87219be18e01080d8a21a2dee3b49df8befeddbf5780" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 18.0.0", + "sp-io 19.0.0", + "sp-std 7.0.0", ] [[package]] name = "sp-arithmetic" -version = "12.0.0" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 5.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7796939f2e3b68a3b9410ea17a2063b78038cd366f57fa772dd3be0798bd3412" +checksum = "a3dd56a02ca86de62dc9485d95830a5fed56fd7e4a22b13c01e62e73bc2094d2" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 7.0.0", "static_assertions", ] [[package]] name = "sp-core" -version = "16.0.0" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "array-bytes", + "base58", + "bitflags", + "blake2", + "bounded-collections", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db 0.16.0", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "parity-scale-codec", + "parking_lot", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 5.0.0", + "sp-debug-derive 5.0.0", + "sp-externalities 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c96dc3debbe5c22ebf18f99e6a53199efe748e6e584a1902adb88cbad66ae7c" +checksum = "4ea27a1d8de728306d17502ba13127a1b1149c66e0ef348f67dafad630b50c1d" dependencies = [ "array-bytes", "base58", @@ -3126,7 +3241,7 @@ dependencies = [ "dyn-clonable", "ed25519-zebra", "futures", - "hash-db", + "hash-db 0.15.2", "hash256-std-hasher", "impl-serde", "lazy_static", @@ -3143,12 +3258,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing 7.0.0", + "sp-debug-derive 7.0.0", + "sp-externalities 0.18.0", + "sp-runtime-interface 15.0.0", + "sp-std 7.0.0", + "sp-storage 12.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -3158,29 +3273,52 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "6.0.0" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.6", + "sha2 0.10.6", + "sha3", + "sp-std 5.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" +checksum = "d607f7209b1b9571177fc3722a03312df03606bb65f89317ba686d5fa59d438f" dependencies = [ "blake2", "byteorder", "digest 0.10.6", "sha2 0.10.6", "sha3", - "sp-std", + "sp-std 7.0.0", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833921310f9883f2093849d3f5e9e57e9890f6b60839498b08d4c72572cc602" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "proc-macro2", + "quote", + "sp-core-hashing 5.0.0", + "syn 1.0.109", +] + +[[package]] +name = "sp-debug-derive" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "proc-macro2", "quote", - "sp-core-hashing", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3191,42 +3329,62 @@ checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", +] + +[[package]] +name = "sp-debug-derive" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62211eed9ef9dac4b9d837c56ccc9f8ee4fc49d9d9b7e6b9daf098fe173389ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "sp-externalities" -version = "0.17.0" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 5.0.0", + "sp-storage 7.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57052935c9c9b070ea6b339ef0da3bf241b7e065fc37f9c551669ee83ecfc3c1" +checksum = "8ae0f275760689aaefe967943331d458cd99f5169d18364365d4cb584b246d1c" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 7.0.0", + "sp-storage 12.0.0", ] [[package]] name = "sp-inherents" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241a4961e0add07b0d17f6f68de812649c9c5c2832618fd5dc1b82475dbaf771" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] [[package]] name = "sp-io" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578959f9a7e44fd2dd96e8b8bc893cea04fcd7c00a4ffbb0b91c5013899dd02b" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "bytes", "ed25519", @@ -3236,35 +3394,64 @@ dependencies = [ "log", "parity-scale-codec", "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", "tracing", "tracing-core", ] [[package]] -name = "sp-keyring" -version = "18.0.0" +name = "sp-io" +version = "19.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc13a168cdc15e185db5cbe8644e3eaafa534e229593768b3044b60bea00fc8c" +checksum = "3be5c4b33aa06da7745be99da2380a500d2f5ccf9b2df5b344d5d1c675adedaa" dependencies = [ - "lazy_static", - "sp-core", - "sp-runtime", - "strum", + "bytes", + "ed25519", + "ed25519-dalek", + "futures", + "libsecp256k1", + "log", + "parity-scale-codec", + "secp256k1", + "sp-core 18.0.0", + "sp-externalities 0.18.0", + "sp-keystore 0.24.0", + "sp-runtime-interface 15.0.0", + "sp-state-machine 0.24.0", + "sp-std 7.0.0", + "sp-tracing 9.0.0", + "sp-trie 18.0.0", + "tracing", + "tracing-core", ] [[package]] name = "sp-keystore" -version = "0.22.0" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "futures", + "merlin", + "parity-scale-codec", + "parking_lot", + "schnorrkel", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480dbd54b281c638209fbcfce69902b82a0a1af0e22219d46825eadced3136b6" +checksum = "811b1f0e8fc5b71fa359f5b4b67adedeba5dc313415e2923f8055e72c172a6ce" dependencies = [ "async-trait", "futures", @@ -3272,31 +3459,40 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core", - "sp-externalities", + "sp-core 18.0.0", + "sp-externalities 0.18.0", "thiserror", ] [[package]] name = "sp-npos-elections" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8634747ac7d10e08e1ee48a53a024ee7bd610ea92351af8cddd84b296f8da44" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] name = "sp-panic-handler" -version = "6.0.0" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + +[[package]] +name = "sp-panic-handler" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" +checksum = "75986cc917d897e0f6d0c848088064df4c74ccbb8f1c1848700b725f5ca7fe04" dependencies = [ "backtrace", "lazy_static", @@ -3305,9 +3501,31 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "18.0.0" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "sp-runtime" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ab2fd44668d3e8674e2253a43852857a47d49be7db737e98bf157e4bcebefd" +checksum = "f02650b39d4bf5966fcd80a5b11e0cc871620952ab9be901edf1fdf1460b1ea9" dependencies = [ "either", "hash256-std-hasher", @@ -3318,86 +3536,159 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-weights", + "sp-application-crypto 19.0.0", + "sp-arithmetic 13.0.0", + "sp-core 18.0.0", + "sp-io 19.0.0", + "sp-std 7.0.0", + "sp-weights 16.0.0", ] [[package]] name = "sp-runtime-interface" -version = "13.0.0" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.13.0", + "sp-runtime-interface-proc-macro 6.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", + "sp-wasm-interface 7.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb7707246cee4967a8cc71e3ef0e82f562e8b1020606447a6a12b99c7c1b443" +checksum = "2446ea08a1ae6dac4218b26e01c7aad6dbf47eb506f4f2b1efa821aa418a07d2" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.18.0", + "sp-runtime-interface-proc-macro 10.0.0", + "sp-std 7.0.0", + "sp-storage 12.0.0", + "sp-tracing 9.0.0", + "sp-wasm-interface 12.0.0", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "9.0.0" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2773c90e5765847c5e8b4a24b553d38a9ca52ded47c142cfcfb7948f42827af9" +checksum = "05ae5b00aef477127ddb6177b3464ad1e2bdcc12ee913fc5dfc9d065c6cea89b" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "sp-staking" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf0d4447b73a53f8c36915b5710914ea82d303fc880e264e241046ae5baca08" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] name = "sp-state-machine" -version = "0.22.0" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "hash-db 0.16.0", + "log", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "smallvec", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-panic-handler 5.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", + "thiserror", + "tracing", +] + +[[package]] +name = "sp-state-machine" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c957b8b4c252507c12674948db427c5e34fd1760ce256922f1ec5f89f781a4f" +checksum = "779f737342d849205b97e2aacd729695614d86ccb05604e34f0ffe6391d7a4ce" dependencies = [ - "hash-db", + "hash-db 0.15.2", "log", "parity-scale-codec", "parking_lot", "rand 0.8.5", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 18.0.0", + "sp-externalities 0.18.0", + "sp-panic-handler 7.0.0", + "sp-std 7.0.0", + "sp-trie 18.0.0", "thiserror", "tracing", ] +[[package]] +name = "sp-std" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" + [[package]] name = "sp-std" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" +[[package]] +name = "sp-std" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de8eef39962b5b97478719c493bed2926cf70cb621005bbf68ebe58252ff986" + +[[package]] +name = "sp-storage" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + [[package]] name = "sp-storage" version = "11.0.0" @@ -3408,18 +3699,44 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", +] + +[[package]] +name = "sp-storage" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad1f8c52d4700ac7bc42b3375679a6c6fc1fe876f4b40c6efdf36f933ef0291" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 7.0.0", + "sp-std 7.0.0", ] [[package]] name = "sp-tracing" -version = "8.0.0" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "parity-scale-codec", + "sp-std 5.0.0", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "sp-tracing" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46bd547da89a9cda69b4ce4c91a5b7e1f86915190d83cd407b715d0c6bac042" +checksum = "00fab60bf3d42255ce3f678903d3a2564662371c75623de4a1ffc7cac46143df" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 7.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -3427,33 +3744,55 @@ dependencies = [ [[package]] name = "sp-trie" -version = "16.0.0" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "ahash 0.8.3", + "hash-db 0.16.0", + "hashbrown 0.13.2", + "lazy_static", + "memory-db 0.32.0", + "nohash-hasher", + "parity-scale-codec", + "parking_lot", + "scale-info", + "schnellru", + "sp-core 7.0.0", + "sp-std 5.0.0", + "thiserror", + "tracing", + "trie-db 0.27.1", + "trie-root 0.18.0", +] + +[[package]] +name = "sp-trie" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8efbe5b6d29a18fea7c2f52e0098135f2f864b31d335d5105b40a349866ba874" +checksum = "31b5f3e730d26923d699766a9ca065ec39161f7af815c19acfb89c73f0402bf9" dependencies = [ "ahash 0.8.3", - "hash-db", + "hash-db 0.15.2", "hashbrown 0.12.3", "lazy_static", - "memory-db", + "memory-db 0.31.0", "nohash-hasher", "parity-scale-codec", "parking_lot", "scale-info", "schnellru", - "sp-core", - "sp-std", + "sp-core 18.0.0", + "sp-std 7.0.0", "thiserror", "tracing", - "trie-db", - "trie-root", + "trie-db 0.25.1", + "trie-root 0.17.0", ] [[package]] name = "sp-version" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01f705c5c6c6dad760355df0b870dd8e510f720ae6adde3eeba069c116248024" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "impl-serde", "parity-scale-codec", @@ -3461,53 +3800,81 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61fa10e7a0453c9eb2bfd49067585fe54d530f020e3bfa94bf0a9ce547aa5b3" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "sp-wasm-interface" -version = "10.0.0" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 5.0.0", + "wasmi", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbc05650b6338808892a7b04f0c56bb1f7f928bfa9ac58e0af2c1e5bef33229" +checksum = "510bdd9ade55508e5aa05b99ab79aaa4b74a1f7476351b6ce0f3aab3b1cb2524" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 7.0.0", "wasmi", "wasmtime", ] [[package]] name = "sp-weights" -version = "14.0.0" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate#cb7e510ee0df351e26c8032eabe19b8f3948d35f" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-weights" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ebab7696f915aa548494aef3ca8d15217baf10458fe6edb87e60587a47de358" +checksum = "39c4a96e53621ae435981fb6037d8b0be7cf32fae627780094a94ef89f194715" dependencies = [ "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std", + "sp-arithmetic 13.0.0", + "sp-core 18.0.0", + "sp-debug-derive 7.0.0", + "sp-std 7.0.0", ] [[package]] @@ -3555,6 +3922,7 @@ dependencies = [ "clap", "frame-election-provider-support", "frame-support", + "frame-system", "futures", "hyper", "jsonrpsee", @@ -3569,11 +3937,11 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core", - "sp-keyring", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime", - "sp-storage", + "sp-runtime 7.0.0", + "sp-storage 11.0.0", + "sp-version", "subxt", "thiserror", "tokio", @@ -3611,7 +3979,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3636,8 +4004,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54639dba6a113584083968b6a8f457dedae612abe1bd214762101ca29f12e332" +source = "git+https://github.com/paritytech/subxt#2fb7dfd2bf9ac50adffdf1c2fc1660a07f60311b" dependencies = [ "base58", "blake2", @@ -3657,9 +4024,9 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core", - "sp-core-hashing", - "sp-runtime", + "sp-core 18.0.0", + "sp-core-hashing 7.0.0", + "sp-runtime 20.0.0", "subxt-macro", "subxt-metadata", "thiserror", @@ -3669,8 +4036,7 @@ dependencies = [ [[package]] name = "subxt-codegen" version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e86cb719003f1cedf2710a6e55ca4c37aba4c989bbd3b81dd1c52af9e4827e" +source = "git+https://github.com/paritytech/subxt#2fb7dfd2bf9ac50adffdf1c2fc1660a07f60311b" dependencies = [ "darling", "frame-metadata", @@ -3678,44 +4044,42 @@ dependencies = [ "hex", "jsonrpsee", "parity-scale-codec", - "proc-macro-error", "proc-macro2", "quote", "scale-info", "subxt-metadata", - "syn 1.0.107", + "syn 1.0.109", + "thiserror", "tokio", ] [[package]] name = "subxt-macro" version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c08de402a78c4c06c3ee3702c80e519efdcb65911348e018b6998d04404916" +source = "git+https://github.com/paritytech/subxt#2fb7dfd2bf9ac50adffdf1c2fc1660a07f60311b" dependencies = [ "darling", "proc-macro-error", "subxt-codegen", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "subxt-metadata" version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593ab5f53435e6352675af4f9851342607f37785d84c7a3fb3139550d3c35f0" +source = "git+https://github.com/paritytech/subxt#2fb7dfd2bf9ac50adffdf1c2fc1660a07f60311b" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core-hashing", + "sp-core-hashing 7.0.0", ] [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -3724,9 +4088,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.5" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c2d1c76a26822187a1fbb5964e3fff108bc208f02e820ab9dac1234f6b388a" +checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" dependencies = [ "proc-macro2", "quote", @@ -3741,7 +4105,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "unicode-xid", ] @@ -3780,22 +4144,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 1.0.109", ] [[package]] @@ -3868,7 +4232,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.5", + "syn 2.0.4", ] [[package]] @@ -3940,7 +4304,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4016,12 +4380,25 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "3390c0409daaa6027d6681393316f4ccd3ff82e1590a1e4725014e3ae2bf1920" dependencies = [ - "hash-db", - "hashbrown 0.12.3", + "hash-db 0.15.2", + "hashbrown 0.13.2", + "log", + "rustc-hex", + "smallvec", +] + +[[package]] +name = "trie-db" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" +dependencies = [ + "hash-db 0.16.0", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -4033,7 +4410,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ - "hash-db", + "hash-db 0.15.2", +] + +[[package]] +name = "trie-root" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" +dependencies = [ + "hash-db 0.16.0", ] [[package]] @@ -4198,7 +4584,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -4220,7 +4606,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4266,9 +4652,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.96.0" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adde01ade41ab9a5d10ec8ed0bb954238cf8625b5cd5a13093d6de2ad9c2be1a" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap", "url", @@ -4276,9 +4662,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ffcc607adc9da024e87ca814592d4bc67f5c5b58e488f5608d5734a1ebc23e" +checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632" dependencies = [ "anyhow", "bincode", @@ -4301,18 +4687,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb5dc4d79cd7b2453c395f64e9013d2ad90bd083be556d5565cb224ebe8d57" +checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-environ" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9350c919553cddf14f78f9452119c8004d7ef6bfebb79a41a21819ed0c5604d8" +checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883" dependencies = [ "anyhow", "cranelift-entity", @@ -4329,9 +4715,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ba5779ea786386432b94c9fc9ad5597346c319e8239db0d98d5be5cc109a7e" +checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -4352,18 +4738,18 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9841a44c82c74101c10ad4f215392761a2523b3c6c838597962bdb6de75fdb3" +checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" dependencies = [ "once_cell", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4356c2493002da3b111d470c2ecea65a3017009afce8adc46eaa5758739891" +checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064" dependencies = [ "cfg-if", "libc", @@ -4372,9 +4758,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd26efea7a790fcf430e663ba2519f0ab6eb8980adf8b0c58c62b727da77c2ec" +checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d" dependencies = [ "anyhow", "cc", @@ -4396,9 +4782,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e1e4f66a2b9a114f9def450ab9971828c968db6ea6fccd613724b771fa4913" +checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2" dependencies = [ "cranelift-entity", "serde", @@ -4589,6 +4975,6 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index 65d417b54..1f18e5a88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,16 +19,18 @@ tokio = { version = "1.27", features = ["macros", "rt-multi-thread", "sync", "si pin-project-lite = "0.2" # subxt -subxt = "0.27.1" +subxt = { git = "https://github.com/paritytech/subxt" } scale-value = "0.6.0" # substrate -frame-election-provider-support = "16.0.0" -pallet-election-provider-multi-phase = "15.0.0" -sp-npos-elections = "14.0.0" -frame-support = "16.0.0" -sp-core = "16.0.0" -sp-runtime = "18.0.0" +sp-io = { git = "https://github.com/paritytech/substrate" } +frame-system = { git = "https://github.com/paritytech/substrate" } +frame-election-provider-support = { git = "https://github.com/paritytech/substrate" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate" } +sp-npos-elections = { git = "https://github.com/paritytech/substrate" } +frame-support = { git = "https://github.com/paritytech/substrate" } +sp-version = { git = "https://github.com/paritytech/substrate" } +sp-runtime = { git = "https://github.com/paritytech/substrate" } # prometheus prometheus = "0.13" @@ -38,7 +40,6 @@ once_cell = "1.17" [dev-dependencies] assert_cmd = "2.0" sp-storage = "11.0.0" -sp-keyring = "18.0.0" regex = "1" [features] diff --git a/artifacts/metadata.scale b/artifacts/metadata.scale index 5bb290858..96aa68334 100644 Binary files a/artifacts/metadata.scale and b/artifacts/metadata.scale differ diff --git a/src/dry_run.rs b/src/dry_run.rs index f4fa3abd5..68415d409 100644 --- a/src/dry_run.rs +++ b/src/dry_run.rs @@ -41,8 +41,15 @@ where log::info!(target: LOG_TARGET, "Loaded account {}, {:?}", signer, account_info); + let round = api + .storage() + .at(config.at) + .await? + .fetch_or_default(&runtime::storage().election_provider_multi_phase().round()) + .await?; + let (solution, score, _size) = - epm::fetch_snapshot_and_mine_solution::(&api, config.at, config.solver).await?; + epm::fetch_snapshot_and_mine_solution::(&api, config.at, config.solver, round).await?; let round = api .storage() diff --git a/src/epm.rs b/src/epm.rs index 7c99a636d..799fb0007 100644 --- a/src/epm.rs +++ b/src/epm.rs @@ -19,9 +19,8 @@ use crate::{helpers::RuntimeDispatchInfo, opt::Solver, prelude::*, static_types}; use codec::{Decode, Encode}; use frame_election_provider_support::{NposSolution, PhragMMS, SequentialPhragmen}; -use frame_support::{weights::Weight, BoundedVec}; +use frame_support::weights::Weight; use pallet_election_provider_multi_phase::{RawSolution, SolutionOf, SolutionOrSnapshotSize}; -use runtime::runtime_types::pallet_election_provider_multi_phase::RoundSnapshot; use scale_info::{PortableRegistry, TypeInfo}; use scale_value::scale::{decode_as_type, TypeId}; use sp_core::Bytes; @@ -30,6 +29,11 @@ use subxt::{dynamic::Value, rpc::rpc_params, tx::DynamicTxPayload}; const EPM_PALLET_NAME: &str = "ElectionProviderMultiPhase"; +type MinerVoterOf = + frame_election_provider_support::Voter; + +type RoundSnapshot = pallet_election_provider_multi_phase::RoundSnapshot; + #[derive(Copy, Clone, Debug)] struct EpmConstant { epm: &'static str, @@ -57,33 +61,26 @@ pub(crate) async fn update_metadata_constants(api: &SubxtClient) -> Result<(), E const SIGNED_MAX_WEIGHT: EpmConstant = EpmConstant::new("SignedMaxWeight"); const MAX_LENGTH: EpmConstant = EpmConstant::new("MinerMaxLength"); const MAX_VOTES_PER_VOTER: EpmConstant = EpmConstant::new("MinerMaxVotesPerVoter"); + const MAX_WINNERS: EpmConstant = EpmConstant::new("MinerMaxWinners"); + + fn log_metadata(metadata: EpmConstant, val: impl std::fmt::Display) { + log::trace!(target: LOG_TARGET, "updating metadata constant `{metadata}`: {val}",); + } let max_weight = read_constant::(api, SIGNED_MAX_WEIGHT)?; let max_length: u32 = read_constant(api, MAX_LENGTH)?; let max_votes_per_voter: u32 = read_constant(api, MAX_VOTES_PER_VOTER)?; + let max_winners: u32 = read_constant(api, MAX_WINNERS)?; - log::trace!( - target: LOG_TARGET, - "updating metadata constant `{}`: {}", - SIGNED_MAX_WEIGHT.to_string(), - max_weight.ref_time() - ); - log::trace!( - target: LOG_TARGET, - "updating metadata constant `{}`: {}", - MAX_LENGTH.to_string(), - max_length - ); - log::trace!( - target: LOG_TARGET, - "updating metadata constant `{}`: {}", - MAX_VOTES_PER_VOTER.to_string(), - max_votes_per_voter - ); + log_metadata(SIGNED_MAX_WEIGHT, max_weight); + log_metadata(MAX_LENGTH, max_length); + log_metadata(MAX_VOTES_PER_VOTER, max_votes_per_voter); + log_metadata(MAX_WINNERS, max_winners); static_types::MaxWeight::set(max_weight); static_types::MaxLength::set(max_length); static_types::MaxVotesPerVoter::set(max_votes_per_voter); + static_types::MaxWinners::set(max_winners); Ok(()) } @@ -150,12 +147,28 @@ pub async fn signed_submission_at } } +/// Helper to the signed submissions at the block `at`. +pub async fn snapshot_at(at: Option, api: &SubxtClient) -> Result { + let empty = Vec::::new(); + let addr = subxt::dynamic::storage(EPM_PALLET_NAME, "Snapshot", empty); + + match api.storage().at(at).await?.fetch(&addr).await { + Ok(Some(val)) => { + let snapshot = Decode::decode(&mut val.encoded())?; + Ok(snapshot) + }, + Ok(None) => Err(Error::EmptySnapshot), + Err(err) => Err(err.into()), + } +} + /// Helper to fetch snapshot data via RPC /// and compute an NPos solution via [`pallet_election_provider_multi_phase`]. pub async fn fetch_snapshot_and_mine_solution( api: &SubxtClient, hash: Option, solver: Solver, + round: u32, ) -> Result<(SolutionOf, ElectionScore, SolutionOrSnapshotSize), Error> where T: MinerConfig @@ -164,31 +177,24 @@ where + 'static, T::Solution: Send, { - let RoundSnapshot { voters, targets } = api + let snapshot = snapshot_at(hash, &api).await?; + let desired_targets = api .storage() .at(hash) .await? - .fetch(&runtime::storage().election_provider_multi_phase().snapshot()) + .fetch(&runtime::storage().election_provider_multi_phase().desired_targets()) .await? - .unwrap_or_default(); + .expect("Snapshot is non-empty; `desired_target` should exist; qed"); - let desired_targets = api + let minimum_untrusted_score = api .storage() .at(hash) .await? - .fetch(&runtime::storage().election_provider_multi_phase().desired_targets()) - .await? - .unwrap_or_default(); - - let voters: Vec<_> = voters - .into_iter() - .map(|(a, b, mut c)| { - let mut bounded_vec: BoundedVec = BoundedVec::default(); - // If this fails just crash the task. - bounded_vec.try_append(&mut c.0).unwrap_or_else(|_| panic!("BoundedVec capacity: {} failed; `MinerConfig::MaxVotesPerVoter` is different from the chain data; this is a bug please file an issue", static_types::MaxVotesPerVoter::get())); - (a, b, bounded_vec) - }) - .collect(); + .fetch(&runtime::storage().election_provider_multi_phase().minimum_untrusted_score()) + .await?; + + let voters = snapshot.voters.clone(); + let targets = snapshot.targets.clone(); let blocking_task = tokio::task::spawn_blocking(move || match solver { Solver::SeqPhragmen { iterations } => { @@ -209,9 +215,24 @@ where .await; match blocking_task { - Ok(Ok(res)) => Ok(res), + Ok(Ok((solution, score, solution_or_snapshot))) => { + match Miner::::feasibility_check( + RawSolution { solution: solution.clone(), score, round }, + pallet_election_provider_multi_phase::ElectionCompute::Signed, + desired_targets, + snapshot, + round, + minimum_untrusted_score, + ) { + Ok(_) => Ok((solution, score, solution_or_snapshot)), + Err(e) => { + log::error!(target: LOG_TARGET, "Solution feasibility error {:?}", e); + Err(Error::Feasibility(format!("{:?}", e))) + }, + } + }, Ok(Err(err)) => Err(Error::Other(format!("{:?}", err))), - Err(err) => Err(Error::Other(format!("{:?}", err))), + Err(err) => Err(err.into()), } } @@ -278,14 +299,18 @@ pub async fn runtime_api_solution_weight Vec<(u32, u16)> { - assert!(voters >= desired_targets as u32); - (0..voters).zip((0..desired_targets).cycle()).collect() +pub fn mock_votes(voters: u32, desired_targets: u16) -> Option> { + if voters >= desired_targets as u32 { + Some((0..voters).zip((0..desired_targets).cycle()).collect()) + } else { + None + } } #[cfg(test)] #[test] fn mock_votes_works() { - assert_eq!(mock_votes(3, 2), vec![(0, 0), (1, 1), (2, 0)]); - assert_eq!(mock_votes(3, 3), vec![(0, 0), (1, 1), (2, 2)]); + assert_eq!(mock_votes(3, 2), Some(vec![(0, 0), (1, 1), (2, 0)])); + assert_eq!(mock_votes(3, 3), Some(vec![(0, 0), (1, 1), (2, 2)])); + assert_eq!(mock_votes(2, 3), None); } diff --git a/src/error.rs b/src/error.rs index 1837df52a..761845395 100644 --- a/src/error.rs +++ b/src/error.rs @@ -14,6 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . +use crate::prelude::*; + #[derive(thiserror::Error, Debug)] pub enum Error { #[error("Failed to parse log directive: `{0}ยด")] @@ -48,4 +50,10 @@ pub enum Error { SubscriptionClosed, #[error("Dynamic transaction error: {0}")] DynamicTransaction(String), + #[error("Feasibility error: {0}")] + Feasibility(String), + #[error("{0}")] + JoinError(#[from] tokio::task::JoinError), + #[error("Empty snapshot")] + EmptySnapshot, } diff --git a/src/helpers.rs b/src/helpers.rs index c69d7865b..5a92e725e 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -14,8 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . +use crate::{error::Error, prelude::*}; use codec::Decode; use frame_support::weights::Weight; +use jsonrpsee::{core::Error as JsonRpseeError, types::error::CallError}; use pin_project_lite::pin_project; use serde::Deserialize; use std::{ @@ -24,6 +26,7 @@ use std::{ task::{Context, Poll}, time::{Duration, Instant}, }; +use subxt::error::{Error as SubxtError, RpcError}; pin_project! { pub struct Timed @@ -73,3 +76,65 @@ pub struct RuntimeDispatchInfo { /// Weight of this dispatch. pub weight: Weight, } + +pub fn kill_main_task_if_critical_err(tx: &tokio::sync::mpsc::UnboundedSender, err: Error) { + match err { + Error::AlreadySubmitted | + Error::BetterScoreExist | + Error::IncorrectPhase | + Error::TransactionRejected(_) | + Error::JoinError(_) | + Error::Feasibility(_) | + Error::EmptySnapshot | + Error::SubscriptionClosed => {}, + Error::Subxt(SubxtError::Rpc(rpc_err)) => { + log::debug!(target: LOG_TARGET, "rpc error: {:?}", rpc_err); + + match rpc_err { + RpcError::ClientError(e) => { + let jsonrpsee_err = match e.downcast::() { + Ok(e) => *e, + Err(_) => { + let _ = tx.send(Error::Other( + "Failed to downcast RPC error; this is a bug please file an issue" + .to_string(), + )); + return + }, + }; + + match jsonrpsee_err { + JsonRpseeError::Call(CallError::Custom(e)) => { + const BAD_EXTRINSIC_FORMAT: i32 = 1001; + const VERIFICATION_ERROR: i32 = 1002; + use jsonrpsee::types::error::ErrorCode; + + // Check if the transaction gets fatal errors from the `author` RPC. + // It's possible to get other errors such as outdated nonce and similar + // but then it should be possible to try again in the next block or round. + if e.code() == BAD_EXTRINSIC_FORMAT || + e.code() == VERIFICATION_ERROR || e.code() == + ErrorCode::MethodNotFound.code() + { + let _ = tx.send(Error::Subxt(SubxtError::Rpc( + RpcError::ClientError(Box::new(CallError::Custom(e))), + ))); + } + }, + JsonRpseeError::Call(CallError::Failed(_)) => {}, + JsonRpseeError::RequestTimeout => {}, + err => { + let _ = tx.send(Error::Subxt(SubxtError::Rpc(RpcError::ClientError( + Box::new(err), + )))); + }, + } + }, + RpcError::SubscriptionDropped => (), + } + }, + err => { + let _ = tx.send(err); + }, + } +} diff --git a/src/monitor.rs b/src/monitor.rs index d3ca5643e..47ab4648e 100644 --- a/src/monitor.rs +++ b/src/monitor.rs @@ -17,7 +17,7 @@ use crate::{ epm, error::Error, - helpers::TimedFuture, + helpers::{kill_main_task_if_critical_err, TimedFuture}, opt::{Listen, MonitorConfig, SubmissionStrategy}, prelude::*, prometheus, @@ -26,6 +26,7 @@ use crate::{ }; use codec::{Decode, Encode}; use frame_election_provider_support::NposSolution; +use futures::future::TryFutureExt; use jsonrpsee::{core::Error as JsonRpseeError, types::error::CallError}; use pallet_election_provider_multi_phase::{RawSolution, SolutionOf}; use sp_runtime::Perbill; @@ -95,14 +96,18 @@ where // Spawn task and non-recoverable errors are sent back to the main task // such as if the connection has been closed. - tokio::spawn(mine_and_submit_solution::( - tx.clone(), - at, - api.clone(), - signer.clone(), - config.clone(), - submit_lock.clone(), - )); + let tx2 = tx.clone(); + let api2 = api.clone(); + let signer2 = signer.clone(); + let config2 = config.clone(); + let submit_lock2 = submit_lock.clone(); + tokio::spawn(async move { + if let Err(err) = + mine_and_submit_solution::(at, api2, signer2, config2, submit_lock2).await + { + kill_main_task_if_critical_err(&tx2, err) + } + }); let account_info = api .storage() @@ -116,74 +121,15 @@ where } } -fn kill_main_task_if_critical_err(tx: &tokio::sync::mpsc::UnboundedSender, err: Error) { - match err { - Error::AlreadySubmitted | - Error::BetterScoreExist | - Error::IncorrectPhase | - Error::TransactionRejected(_) | - Error::SubscriptionClosed => {}, - Error::Subxt(SubxtError::Rpc(rpc_err)) => { - log::debug!(target: LOG_TARGET, "rpc error: {:?}", rpc_err); - - match rpc_err { - RpcError::ClientError(e) => { - let jsonrpsee_err = match e.downcast::() { - Ok(e) => *e, - Err(_) => { - let _ = tx.send(Error::Other( - "Failed to downcast RPC error; this is a bug please file an issue" - .to_string(), - )); - return - }, - }; - - match jsonrpsee_err { - JsonRpseeError::Call(CallError::Custom(e)) => { - const BAD_EXTRINSIC_FORMAT: i32 = 1001; - const VERIFICATION_ERROR: i32 = 1002; - use jsonrpsee::types::error::ErrorCode; - - // Check if the transaction gets fatal errors from the `author` RPC. - // It's possible to get other errors such as outdated nonce and similar - // but then it should be possible to try again in the next block or round. - if e.code() == BAD_EXTRINSIC_FORMAT || - e.code() == VERIFICATION_ERROR || e.code() == - ErrorCode::MethodNotFound.code() - { - let _ = tx.send(Error::Subxt(SubxtError::Rpc( - RpcError::ClientError(Box::new(CallError::Custom(e))), - ))); - } - }, - JsonRpseeError::Call(CallError::Failed(_)) => {}, - JsonRpseeError::RequestTimeout => {}, - err => { - let _ = tx.send(Error::Subxt(SubxtError::Rpc(RpcError::ClientError( - Box::new(err), - )))); - }, - } - }, - RpcError::SubscriptionDropped => (), - } - }, - err => { - let _ = tx.send(err); - }, - } -} - /// Construct extrinsic at given block and watch it. async fn mine_and_submit_solution( - tx: tokio::sync::mpsc::UnboundedSender, at: Header, api: SubxtClient, signer: Signer, config: MonitorConfig, submit_lock: Arc>, -) where +) -> Result<(), Error> +where T: MinerConfig + Send + Sync @@ -196,65 +142,47 @@ async fn mine_and_submit_solution( // NOTE: as we try to send at each block then the nonce is used guard against // submitting twice. Because once a solution has been accepted on chain // the "next transaction" at a later block but with the same nonce will be rejected - let nonce = match api.rpc().system_account_next_index(signer.account_id()).await { - Ok(none) => none, - Err(e) => { - kill_main_task_if_critical_err(&tx, e.into()); - return - }, - }; - - if let Err(e) = ensure_signed_phase(&api, hash).await { - log::debug!( - target: LOG_TARGET, - "ensure_signed_phase failed: {:?}; skipping block: {}", - e, - at.number - ); + let nonce = api.rpc().system_account_next_index(signer.account_id()).await?; - kill_main_task_if_critical_err(&tx, e); - return - } + ensure_signed_phase(&api, hash) + .inspect_err(|e| { + log::debug!( + target: LOG_TARGET, + "ensure_signed_phase failed: {:?}; skipping block: {}", + e, + at.number + ) + }) + .await?; - let fut = async { + let round_fut = async { api.storage() .at(Some(hash)) .await? - .fetch(&runtime::storage().election_provider_multi_phase().round()) + .fetch_or_default(&runtime::storage().election_provider_multi_phase().round()) .await - // Default round is 1 - // https://github.com/paritytech/substrate/blob/49b06901eb65f2c61ff0934d66987fd955d5b8f5/frame/election-provider-multi-phase/src/lib.rs#L1188 - .map(|r| r.unwrap_or(1)) }; - let round = match fut.await { - Ok(round) => round, - Err(e) => { - log::error!(target: LOG_TARGET, "Mining solution failed: {:?}", e); - kill_main_task_if_critical_err(&tx, e.into()); - return - }, - }; + let round = round_fut + .inspect_err(|e| log::error!(target: LOG_TARGET, "Mining solution failed: {:?}", e)) + .await?; - if let Err(e) = - ensure_no_previous_solution::(&api, hash, signer.account_id()).await - { - log::debug!( - target: LOG_TARGET, - "ensure_no_previous_solution failed: {:?}; skipping block: {}", - e, - at.number - ); - - kill_main_task_if_critical_err(&tx, e); - return - } + ensure_no_previous_solution::(&api, hash, signer.account_id()) + .inspect_err(|e| { + log::debug!( + target: LOG_TARGET, + "ensure_no_previous_solution failed: {:?}; skipping block: {}", + e, + at.number + ) + }) + .await?; tokio::time::sleep(std::time::Duration::from_secs(config.delay as u64)).await; let _lock = submit_lock.lock().await; let (solution, score) = - match epm::fetch_snapshot_and_mine_solution::(&api, Some(hash), config.solver) + match epm::fetch_snapshot_and_mine_solution::(&api, Some(hash), config.solver, round) .timed() .await { @@ -267,8 +195,7 @@ async fn mine_and_submit_solution( let final_weight = tokio::task::spawn_blocking(move || { T::solution_weight(size.voters, size.targets, active_voters, desired_targets) }) - .await - .unwrap(); + .await?; log::info!( target: LOG_TARGET, @@ -289,44 +216,32 @@ async fn mine_and_submit_solution( (solution, score) }, - (Err(e), _) => { - kill_main_task_if_critical_err(&tx, e); - return - }, + (Err(e), _) => return Err(e), }; - let best_head = match get_latest_head(&api, config.listen).await { - Ok(head) => head, - Err(e) => { - kill_main_task_if_critical_err(&tx, e); - return - }, - }; + let best_head = get_latest_head(&api, config.listen).await?; - if let Err(e) = ensure_signed_phase(&api, best_head).await { - log::debug!( - target: LOG_TARGET, - "ensure_signed_phase failed: {:?}; skipping block: {}", - e, - at.number - ); - kill_main_task_if_critical_err(&tx, e); - return - } + ensure_signed_phase(&api, best_head) + .inspect_err(|e| { + log::debug!( + target: LOG_TARGET, + "ensure_signed_phase failed: {:?}; skipping block: {}", + e, + at.number + ) + }) + .await?; - if let Err(e) = - ensure_no_previous_solution::(&api, best_head, signer.account_id()).await - { - log::debug!( - target: LOG_TARGET, - "ensure_no_previous_solution failed: {:?}; skipping block: {:?}", - e, - best_head, - ); - - kill_main_task_if_critical_err(&tx, e); - return - } + ensure_no_previous_solution::(&api, best_head, signer.account_id()) + .inspect_err(|e| { + log::debug!( + target: LOG_TARGET, + "ensure_no_previous_solution failed: {:?}; skipping block: {:?}", + e, + best_head, + ) + }) + .await?; match ensure_solution_passes_strategy(&api, best_head, score, config.submission_strategy) .timed() @@ -346,8 +261,7 @@ async fn mine_and_submit_solution( e, at.number ); - kill_main_task_if_critical_err(&tx, e); - return + return Err(e) }, }; @@ -375,9 +289,9 @@ async fn mine_and_submit_solution( e, at.number ); - kill_main_task_if_critical_err(&tx, e); }, }; + Ok(()) } /// Ensure that now is the signed phase. diff --git a/src/prelude.rs b/src/prelude.rs index dc4231c07..863f04de1 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -24,6 +24,7 @@ pub use crate::{error::Error, opt::*}; pub use frame_election_provider_support::VoteWeight; pub use pallet_election_provider_multi_phase::{Miner, MinerConfig}; +pub use subxt::ext::sp_core; use once_cell::sync::OnceCell; @@ -37,7 +38,7 @@ pub type Hash = sp_core::H256; /// Balance type pub type Balance = u128; -pub use sp_runtime::traits::{Block as BlockT, Header as HeaderT}; +pub use subxt::ext::sp_runtime::traits::{Block as BlockT, Header as HeaderT}; /// Default URI to connect to. /// @@ -74,7 +75,10 @@ pub type SignedSubmission = type = "pallet_election_provider_multi_phase::RoundSnapshot", derive = "Default" ), - substitute_type(type = "sp_arithmetic::per_things::PerU16", with = "::sp_runtime::PerU16"), + substitute_type( + type = "sp_arithmetic::per_things::PerU16", + with = "::subxt::ext::sp_runtime::PerU16" + ), substitute_type( type = "pallet_election_provider_multi_phase::RawSolution", with = "::pallet_election_provider_multi_phase::RawSolution" diff --git a/src/static_types.rs b/src/static_types.rs index 8c21b23eb..a9f3a2817 100644 --- a/src/static_types.rs +++ b/src/static_types.rs @@ -57,6 +57,7 @@ mod max_weight { static REF_TIME: AtomicU64 = AtomicU64::new(0); static PROOF_SIZE: AtomicU64 = AtomicU64::new(0); + pub struct MaxWeight; impl MaxWeight { @@ -81,6 +82,7 @@ mod max_weight { impl_atomic_u32_parameter_types!(max_length, MaxLength); impl_atomic_u32_parameter_types!(max_votes, MaxVotesPerVoter); +impl_atomic_u32_parameter_types!(max_winners, MaxWinners); pub use max_weight::MaxWeight; pub mod westend { @@ -105,6 +107,7 @@ pub mod westend { type MaxWeight = MaxWeight; type MaxVotesPerVoter = MaxVotesPerVoter; type Solution = NposSolution16; + type MaxWinners = MaxWinners; fn solution_weight( voters: u32, @@ -112,20 +115,24 @@ pub mod westend { active_voters: u32, desired_targets: u32, ) -> Weight { + let Some(votes) = epm::mock_votes( + active_voters, + desired_targets.try_into().expect("Desired targets < u16::MAX"), + ) else { + return Weight::MAX; + }; + // Mock a RawSolution to get the correct weight without having to do the heavy work. let raw = RawSolution { - solution: NposSolution16 { - votes1: epm::mock_votes( - active_voters, - desired_targets.try_into().expect("Desired targets < u16::MAX"), - ), - ..Default::default() - }, + solution: NposSolution16 { votes1: votes, ..Default::default() }, ..Default::default() }; - assert_eq!(raw.solution.voter_count(), active_voters as usize); - assert_eq!(raw.solution.unique_targets().len(), desired_targets as usize); + if raw.solution.voter_count() != active_voters as usize || + raw.solution.unique_targets().len() != desired_targets as usize + { + return Weight::MAX + } futures::executor::block_on(epm::runtime_api_solution_weight( raw, @@ -160,6 +167,7 @@ pub mod polkadot { type MaxWeight = MaxWeight; type MaxVotesPerVoter = MaxVotesPerVoter; type Solution = NposSolution16; + type MaxWinners = MaxWinners; fn solution_weight( voters: u32, @@ -167,20 +175,24 @@ pub mod polkadot { active_voters: u32, desired_targets: u32, ) -> Weight { + let Some(votes) = epm::mock_votes( + active_voters, + desired_targets.try_into().expect("Desired targets < u16::MAX"), + ) else { + return Weight::MAX; + }; + // Mock a RawSolution to get the correct weight without having to do the heavy work. let raw = RawSolution { - solution: NposSolution16 { - votes1: epm::mock_votes( - active_voters, - desired_targets.try_into().expect("Desired targets < u16::MAX"), - ), - ..Default::default() - }, + solution: NposSolution16 { votes1: votes, ..Default::default() }, ..Default::default() }; - assert_eq!(raw.solution.voter_count(), active_voters as usize); - assert_eq!(raw.solution.unique_targets().len(), desired_targets as usize); + if raw.solution.voter_count() != active_voters as usize || + raw.solution.unique_targets().len() != desired_targets as usize + { + return Weight::MAX + } futures::executor::block_on(epm::runtime_api_solution_weight( raw, @@ -213,6 +225,7 @@ pub mod kusama { type MaxWeight = MaxWeight; type MaxVotesPerVoter = MaxVotesPerVoter; type Solution = NposSolution24; + type MaxWinners = MaxWinners; fn solution_weight( voters: u32, @@ -220,20 +233,24 @@ pub mod kusama { active_voters: u32, desired_targets: u32, ) -> Weight { + let Some(votes) = epm::mock_votes( + active_voters, + desired_targets.try_into().expect("Desired targets < u16::MAX"), + ) else { + return Weight::MAX; + }; + // Mock a RawSolution to get the correct weight without having to do the heavy work. let raw = RawSolution { - solution: NposSolution24 { - votes1: epm::mock_votes( - active_voters, - desired_targets.try_into().expect("Desired targets < u16::MAX"), - ), - ..Default::default() - }, + solution: NposSolution24 { votes1: votes, ..Default::default() }, ..Default::default() }; - assert_eq!(raw.solution.voter_count(), active_voters as usize); - assert_eq!(raw.solution.unique_targets().len(), desired_targets as usize); + if raw.solution.voter_count() != active_voters as usize || + raw.solution.unique_targets().len() != desired_targets as usize + { + return Weight::MAX + } futures::executor::block_on(epm::runtime_api_solution_weight( raw, diff --git a/staking-miner-playground/Cargo.lock b/staking-miner-playground/Cargo.lock index 56ec5c3ba..a5e9e4fbf 100644 --- a/staking-miner-playground/Cargo.lock +++ b/staking-miner-playground/Cargo.lock @@ -27,6 +27,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array 0.14.6", +] + [[package]] name = "aead" version = "0.4.3" @@ -34,6 +43,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array 0.14.6", + "rand_core 0.6.4", +] + +[[package]] +name = "aead" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" +dependencies = [ + "crypto-common", + "generic-array 0.14.6", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -43,25 +74,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", ] +[[package]] +name = "aes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", + "subtle", +] + +[[package]] +name = "aes-gcm" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" +dependencies = [ + "aead 0.5.1", + "aes 0.8.2", + "cipher 0.4.4", + "ctr 0.9.2", + "ghash 0.5.0", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + [[package]] name = "ahash" version = "0.7.6" @@ -73,6 +149,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.8", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.19" @@ -102,9 +190,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "approx" @@ -115,6 +203,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + [[package]] name = "array-bytes" version = "4.1.0" @@ -140,49 +234,87 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.20", +] [[package]] -name = "async-channel" -version = "1.7.1" +name = "asn1-rs" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "concurrent-queue 1.2.4", - "event-listener", - "futures-core", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.20", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue 2.0.0", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn 1.0.103", + "synstructure", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", + "proc-macro2", + "quote", + "syn 1.0.103", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.103", +] + +[[package]] +name = "asn1_der" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue 2.0.0", + "event-listener", + "futures-core", ] [[package]] @@ -215,72 +347,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-process" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" -dependencies = [ - "async-io", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-std-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723" -dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", -] - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" version = "0.1.58" @@ -289,7 +355,7 @@ checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -355,6 +421,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base58" version = "0.2.0" @@ -434,18 +506,18 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] name = "blake2b_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.2.5", ] [[package]] @@ -456,7 +528,7 @@ checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] @@ -469,7 +541,7 @@ dependencies = [ "arrayvec 0.7.2", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] @@ -478,7 +550,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding", + "block-padding 0.1.5", "byte-tools", "byteorder", "generic-array 0.12.4", @@ -502,6 +574,16 @@ dependencies = [ "generic-array 0.14.6", ] +[[package]] +name = "block-modes" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" +dependencies = [ + "block-padding 0.2.1", + "cipher 0.2.5", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -512,17 +594,21 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.2.0" +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "bounded-collections" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370" dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", + "log", + "parity-scale-codec", + "scale-info", + "serde", ] [[package]] @@ -567,6 +653,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + [[package]] name = "byteorder" version = "1.4.3" @@ -616,15 +708,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" dependencies = [ "camino", "cargo-platform", "semver 1.0.14", "serde", "serde_json", + "thiserror", ] [[package]] @@ -636,6 +729,17 @@ dependencies = [ "jobserver", ] +[[package]] +name = "ccm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] + [[package]] name = "cexpr" version = "0.6.0" @@ -673,7 +777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -684,9 +788,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] @@ -701,7 +805,7 @@ dependencies = [ "js-sys", "num-integer", "num-traits", - "time", + "time 0.1.44", "wasm-bindgen", "winapi", ] @@ -714,11 +818,20 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.16.3", "serde", "unsigned-varint", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array 0.14.6", +] + [[package]] name = "cipher" version = "0.3.0" @@ -728,6 +841,16 @@ dependencies = [ "generic-array 0.14.6", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clang-sys" version = "1.4.0" @@ -764,7 +887,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -817,9 +940,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "constant_time_eq" @@ -827,6 +950,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" + [[package]] name = "core-foundation" version = "0.9.3" @@ -872,18 +1001,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" +checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" +checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -893,6 +1022,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", + "hashbrown 0.12.3", "log", "regalloc2", "smallvec", @@ -901,33 +1031,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" +checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" +checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d" [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" +checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1" dependencies = [ "cranelift-codegen", "log", @@ -937,15 +1067,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" +checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358" [[package]] name = "cranelift-native" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" +checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41" dependencies = [ "cranelift-codegen", "libc", @@ -954,9 +1084,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.2" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" +checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -968,6 +1098,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -1039,12 +1184,25 @@ dependencies = [ ] [[package]] -name = "crypto-common" -version = "0.1.6" +name = "crypto-bigint" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +dependencies = [ + "generic-array 0.14.6", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.6", + "rand_core 0.6.4", "typenum", ] @@ -1069,22 +1227,21 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.26" +name = "ctr" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "quote", - "syn", + "cipher 0.3.0", ] [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] @@ -1150,7 +1307,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.103", ] [[package]] @@ -1167,7 +1324,42 @@ checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.103", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.103", ] [[package]] @@ -1193,7 +1385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn", + "syn 1.0.103", ] [[package]] @@ -1201,11 +1393,92 @@ name = "der" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" dependencies = [ "const-oid", "zeroize", ] +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "derive-syn-parse" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.103", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.103", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn 1.0.103", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1214,7 +1487,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1243,9 +1516,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -1294,13 +1567,14 @@ dependencies = [ ] [[package]] -name = "dns-parser" -version = "0.8.0" +name = "displaydoc" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "byteorder", - "quick-error", + "proc-macro2", + "quote", + "syn 1.0.103", ] [[package]] @@ -1339,7 +1613,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1354,10 +1628,22 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.6.0", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + +[[package]] +name = "ecdsa" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1b0a1222f8072619e8a6b667a854020a03d363738303203c09468b3424a420a" +dependencies = [ + "der 0.7.1", + "elliptic-curve 0.13.2", + "rfc6979 0.4.0", + "signature 2.0.0", ] [[package]] @@ -1366,7 +1652,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -1390,7 +1676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek 3.2.0", - "hashbrown", + "hashbrown 0.12.3", "hex", "rand_core 0.6.4", "sha2 0.9.9", @@ -1409,15 +1695,37 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", - "digest 0.10.5", - "ff", + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.0", + "digest 0.10.6", + "ff 0.12.1", + "generic-array 0.14.6", + "group 0.12.1", + "hkdf", + "pem-rfc7468", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1 0.3.0", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" +dependencies = [ + "base16ct 0.2.0", + "crypto-bigint 0.5.1", + "digest 0.10.6", + "ff 0.13.0", "generic-array 0.14.6", - "group", + "group 0.13.0", + "pkcs8 0.10.1", "rand_core 0.6.4", - "sec1", + "sec1 0.7.1", "subtle", "zeroize", ] @@ -1431,7 +1739,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1449,9 +1757,9 @@ dependencies = [ [[package]] name = "environmental" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "errno" @@ -1489,6 +1797,19 @@ dependencies = [ "futures", ] +[[package]] +name = "expander" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" +dependencies = [ + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn 1.0.103", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -1529,6 +1850,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -1553,9 +1884,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", "futures", @@ -1614,7 +1945,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", ] @@ -1637,9 +1968,10 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", + "frame-support-procedural", "frame-system", "linregress", "log", @@ -1655,12 +1987,13 @@ dependencies = [ "sp-runtime-interface", "sp-std", "sp-storage", + "static_assertions", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "Inflector", "array-bytes", @@ -1672,16 +2005,13 @@ dependencies = [ "frame-system", "gethostname", "handlebars", - "hash-db", "itertools", - "kvdb", "lazy_static", "linked-hash-map", "log", - "memory-db", "parity-scale-codec", "rand 0.8.5", - "rand_pcg 0.3.1", + "rand_pcg", "sc-block-builder", "sc-cli", "sc-client-api", @@ -1691,7 +2021,6 @@ dependencies = [ "sc-sysinfo", "serde", "serde_json", - "serde_nanos", "sp-api", "sp-blockchain", "sp-core", @@ -1704,7 +2033,6 @@ dependencies = [ "sp-std", "sp-storage", "sp-trie", - "tempfile", "thiserror", "thousands", ] @@ -1712,18 +2040,18 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -1731,6 +2059,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -1739,7 +2068,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", @@ -1764,12 +2093,29 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-remote-externalities" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "futures", + "log", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "substrate-rpc-client", + "tokio", +] + [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "bitflags", + "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", @@ -1799,43 +2145,44 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "Inflector", "cfg-expr", + "derive-syn-parse", "frame-support-procedural-tools", "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "log", @@ -1853,12 +2200,18 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "sp-api", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "fs2" version = "0.4.3" @@ -1869,6 +2222,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "fs4" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149" +dependencies = [ + "libc", + "rustix 0.35.13", + "winapi", +] + [[package]] name = "fs_extra" version = "1.2.0" @@ -1883,9 +2247,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -1898,9 +2262,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -1908,15 +2272,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -1926,9 +2290,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-lite" @@ -1947,13 +2311,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1963,21 +2327,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.20.7", + "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-timer" @@ -1987,9 +2351,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -2029,6 +2393,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2048,10 +2413,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2072,7 +2435,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug 0.3.0", + "polyval 0.6.0", ] [[package]] @@ -2106,24 +2479,23 @@ dependencies = [ ] [[package]] -name = "gloo-timers" -version = "0.2.4" +name = "group" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", ] [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff", + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] @@ -2163,9 +2535,9 @@ dependencies = [ [[package]] name = "hash-db" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4" [[package]] name = "hash256-std-hasher" @@ -2182,7 +2554,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", ] [[package]] @@ -2206,6 +2587,15 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] + [[package]] name = "hmac" version = "0.8.1" @@ -2232,7 +2622,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -2279,6 +2669,12 @@ dependencies = [ "pin-project-lite 0.2.9", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.8.0" @@ -2330,7 +2726,7 @@ dependencies = [ "http", "hyper", "log", - "rustls", + "rustls 0.20.7", "rustls-native-certs", "tokio", "tokio-rustls", @@ -2360,6 +2756,12 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -2393,9 +2795,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" dependencies = [ "async-io", "core-foundation", @@ -2406,6 +2808,7 @@ dependencies = [ "log", "rtnetlink", "system-configuration", + "tokio", "windows", ] @@ -2435,7 +2838,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2445,10 +2848,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.6", +] + [[package]] name = "instant" version = "0.1.12" @@ -2467,6 +2879,25 @@ dependencies = [ "num-traits", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "io-lifetimes" version = "0.7.5" @@ -2542,24 +2973,23 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-core", - "jsonrpsee-http-server", "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", @@ -2578,9 +3008,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -2591,10 +3021,8 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "http", "hyper", "jsonrpsee-types", - "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -2604,45 +3032,48 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", - "unicase", ] [[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" +name = "jsonrpsee-proc-macros" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.103", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" dependencies = [ "futures-channel", "futures-util", + "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", "serde", "serde_json", + "soketto", "tokio", - "tracing", - "tracing-futures", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", + "tokio-stream", + "tokio-util", + "tower", + "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -2654,9 +3085,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", @@ -2664,35 +3095,16 @@ dependencies = [ "jsonrpsee-types", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" -dependencies = [ - "futures-channel", - "futures-util", - "http", - "jsonrpsee-core", - "jsonrpsee-types", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "k256" -version = "0.11.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "955890845095ccf31ef83ad41a05aabb4d8cc23dc3cac5a9f5c89cf26dd0da75" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", + "ecdsa 0.16.1", + "elliptic-curve 0.13.2", + "once_cell", "sha2 0.10.6", ] @@ -2702,46 +3114,33 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "kvdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ "kvdb", - "log", "num_cpus", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -2784,17 +3183,16 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.49.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" +checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-dns", "libp2p-identify", "libp2p-kad", @@ -2803,14 +3201,15 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", + "libp2p-quic", "libp2p-request-response", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", "libp2p-wasm-ext", + "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", - "multiaddr", + "multiaddr 0.16.0", "parking_lot 0.12.1", "pin-project", "smallvec", @@ -2818,9 +3217,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", @@ -2830,17 +3229,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", "log", - "multiaddr", - "multihash", + "multiaddr 0.16.0", + "multihash 0.16.3", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", "rw-stream-sink", + "sec1 0.3.0", "sha2 0.10.6", "smallvec", "thiserror", @@ -2849,15 +3249,42 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-core" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7f8b7d65c070a5a1b5f8f0510648189da08f787b8963f8e21219e0710733af" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-identity", + "log", + "multiaddr 0.17.0", + "multihash 0.17.0", + "multistream-select", + "once_cell", + "parking_lot 0.12.1", + "pin-project", + "quick-protobuf", + "rand 0.8.5", + "rw-stream-sink", + "smallvec", + "thiserror", + "unsigned-varint", + "void", +] + [[package]] name = "libp2p-dns" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" +checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "async-std-resolver", "futures", - "libp2p-core", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "smallvec", @@ -2866,14 +3293,14 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.40.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" +checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", "futures", "futures-timer", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "lru", @@ -2885,11 +3312,29 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-identity" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27" +dependencies = [ + "bs58", + "ed25519-dalek", + "log", + "multiaddr 0.17.0", + "multihash 0.17.0", + "prost", + "quick-protobuf", + "rand 0.8.5", + "thiserror", + "zeroize", +] + [[package]] name = "libp2p-kad" -version = "0.41.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22" +checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -2899,7 +3344,7 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "prost", @@ -2915,31 +3360,31 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" +checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ - "async-io", "data-encoding", - "dns-parser", "futures", "if-watch", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", "smallvec", "socket2", + "tokio", + "trust-dns-proto", "void", ] [[package]] name = "libp2p-metrics" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9" +checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" dependencies = [ - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-identify", "libp2p-kad", "libp2p-ping", @@ -2949,14 +3394,14 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" +checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core", + "libp2p-core 0.38.0", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -2967,53 +3412,75 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" +checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "lazy_static", - "libp2p-core", + "libp2p-core 0.38.0", "log", + "once_cell", "prost", "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.40.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" +checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", "void", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-tls", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-request-response" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" +checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", "futures", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", @@ -3023,75 +3490,127 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.40.1" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" +checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", + "libp2p-swarm-derive", "log", "pin-project", "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" +checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "libp2p-tcp" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" +checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "async-io", "futures", "futures-timer", "if-watch", "libc", - "libp2p-core", + "libp2p-core 0.38.0", "log", "socket2", + "tokio", +] + +[[package]] +name = "libp2p-tls" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" +dependencies = [ + "futures", + "futures-rustls", + "libp2p-core 0.39.1", + "libp2p-identity", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", ] [[package]] name = "libp2p-wasm-ext" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ "futures", "js-sys", - "libp2p-core", + "libp2p-core 0.38.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", ] +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", + "futures", + "futures-timer", + "hex", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-noise", + "log", + "multihash 0.16.3", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", + "tokio", + "tokio-util", + "webrtc", +] + [[package]] name = "libp2p-websocket" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" +checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "quicksink", @@ -3103,12 +3622,12 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f079097a21ad017fc8139460630286f02488c8c13b26affb46623aa20d8845" +checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ "futures", - "libp2p-core", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "thiserror", @@ -3215,12 +3734,11 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" +checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52" dependencies = [ "nalgebra", - "statrs", ] [[package]] @@ -3252,7 +3770,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", - "value-bag", ] [[package]] @@ -3261,7 +3778,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -3332,6 +3849,15 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" @@ -3344,7 +3870,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.36.1", + "rustix 0.36.7", ] [[package]] @@ -3367,13 +3893,11 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ "hash-db", - "hashbrown", - "parity-util-mem", ] [[package]] @@ -3445,20 +3969,38 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "multibase", + "multihash 0.16.3", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", - "multihash", + "multibase", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -3487,13 +4029,26 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.5", + "digest 0.10.6", "multihash-derive", "sha2 0.10.6", "sha3", "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +dependencies = [ + "core2", + "digest 0.10.6", + "multihash-derive", + "sha2 0.10.6", + "unsigned-varint", +] + [[package]] name = "multihash-derive" version = "0.8.0" @@ -3504,7 +4059,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "synstructure", ] @@ -3516,9 +4071,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc41247ec209813e2fd414d6e16b9d94297dacf3cd613fa6ef09cd4d9755c10" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", "futures", @@ -3530,9 +4085,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.27.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" +checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" dependencies = [ "approx", "matrixmultiply", @@ -3540,21 +4095,19 @@ dependencies = [ "num-complex", "num-rational", "num-traits", - "rand 0.8.5", - "rand_distr", "simba", "typenum", ] [[package]] name = "nalgebra-macros" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" +checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3625,11 +4178,11 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ - "async-io", "bytes", "futures", "libc", "log", + "tokio", ] [[package]] @@ -3641,6 +4194,7 @@ dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset", ] [[package]] @@ -3658,7 +4212,7 @@ dependencies = [ "pallet-balances", "pallet-election-provider-multi-phase", "pallet-grandpa", - "pallet-randomness-collective-flip", + "pallet-insecure-randomness-collective-flip", "pallet-session", "pallet-staking", "pallet-staking-reward-curve", @@ -3766,7 +4320,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3786,16 +4339,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.12.3", "indexmap", "memchr", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.2", +] + [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -3821,10 +4392,32 @@ version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2 0.10.6", +] + [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", @@ -3840,14 +4433,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-authorship", "sp-runtime", "sp-std", ] @@ -3855,7 +4447,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-election-provider-support", "frame-support", @@ -3870,7 +4462,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-benchmarking", "frame-support", @@ -3885,7 +4477,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3894,7 +4486,7 @@ dependencies = [ "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", @@ -3902,14 +4494,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-std", - "static_assertions", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -3922,7 +4513,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-benchmarking", "frame-support", @@ -3933,8 +4524,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-application-crypto", + "sp-consensus-grandpa", "sp-core", - "sp-finality-grandpa", "sp-io", "sp-runtime", "sp-session", @@ -3943,9 +4534,9 @@ dependencies = [ ] [[package]] -name = "pallet-randomness-collective-flip" +name = "pallet-insecure-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", @@ -3959,7 +4550,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", @@ -3980,7 +4571,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4002,18 +4593,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", @@ -4027,7 +4618,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-benchmarking", "frame-support", @@ -4045,7 +4636,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-support", "frame-system", @@ -4061,7 +4652,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -4077,7 +4668,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4088,9 +4679,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43" +checksum = "00bfb81cf5c90a222db2fb7b3a7cbf8cc7f38dfb6647aca4d98edf8281f56ed5" dependencies = [ "blake2", "crc32fast", @@ -4102,14 +4693,15 @@ dependencies = [ "memmap2", "parking_lot 0.12.1", "rand 0.8.5", + "siphasher", "snap", ] [[package]] name = "parity-scale-codec" -version = "3.2.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" +checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -4122,14 +4714,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.3" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" +checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4138,33 +4730,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "hashbrown", - "impl-trait-for-tuples", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.45.0" @@ -4233,20 +4798,20 @@ checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac 0.11.1", ] [[package]] name = "pbkdf2" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac 0.11.1", + "digest 0.10.6", ] [[package]] @@ -4255,6 +4820,24 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -4291,7 +4874,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4332,7 +4915,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4359,8 +4942,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.0", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" +dependencies = [ + "der 0.7.1", + "spki 0.7.0", ] [[package]] @@ -4397,7 +4990,7 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", ] [[package]] @@ -4409,7 +5002,19 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", +] + +[[package]] +name = "polyval" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.0", ] [[package]] @@ -4455,7 +5060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.103", ] [[package]] @@ -4491,7 +5096,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "version_check", ] @@ -4508,9 +5113,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -4549,7 +5154,7 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4579,16 +5184,16 @@ dependencies = [ "prost", "prost-types", "regex", - "syn", + "syn 1.0.103", "tempfile", "which", ] [[package]] name = "prost-codec" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987" +checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", "bytes", @@ -4607,7 +5212,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4635,6 +5240,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + [[package]] name = "quicksink" version = "0.1.2" @@ -4646,11 +5260,29 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.7", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -4672,7 +5304,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg 0.2.1", ] [[package]] @@ -4724,16 +5355,6 @@ dependencies = [ "getrandom 0.2.8", ] -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -4743,15 +5364,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_pcg" version = "0.3.1" @@ -4791,6 +5403,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time 0.3.20", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time 0.3.20", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -4828,14 +5465,14 @@ checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "regalloc2" -version = "0.3.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" +checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" dependencies = [ "fxhash", "log", @@ -4870,20 +5507,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] -name = "remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +name = "region" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ - "env_logger", - "log", - "parity-scale-codec", - "serde", - "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", - "substrate-rpc-client", + "bitflags", + "libc", + "mach", + "winapi", ] [[package]] @@ -4911,11 +5543,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac 0.12.1", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + [[package]] name = "ring" version = "0.16.20" @@ -4951,19 +5593,44 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", "futures", "log", "netlink-packet-route", "netlink-proto", "nix", "thiserror", + "tokio", +] + +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", ] [[package]] @@ -5002,6 +5669,15 @@ dependencies = [ "semver 1.0.14", ] +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + [[package]] name = "rustix" version = "0.35.13" @@ -5018,9 +5694,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.1" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812a2ec2043c4d6bc6482f5be2ab8244613cac2493d128d36c0759e52a626ab3" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", "errno", @@ -5030,6 +5706,19 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + [[package]] name = "rustls" version = "0.20.7" @@ -5038,8 +5727,8 @@ checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ "log", "ring", - "sct", - "webpki", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -5095,6 +5784,15 @@ dependencies = [ "rustc_version 0.2.3", ] +[[package]] +name = "safe_arch" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +dependencies = [ + "bytemuck", +] + [[package]] name = "same-file" version = "1.0.6" @@ -5107,7 +5805,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "log", "sp-core", @@ -5118,7 +5816,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "futures", "futures-timer", @@ -5141,7 +5839,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5151,41 +5849,42 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-state-machine", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "impl-trait-for-tuples", "memmap2", - "parity-scale-codec", "sc-chain-spec-derive", - "sc-network-common", + "sc-client-api", + "sc-executor", + "sc-network", "sc-telemetry", "serde", "serde_json", + "sp-blockchain", "sp-core", "sp-runtime", + "sp-state-machine", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", "chrono", @@ -5196,7 +5895,7 @@ dependencies = [ "log", "names", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", @@ -5225,11 +5924,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "fnv", "futures", - "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -5246,14 +5944,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", - "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "hash-db", "kvdb", @@ -5266,6 +5963,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", + "schnellru", "sp-arithmetic", "sp-blockchain", "sp-core", @@ -5278,13 +5976,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -5302,7 +6001,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures", @@ -5328,10 +6027,50 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-consensus-grandpa" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "ahash 0.8.3", + "array-bytes", + "async-trait", + "dyn-clone", + "finality-grandpa", + "fork-tree", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-telemetry", + "sc-utils", + "serde_json", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-consensus-grandpa", + "sp-core", + "sp-keystore", + "sp-runtime", + "substrate-prometheus-endpoint", + "thiserror", +] + [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures", @@ -5349,15 +6088,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "lazy_static", "lru", "parity-scale-codec", "parking_lot 0.12.1", @@ -5366,7 +6103,6 @@ dependencies = [ "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", @@ -5381,13 +6117,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", "wasm-instrument", @@ -5397,14 +6130,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -5412,123 +6143,76 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "anyhow", "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm", - "rustix 0.35.13", + "rustix 0.36.7", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] [[package]] -name = "sc-finality-grandpa" +name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "ahash", - "array-bytes", - "async-trait", - "dyn-clone", - "finality-grandpa", - "fork-tree", + "ansi_term", "futures", "futures-timer", "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "sc-block-builder", - "sc-chain-spec", "sc-client-api", - "sc-consensus", - "sc-keystore", "sc-network", "sc-network-common", - "sc-network-gossip", - "sc-telemetry", - "sc-utils", + "sp-blockchain", + "sp-runtime", +] + +[[package]] +name = "sc-keystore" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "array-bytes", + "async-trait", + "parking_lot 0.12.1", "serde_json", - "sp-api", "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", "sp-core", - "sp-finality-grandpa", "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", "thiserror", ] [[package]] -name = "sc-informant" +name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" -dependencies = [ - "ansi_term", - "futures", - "futures-timer", - "log", - "parity-util-mem", - "sc-client-api", - "sc-network-common", - "sc-transaction-pool-api", - "sp-blockchain", - "sp-runtime", -] - -[[package]] -name = "sc-keystore" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" -dependencies = [ - "array-bytes", - "async-trait", - "parking_lot 0.12.1", - "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "thiserror", -] - -[[package]] -name = "sc-network" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", + "async-channel", "async-trait", "asynchronous-codec", - "bitflags", "bytes", - "cid", "either", "fnv", - "fork-tree", "futures", "futures-timer", "ip_network", "libp2p", - "linked-hash-map", "linked_hash_set", "log", "lru", + "mockall", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -5552,7 +6236,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "cid", "futures", @@ -5561,51 +6245,54 @@ dependencies = [ "prost", "prost-build", "sc-client-api", + "sc-network", "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", "unsigned-varint", - "void", ] [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "array-bytes", "async-trait", "bitflags", "bytes", "futures", "futures-timer", "libp2p", - "linked_hash_set", "parity-scale-codec", "prost-build", "sc-consensus", "sc-peerset", + "sc-utils", "serde", "smallvec", "sp-blockchain", "sp-consensus", - "sp-finality-grandpa", + "sp-consensus-grandpa", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "ahash", + "ahash 0.8.3", "futures", "futures-timer", "libp2p", "log", "lru", + "sc-network", "sc-network-common", "sc-peerset", "sp-runtime", @@ -5616,7 +6303,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", "futures", @@ -5626,6 +6313,7 @@ dependencies = [ "prost", "prost-build", "sc-client-api", + "sc-network", "sc-network-common", "sc-peerset", "sp-blockchain", @@ -5637,11 +6325,13 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", + "async-trait", "fork-tree", "futures", + "futures-timer", "libp2p", "log", "lru", @@ -5651,6 +6341,7 @@ dependencies = [ "prost-build", "sc-client-api", "sc-consensus", + "sc-network", "sc-network-common", "sc-peerset", "sc-utils", @@ -5658,26 +6349,28 @@ dependencies = [ "sp-arithmetic", "sp-blockchain", "sp-consensus", + "sp-consensus-grandpa", "sp-core", - "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", "futures", - "hex", "libp2p", "log", "parity-scale-codec", "pin-project", + "sc-network", "sc-network-common", "sc-peerset", + "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", @@ -5686,7 +6379,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", "bytes", @@ -5700,8 +6393,9 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", + "sc-network", "sc-network-common", "sc-peerset", "sc-utils", @@ -5716,7 +6410,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "futures", "libp2p", @@ -5729,7 +6423,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -5738,10 +6432,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "futures", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", @@ -5763,18 +6456,16 @@ dependencies = [ "sp-runtime", "sp-session", "sp-version", + "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "futures", "jsonrpsee", - "log", "parity-scale-codec", - "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -5783,7 +6474,6 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", "sp-version", "thiserror", ] @@ -5791,53 +6481,60 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "futures", + "http", "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", ] [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "array-bytes", "futures", + "futures-util", "hex", "jsonrpsee", + "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-chain-spec", + "sc-client-api", "sc-transaction-pool-api", "serde", "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "sp-version", "thiserror", + "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "directories", "exit-future", "futures", "futures-timer", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -5856,6 +6553,7 @@ dependencies = [ "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", + "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -5865,19 +6563,15 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", "sp-storage", - "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -5894,27 +6588,40 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", - "sc-client-api", "sp-core", ] +[[package]] +name = "sc-storage-monitor" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "clap", + "fs4", + "futures", + "log", + "sc-client-db", + "sc-utils", + "sp-core", + "thiserror", + "tokio", +] + [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "futures", "libc", "log", - "rand 0.7.3", - "rand_pcg 0.2.1", + "rand 0.8.5", + "rand_pcg", "regex", "sc-telemetry", "serde", @@ -5927,7 +6634,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "chrono", "futures", @@ -5935,7 +6642,8 @@ dependencies = [ "log", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", + "sc-utils", "serde", "serde_json", "thiserror", @@ -5945,7 +6653,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "ansi_term", "atty", @@ -5976,26 +6684,26 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures", "futures-timer", "linked-hash-map", "log", + "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -6014,7 +6722,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures", @@ -6028,14 +6736,16 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "async-channel", "futures", "futures-timer", "lazy_static", "log", "parking_lot 0.12.1", "prometheus", + "sp-arithmetic", ] [[package]] @@ -6061,7 +6771,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -6074,6 +6784,17 @@ dependencies = [ "windows-sys 0.36.1", ] +[[package]] +name = "schnellru" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +dependencies = [ + "ahash 0.8.3", + "cfg-if", + "hashbrown 0.13.2", +] + [[package]] name = "schnorrkel" version = "0.9.1" @@ -6104,6 +6825,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sct" version = "0.7.0" @@ -6114,16 +6845,42 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + [[package]] name = "sec1" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "base16ct 0.1.1", + "der 0.6.0", + "generic-array 0.14.6", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] +name = "sec1" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +dependencies = [ + "base16ct 0.2.0", + "der 0.7.1", "generic-array 0.14.6", - "pkcs8", + "pkcs8 0.10.1", "subtle", "zeroize", ] @@ -6228,7 +6985,7 @@ checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -6242,15 +6999,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_nanos" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" -dependencies = [ - "serde", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -6272,7 +7020,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -6308,7 +7056,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -6317,7 +7065,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "keccak", ] @@ -6336,16 +7084,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -6361,22 +7099,39 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", + "rand_core 0.6.4", +] + +[[package]] +name = "signature" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +dependencies = [ + "digest 0.10.6", "rand_core 0.6.4", ] [[package]] name = "simba" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" +checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" dependencies = [ "approx", "num-complex", "num-traits", "paste", + "wide", ] +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + [[package]] name = "slab" version = "0.4.7" @@ -6410,7 +7165,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", "curve25519-dalek 4.0.0-pre.1", @@ -6441,6 +7196,7 @@ dependencies = [ "bytes", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -6450,7 +7206,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "hash-db", "log", @@ -6468,19 +7224,21 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "Inflector", "blake2", + "expander", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "scale-info", @@ -6492,35 +7250,22 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", "sp-std", "static_assertions", ] -[[package]] -name = "sp-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" -dependencies = [ - "async-trait", - "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "sp-api", @@ -6532,7 +7277,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "futures", "log", @@ -6550,26 +7295,22 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures", - "futures-timer", "log", - "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std", - "sp-version", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "parity-scale-codec", @@ -6585,29 +7326,81 @@ dependencies = [ ] [[package]] -name = "sp-consensus-slots" +name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "async-trait", + "merlin", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", + "sp-api", + "sp-application-crypto", + "sp-consensus", + "sp-consensus-slots", + "sp-consensus-vrf", + "sp-core", + "sp-inherents", + "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", ] +[[package]] +name = "sp-consensus-grandpa" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "finality-grandpa", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "sp-consensus-slots" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-std", + "sp-timestamp", +] + +[[package]] +name = "sp-consensus-vrf" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" +dependencies = [ + "parity-scale-codec", + "scale-info", + "schnorrkel", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", - "byteorder", + "bounded-collections", "dyn-clonable", "ed25519-zebra", "futures", @@ -6618,11 +7411,10 @@ dependencies = [ "libsecp256k1", "log", "merlin", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "primitive-types", - "rand 0.7.3", + "rand 0.8.5", "regex", "scale-info", "schnorrkel", @@ -6639,18 +7431,17 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "blake2", + "blake2b_simd", "byteorder", - "digest 0.10.5", + "digest 0.10.6", "sha2 0.10.6", "sha3", "sp-std", @@ -6660,18 +7451,18 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn", + "syn 1.0.103", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -6679,18 +7470,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "environmental", "parity-scale-codec", @@ -6699,49 +7490,32 @@ dependencies = [ ] [[package]] -name = "sp-finality-grandpa" +name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "finality-grandpa", - "log", + "async-trait", + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "serde", - "sp-api", - "sp-application-crypto", "sp-core", - "sp-keystore", "sp-runtime", "sp-std", -] - -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", - "thiserror", + "thiserror", ] [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "bytes", + "ed25519", + "ed25519-dalek", "futures", - "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.1", "secp256k1", "sp-core", "sp-externalities", @@ -6751,15 +7525,14 @@ dependencies = [ "sp-std", "sp-tracing", "sp-trie", - "sp-wasm-interface", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "lazy_static", "sp-core", @@ -6769,10 +7542,9 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "async-trait", "futures", "merlin", "parity-scale-codec", @@ -6787,7 +7559,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "thiserror", "zstd", @@ -6796,7 +7568,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "scale-info", @@ -6810,7 +7582,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "sp-api", "sp-core", @@ -6819,8 +7591,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "backtrace", "lazy_static", @@ -6830,7 +7602,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "rustc-hash", "serde", @@ -6839,17 +7611,16 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-application-crypto", @@ -6862,8 +7633,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -6880,34 +7651,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", + "syn 1.0.103", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "scale-info", @@ -6921,25 +7678,25 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "hash-db", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", @@ -6948,18 +7705,17 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-root", ] [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "impl-serde", "parity-scale-codec", @@ -6972,13 +7728,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", "sp-inherents", "sp-runtime", "sp-std", @@ -6987,8 +7742,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "sp-std", @@ -7000,7 +7755,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "sp-api", "sp-runtime", @@ -7009,7 +7764,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "log", @@ -7024,19 +7779,19 @@ dependencies = [ [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "ahash", + "ahash 0.8.3", "hash-db", - "hashbrown", + "hashbrown 0.13.2", "lazy_static", - "lru", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", "scale-info", + "schnellru", "sp-core", "sp-std", "thiserror", @@ -7048,7 +7803,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7065,19 +7820,20 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -7089,9 +7845,8 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -7115,7 +7870,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.0", +] + +[[package]] +name = "spki" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" +dependencies = [ + "base64ct", + "der 0.7.1", ] [[package]] @@ -7159,8 +7924,8 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-consensus-aura", + "sc-consensus-grandpa", "sc-executor", - "sc-finality-grandpa", "sc-keystore", "sc-rpc", "sc-rpc-api", @@ -7173,8 +7938,8 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-aura", + "sp-consensus-grandpa", "sp-core", - "sp-finality-grandpa", "sp-inherents", "sp-keyring", "sp-runtime", @@ -7215,20 +7980,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "statrs" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" -dependencies = [ - "approx", - "lazy_static", - "nalgebra", - "num-traits", - "rand 0.8.5", + "syn 1.0.103", ] [[package]] @@ -7256,7 +8008,26 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.103", +] + +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", ] [[package]] @@ -7275,7 +8046,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "platforms", ] @@ -7283,17 +8054,15 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "log", "parity-scale-codec", - "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -7304,9 +8073,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ - "futures-util", "hyper", "log", "prometheus", @@ -7317,7 +8085,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "async-trait", "jsonrpsee", @@ -7330,7 +8098,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ "ansi_term", "build-helper", @@ -7344,6 +8112,15 @@ dependencies = [ "wasm-opt", ] +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.4.1" @@ -7361,6 +8138,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -7369,7 +8157,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "unicode-xid", ] @@ -7437,22 +8225,22 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.4", ] [[package]] @@ -7501,25 +8289,62 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.6", "thiserror", "unicode-normalization", "wasm-bindgen", "zeroize", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -7563,7 +8388,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -7572,9 +8397,9 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.7", "tokio", - "webpki", + "webpki 0.22.0", ] [[package]] @@ -7586,6 +8411,7 @@ dependencies = [ "futures-core", "pin-project-lite 0.2.9", "tokio", + "tokio-util", ] [[package]] @@ -7612,6 +8438,41 @@ dependencies = [ "serde", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -7625,6 +8486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", @@ -7638,7 +8500,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -7707,12 +8569,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -7720,9 +8582,9 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" +checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ "hash-db", ] @@ -7745,8 +8607,10 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", + "tokio", "tracing", "url", ] @@ -7766,6 +8630,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", + "tokio", "tracing", "trust-dns-proto", ] @@ -7779,23 +8644,33 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#e6768a3bd553ddbed12fe1a0e4a2ef8d4f8fdf52" +source = "git+https://github.com/paritytech/substrate.git?branch=master#a14236059c2d3da052fb08295082341aa7b87240" dependencies = [ + "async-trait", "clap", + "frame-remote-externalities", + "hex", "log", "parity-scale-codec", - "remote-externalities", - "sc-chain-spec", "sc-cli", "sc-executor", "sc-service", "serde", + "serde_json", + "sp-api", + "sp-consensus-aura", + "sp-consensus-babe", "sp-core", + "sp-debug-derive", "sp-externalities", + "sp-inherents", "sp-io", "sp-keystore", + "sp-rpc", "sp-runtime", "sp-state-machine", + "sp-timestamp", + "sp-transaction-storage-proof", "sp-version", "sp-weights", "substrate-rpc-client", @@ -7808,6 +8683,25 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +[[package]] +name = "turn" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -7815,7 +8709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "digest 0.10.5", + "digest 0.10.6", "rand 0.8.5", "static_assertions", ] @@ -7844,15 +8738,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.8" @@ -7896,6 +8781,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "universal-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "unsigned-varint" version = "0.7.1" @@ -7926,20 +8821,19 @@ dependencies = [ ] [[package]] -name = "valuable" -version = "0.1.0" +name = "uuid" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +dependencies = [ + "getrandom 0.2.8", +] [[package]] -name = "value-bag" -version = "1.0.0-alpha.9" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vcpkg" @@ -7959,6 +8853,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -8025,7 +8928,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -8059,7 +8962,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8081,9 +8984,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.110.2" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68e8037b4daf711393f4be2056246d12d975651b14d581520ad5d1f19219cec" +checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41" dependencies = [ "anyhow", "libc", @@ -8097,9 +9000,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.110.2" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adbad477e97bba3fbd21dd7bfb594e7ad5ceb9169ab1c93ab9cb0ada636b6f" +checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4" dependencies = [ "anyhow", "cxx", @@ -8109,9 +9012,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.110.2" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4fa5a322a4e6ac22fd141f498d56afbdbf9df5debeac32380d2dcaa3e06941" +checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7" dependencies = [ "anyhow", "cc", @@ -8166,22 +9069,24 @@ dependencies = [ "memory_units", "num-rational", "num-traits", + "region", ] [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632" dependencies = [ "anyhow", "bincode", @@ -8202,23 +9107,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" +checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa" dependencies = [ "anyhow", "base64", @@ -8226,19 +9131,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.35.13", + "rustix 0.36.7", "serde", - "sha2 0.9.9", + "sha2 0.10.6", "toml", - "windows-sys 0.36.1", + "windows-sys 0.42.0", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" +checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c" dependencies = [ "anyhow", "cranelift-codegen", @@ -8257,9 +9162,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883" dependencies = [ "anyhow", "cranelift-entity", @@ -8276,9 +9181,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6" dependencies = [ "addr2line", "anyhow", @@ -8289,32 +9194,42 @@ dependencies = [ "log", "object", "rustc-demangle", - "rustix 0.35.13", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" dependencies = [ "object", "once_cell", - "rustix 0.35.13", + "rustix 0.36.7", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d" dependencies = [ "anyhow", "cc", @@ -8327,19 +9242,18 @@ dependencies = [ "memoffset", "paste", "rand 0.8.5", - "rustix 0.35.13", - "thiserror", + "rustix 0.36.7", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2" dependencies = [ "cranelift-entity", "serde", @@ -8357,6 +9271,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki" version = "0.22.0" @@ -8373,7 +9297,219 @@ version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" dependencies = [ - "webpki", + "webpki 0.22.0", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time 0.3.20", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.10.1", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.2.0", + "elliptic-curve 0.12.3", + "hkdf", + "hmac 0.12.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1 0.3.0", + "serde", + "sha1", + "sha2 0.10.6", + "signature 1.6.4", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", ] [[package]] @@ -8396,6 +9532,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wide" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "widestring" version = "0.5.1" @@ -8605,6 +9751,54 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time 0.3.20", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.2", + "base64", + "data-encoding", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.20", +] + [[package]] name = "yamux" version = "0.10.2" @@ -8619,6 +9813,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time 0.3.20", +] + [[package]] name = "zeroize" version = "1.5.7" @@ -8636,7 +9839,7 @@ checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "synstructure", ] diff --git a/staking-miner-playground/node/Cargo.toml b/staking-miner-playground/node/Cargo.toml index e9d9d5646..11f40f433 100644 --- a/staking-miner-playground/node/Cargo.toml +++ b/staking-miner-playground/node/Cargo.toml @@ -19,10 +19,10 @@ name = "staking-miner-playground" [dependencies] clap = { version = "4.0.9", features = ["derive"] } -sc-cli = { git = "https://github.com/paritytech/substrate.git", features = ["wasmtime"] , branch = "master" } +sc-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate.git", features = ["wasmtime"] , branch = "master" } -sc-service = { git = "https://github.com/paritytech/substrate.git", features = ["wasmtime"] , branch = "master" } +sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sc-telemetry = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "master" } @@ -31,8 +31,8 @@ sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branc sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "master" } @@ -43,7 +43,7 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate.gi pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "master" } # These dependencies are used for the node template's RPCs -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } @@ -63,7 +63,6 @@ node-template-runtime = { version = "4.0.0-dev", path = "../runtime" } lazy_static = "1.4.0" rand = "0.8.5" - # CLI-specific dependencies try-runtime-cli = { version = "0.10.0-dev", optional = true, git = "https://github.com/paritytech/substrate.git", branch = "master" } diff --git a/staking-miner-playground/node/src/chain_spec.rs b/staking-miner-playground/node/src/chain_spec.rs index 81e31a864..853466eac 100644 --- a/staking-miner-playground/node/src/chain_spec.rs +++ b/staking-miner-playground/node/src/chain_spec.rs @@ -9,8 +9,8 @@ use pallet_staking::StakerStatus; use rand::{distributions::Alphanumeric, rngs::OsRng, seq::SliceRandom, Rng}; use sc_service::ChainType; use sp_consensus_aura::sr25519::AuthorityId as AuraId; +use sp_consensus_grandpa::AuthorityId as GrandpaId; use sp_core::{sr25519, Pair, Public}; -use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_runtime::traits::{IdentifyAccount, Verify}; lazy_static::lazy_static! { diff --git a/staking-miner-playground/node/src/command.rs b/staking-miner-playground/node/src/command.rs index 29de1594a..2bbcafc92 100644 --- a/staking-miner-playground/node/src/command.rs +++ b/staking-miner-playground/node/src/command.rs @@ -95,7 +95,7 @@ pub fn run() -> sc_cli::Result<()> { let PartialComponents { client, task_manager, backend, .. } = service::new_partial(&config)?; let aux_revert = Box::new(|client, _, blocks| { - sc_finality_grandpa::revert(client, blocks)?; + sc_consensus_grandpa::revert(client, blocks)?; Ok(()) }); Ok((cmd.run(client, backend, Some(aux_revert)), task_manager)) diff --git a/staking-miner-playground/node/src/service.rs b/staking-miner-playground/node/src/service.rs index ee8464688..f33b5b269 100644 --- a/staking-miner-playground/node/src/service.rs +++ b/staking-miner-playground/node/src/service.rs @@ -3,10 +3,9 @@ use node_template_runtime::{self, opaque::Block, RuntimeApi}; use sc_client_api::BlockBackend; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; +use sc_consensus_grandpa::SharedVoterState; pub use sc_executor::NativeElseWasmExecutor; -use sc_finality_grandpa::SharedVoterState; -use sc_keystore::LocalKeystore; -use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; +use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams}; use sc_telemetry::{Telemetry, TelemetryWorker}; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use std::{sync::Arc, time::Duration}; @@ -46,22 +45,18 @@ pub fn new_partial( sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( - sc_finality_grandpa::GrandpaBlockImport< + sc_consensus_grandpa::GrandpaBlockImport< FullBackend, Block, FullClient, FullSelectChain, >, - sc_finality_grandpa::LinkHalf, + sc_consensus_grandpa::LinkHalf, Option, ), >, ServiceError, > { - if config.keystore_remote.is_some() { - return Err(ServiceError::Other("Remote Keystores are not supported.".into())) - } - let telemetry = config .telemetry_endpoints .clone() @@ -103,7 +98,7 @@ pub fn new_partial( client.clone(), ); - let (grandpa_block_import, grandpa_link) = sc_finality_grandpa::block_import( + let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import( client.clone(), &(client.clone() as Arc<_>), select_chain.clone(), @@ -147,13 +142,6 @@ pub fn new_partial( }) } -fn remote_keystore(_url: &String) -> Result, &'static str> { - // FIXME: here would the concrete keystore be built, - // must return a concrete type (NOT `LocalKeystore`) that - // implements `CryptoStore` and `SyncCryptoStore` - Err("Remote Keystore not supported.") -} - /// Builds a new service for a full client. pub fn new_full(mut config: Configuration) -> Result { let sc_service::PartialComponents { @@ -161,23 +149,13 @@ pub fn new_full(mut config: Configuration) -> Result backend, mut task_manager, import_queue, - mut keystore_container, + keystore_container, select_chain, transaction_pool, other: (block_import, grandpa_link, mut telemetry), } = new_partial(&config)?; - if let Some(url) = &config.keystore_remote { - match remote_keystore(url) { - Ok(k) => keystore_container.set_remote_keystore(k), - Err(e) => - return Err(ServiceError::Other(format!( - "Error hooking up remote keystore for {}: {}", - url, e - ))), - }; - } - let grandpa_protocol_name = sc_finality_grandpa::protocol_standard_name( + let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name( &client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"), &config.chain_spec, ); @@ -185,14 +163,14 @@ pub fn new_full(mut config: Configuration) -> Result config .network .extra_sets - .push(sc_finality_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone())); - let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new( + .push(sc_consensus_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone())); + let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new( backend.clone(), grandpa_link.shared_authority_set().clone(), Vec::default(), )); - let (network, system_rpc_tx, tx_handler_controller, network_starter) = + let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, client: client.clone(), @@ -200,7 +178,7 @@ pub fn new_full(mut config: Configuration) -> Result spawn_handle: task_manager.spawn_handle(), import_queue, block_announce_validator_builder: None, - warp_sync: Some(warp_sync), + warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), })?; if config.offchain_worker.enabled { @@ -229,17 +207,17 @@ pub fn new_full(mut config: Configuration) -> Result crate::rpc::create_full(deps).map_err(Into::into) }) }; - let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { network: network.clone(), client: client.clone(), - keystore: keystore_container.sync_keystore(), + keystore: keystore_container.keystore(), task_manager: &mut task_manager, transaction_pool: transaction_pool.clone(), rpc_builder: rpc_extensions_builder, backend, system_rpc_tx, tx_handler_controller, + sync_service: sync_service.clone(), config, telemetry: telemetry.as_mut(), })?; @@ -275,9 +253,9 @@ pub fn new_full(mut config: Configuration) -> Result }, force_authoring, backoff_authoring_blocks, - keystore: keystore_container.sync_keystore(), - sync_oracle: network.clone(), - justification_sync_link: network.clone(), + keystore: keystore_container.keystore(), + sync_oracle: sync_service.clone(), + justification_sync_link: sync_service.clone(), block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32), max_block_proposal_slot_portion: None, telemetry: telemetry.as_ref().map(|x| x.handle()), @@ -295,10 +273,9 @@ pub fn new_full(mut config: Configuration) -> Result if enable_grandpa { // 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_container.sync_keystore()) } else { None }; + let keystore = if role.is_authority() { Some(keystore_container.keystore()) } else { None }; - let grandpa_config = sc_finality_grandpa::Config { + let grandpa_config = sc_consensus_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), justification_period: 512, @@ -316,11 +293,12 @@ pub fn new_full(mut config: Configuration) -> Result // and vote data availability than the observer. The observer has not // been tested extensively yet and having most nodes in a network run it // could lead to finality stalls. - let grandpa_config = sc_finality_grandpa::GrandpaParams { + let grandpa_config = sc_consensus_grandpa::GrandpaParams { config: grandpa_config, link: grandpa_link, network, - voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), + sync: Arc::new(sync_service), + voting_rule: sc_consensus_grandpa::VotingRulesBuilder::default().build(), prometheus_registry, shared_voter_state: SharedVoterState::empty(), telemetry: telemetry.as_ref().map(|x| x.handle()), @@ -331,7 +309,7 @@ pub fn new_full(mut config: Configuration) -> Result task_manager.spawn_essential_handle().spawn_blocking( "grandpa-voter", None, - sc_finality_grandpa::run_grandpa_voter(grandpa_config)?, + sc_consensus_grandpa::run_grandpa_voter(grandpa_config)?, ); } diff --git a/staking-miner-playground/runtime/Cargo.toml b/staking-miner-playground/runtime/Cargo.toml index 4d9ca3c65..d3be35bbf 100644 --- a/staking-miner-playground/runtime/Cargo.toml +++ b/staking-miner-playground/runtime/Cargo.toml @@ -19,7 +19,7 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } pallet-grandpa = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } +pallet-insecure-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } pallet-staking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } pallet-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master" } @@ -71,7 +71,7 @@ std = [ "pallet-aura/std", "frame-election-provider-support/std", "pallet-election-provider-multi-phase/std", - "pallet-randomness-collective-flip/std", + "pallet-insecure-randomness-collective-flip/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-transaction-payment-rpc-runtime-api/std", diff --git a/staking-miner-playground/runtime/src/lib.rs b/staking-miner-playground/runtime/src/lib.rs index bd702c42b..c5f3d892c 100644 --- a/staking-miner-playground/runtime/src/lib.rs +++ b/staking-miner-playground/runtime/src/lib.rs @@ -43,7 +43,9 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{KeyOwnerProofSystem, Randomness, StorageInfo}, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + constants::{ + BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, + }, IdentityFee, Weight, }, StorageValue, @@ -173,7 +175,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = ConstU32<100>; } -impl pallet_randomness_collective_flip::Config for Runtime {} +impl pallet_insecure_randomness_collective_flip::Config for Runtime {} impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; @@ -182,21 +184,17 @@ impl pallet_aura::Config for Runtime { } parameter_types! { + pub const MaxSetIdSessionEntries: u32 = BondingDuration::get() * SessionsPerEra::get(); pub const MaxAuthorities: u32 = 100_000; } impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type KeyOwnerProofSystem = (); - type KeyOwnerProof = - >::Proof; - type KeyOwnerIdentification = >::IdentificationTuple; - type HandleEquivocation = (); type WeightInfo = (); type MaxAuthorities = MaxAuthorities; + type MaxSetIdSessionEntries = MaxSetIdSessionEntries; + type KeyOwnerProof = sp_core::Void; + type EquivocationReportSystem = (); } parameter_types! { @@ -226,6 +224,10 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = pallet_balances::weights::SubstrateWeight; + type FreezeIdentifier = (); + type MaxFreezes = (); + type HoldIdentifier = (); + type MaxHolds = ConstU32<1>; } parameter_types! { @@ -341,11 +343,11 @@ impl frame_support::traits::EstimateNextSessionRotati fn estimate_current_session_progress(_: BlockNumber) -> (Option, Weight) { let now = System::block_number(); let since = now - get_last_election(); - (Some(Permill::from_rational(since, PERIOD)), Weight::from_ref_time(0)) + (Some(Permill::from_rational(since, PERIOD)), Weight::zero()) } fn estimate_next_session_rotation(_: BlockNumber) -> (Option, Weight) { - (Some(get_last_election() + PERIOD), Weight::from_ref_time(0)) + (Some(get_last_election() + PERIOD), Weight::zero()) } } @@ -420,8 +422,6 @@ impl pallet_staking::Config for Runtime { type SessionsPerEra = SessionsPerEra; type BondingDuration = BondingDuration; type SlashDeferDuration = SlashDeferDuration; - /// A super-majority of the council can cancel the slash. - type SlashCancelOrigin = EnsureRoot; type SessionInterface = Self; type EraPayout = pallet_staking::ConvertCurve; type NextNewSession = Session; @@ -436,6 +436,8 @@ impl pallet_staking::Config for Runtime { type BenchmarkingConfig = StakingBenchmarkingConfig; type HistoryDepth = HistoryDepth; type TargetList = pallet_staking::UseValidatorsMap; + /// A super-majority of the council can cancel the slash. + type AdminOrigin = EnsureRoot; } parameter_types! { @@ -539,6 +541,7 @@ impl pallet_election_provider_multi_phase::MinerConfig for Runtime { type MaxLength = MinerMaxLength; type MaxWeight = MinerMaxWeight; type Solution = NposSolution16; + type MaxWinners = MaxActiveValidators; type MaxVotesPerVoter = <::DataProvider as ElectionDataProvider>::MaxVotesPerVoter; @@ -622,7 +625,7 @@ construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic { System: frame_system, - RandomnessCollectiveFlip: pallet_randomness_collective_flip, + RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip, Timestamp: pallet_timestamp, Sudo: pallet_sudo, Aura: pallet_aura, @@ -684,6 +687,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> sp_std::vec::Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { @@ -794,6 +805,12 @@ impl_runtime_apis! { ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_fee_details(uxt, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi @@ -805,6 +822,13 @@ impl_runtime_apis! { fn query_call_fee_details(call: RuntimeCall, len: u32) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) } + + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } #[cfg(feature = "runtime-benchmarks")] diff --git a/staking-miner-playground/runtime/src/pallet_config_block.rs b/staking-miner-playground/runtime/src/pallet_config_block.rs index 86f7aa5c5..5bf8cf220 100644 --- a/staking-miner-playground/runtime/src/pallet_config_block.rs +++ b/staking-miner-playground/runtime/src/pallet_config_block.rs @@ -1,11 +1,8 @@ //! A simple pallet that makes it possible to configure the block length and block weight. -// Ensure we're `no_std` when compiling for Wasm. -#![cfg_attr(not(feature = "std"), no_std)] - use frame_support::{ dispatch::DispatchResult, - weights::{constants::WEIGHT_PER_SECOND, Weight}, + weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}, }; use sp_std::marker::PhantomData; @@ -23,7 +20,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::event] @@ -45,6 +41,7 @@ pub mod pallet { #[pallet::call] impl Pallet { #[pallet::weight(0)] + #[pallet::call_index(0)] pub fn set_block_length(_origin: OriginFor, length: u32) -> DispatchResult { frame_support::log::trace!("ConfigBlock::set_block_length: {length}"); BlockLength::::put(length); @@ -53,6 +50,7 @@ pub mod pallet { } #[pallet::weight(0)] + #[pallet::call_index(1)] pub fn set_block_weight(_origin: OriginFor, weight: u64) -> DispatchResult { frame_support::log::trace!("ConfigBlock::set_block_weight: {weight}"); BlockWeight::::put(weight); @@ -68,7 +66,7 @@ pub mod pallet { #[pallet::type_value] pub fn DefaultBlockWeight() -> u64 { - (WEIGHT_PER_SECOND / 100).ref_time() + WEIGHT_REF_TIME_PER_SECOND / 100 } #[pallet::storage] diff --git a/tests/monitor.rs b/tests/monitor.rs index 05e7a2826..31924473a 100644 --- a/tests/monitor.rs +++ b/tests/monitor.rs @@ -6,11 +6,10 @@ pub mod common; use assert_cmd::cargo::cargo_bin; use codec::Decode; use common::{init_logger, run_polkadot_node, KillChildOnDrop}; -use sp_core::Bytes; use sp_storage::StorageChangeSet; use staking_miner::{ opt::Chain, - prelude::{runtime, AccountId, Hash, SubxtClient}, + prelude::{runtime, sp_core::Bytes, Hash, SubxtClient}, }; use std::{ process, @@ -73,7 +72,7 @@ async fn test_submit_solution(chain: Chain) { }; if let Some(data) = x.changes[0].clone().1 { - let solution: ReadySolution = Decode::decode(&mut data.0.as_slice()) + let solution: ReadySolution = Decode::decode(&mut data.0.as_slice()) .expect("Failed to decode storage as QueuedSolution"); eprintln!("solution: {:?}", solution); assert!(solution.compute == ElectionCompute::Signed); diff --git a/tests/staking_miner_node.rs b/tests/staking_miner_node.rs index 0f89aa655..00d74fc3d 100644 --- a/tests/staking_miner_node.rs +++ b/tests/staking_miner_node.rs @@ -10,8 +10,10 @@ use common::{ }; use regex::Regex; use scale_info::TypeInfo; -use sp_keyring::AccountKeyring; -use staking_miner::{prelude::SubxtClient, signer::PairSigner}; +use staking_miner::{ + prelude::SubxtClient, + signer::{PairSigner, Signer}, +}; use std::{ process, time::{Duration, Instant}, @@ -34,7 +36,7 @@ async fn constants_updated_on_the_fly() { ); let api = SubxtClient::from_url(&ws_url).await.unwrap(); - let signer = PairSigner::new(AccountKeyring::Alice.pair()); + let signer = Signer::new("//Alice").unwrap(); let length: u32 = 1024; let weight: u64 = 2048;