diff --git a/Cargo.lock b/Cargo.lock index fc6b00ad6d..59f9e637a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,15 +36,6 @@ 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.7", -] - [[package]] name = "aead" version = "0.4.3" @@ -52,7 +43,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", ] [[package]] @@ -65,17 +55,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[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]] name = "aes" version = "0.7.5" @@ -127,26 +106,6 @@ dependencies = [ "subtle 2.4.1", ] -[[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.7" @@ -276,24 +235,18 @@ dependencies = [ [[package]] name = "aquamarine" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] -[[package]] -name = "arc-swap" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - [[package]] name = "ark-bls12-377" version = "0.4.0" @@ -432,7 +385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -465,29 +418,13 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "asn1-rs" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" -dependencies = [ - "asn1-rs-derive 0.1.0", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "asn1-rs" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive 0.4.0", + "asn1-rs-derive", "asn1-rs-impl", "displaydoc", "nom", @@ -497,18 +434,6 @@ dependencies = [ "time", ] -[[package]] -name = "asn1-rs-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "asn1-rs-derive" version = "0.4.0" @@ -586,7 +511,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -611,23 +536,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "auto_impl" version = "1.1.0" @@ -667,12 +575,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - [[package]] name = "base16ct" version = "0.2.0" @@ -742,7 +644,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -752,7 +654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", - "rand 0.8.5", + "rand", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -850,7 +752,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding 0.1.5", + "block-padding", "byte-tools", "byteorder", "generic-array 0.12.4", @@ -874,16 +776,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[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" @@ -893,17 +785,11 @@ dependencies = [ "byte-tools", ] -[[package]] -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.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" +checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" dependencies = [ "log", "parity-scale-codec", @@ -937,16 +823,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "bstr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "build-helper" version = "0.1.1" @@ -1061,17 +937,6 @@ dependencies = [ "libc", ] -[[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 2.4.1", -] - [[package]] name = "cexpr" version = "0.6.0" @@ -1222,7 +1087,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] @@ -1235,7 +1100,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -1288,14 +1153,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "unicode-width", + "windows-sys 0.52.0", ] [[package]] @@ -1556,18 +1422,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array 0.14.7", - "rand_core 0.6.4", - "subtle 2.4.1", - "zeroize", -] - [[package]] name = "crypto-bigint" version = "0.5.3" @@ -1690,7 +1544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -1717,7 +1571,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -1734,42 +1588,7 @@ checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", -] - -[[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 0.10.0", - "syn 1.0.109", -] - -[[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.109", + "syn 2.0.72", ] [[package]] @@ -1798,17 +1617,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - [[package]] name = "der" version = "0.7.8" @@ -1819,27 +1627,13 @@ dependencies = [ "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", + "asn1-rs", "displaydoc", "nom", "num-bigint", @@ -1879,34 +1673,14 @@ dependencies = [ ] [[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" +name = "derive-syn-parse" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ - "darling", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[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.109", + "syn 2.0.72", ] [[package]] @@ -2014,33 +1788,33 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "docify" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4235e9b248e2ba4b92007fe9c646f3adf0ffde16dc74713eacc92b8bc58d8d2f" +checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47020e12d7c7505670d1363dd53d6c23724f71a90a3ae32ff8eba40de8404626" +checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.43", + "syn 2.0.72", "termcolor", - "toml 0.7.8", + "toml 0.8.12", "walkdir", ] @@ -2089,30 +1863,18 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - [[package]] name = "ecdsa" version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.8", + "der", "digest 0.10.7", - "elliptic-curve 0.13.6", - "rfc6979 0.4.0", - "signature 2.1.0", - "spki 0.7.2", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -2121,21 +1883,22 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "pkcs8 0.10.2", - "signature 2.1.0", + "pkcs8", + "signature", ] [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.1", "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.8", + "subtle 2.4.1", "zeroize", ] @@ -2162,43 +1925,21 @@ dependencies = [ "serde", ] -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.7", - "ff 0.12.1", - "generic-array 0.14.7", - "group 0.12.1", - "hkdf", - "pem-rfc7468", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle 2.4.1", - "zeroize", -] - [[package]] name = "elliptic-curve" version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.3", + "base16ct", + "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", + "ff", "generic-array 0.14.7", - "group 0.13.0", - "pkcs8 0.10.2", + "group", + "pkcs8", "rand_core 0.6.4", - "sec1 0.7.3", + "sec1", "subtle 2.4.1", "zeroize", ] @@ -2384,7 +2125,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -2556,7 +2297,7 @@ dependencies = [ "pallet-evm", "parity-scale-codec", "prometheus", - "rand 0.8.5", + "rand", "rlp", "sc-block-builder", "sc-client-api", @@ -2598,9 +2339,11 @@ dependencies = [ "ethereum", "ethereum-types", "jsonrpsee", + "rlp", "rustc-hex", "serde", "serde_json", + "sp-core-hashing", ] [[package]] @@ -2630,16 +2373,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "ff" version = "0.13.0" @@ -2701,7 +2434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -2766,9 +2499,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2d0a4310dcf0e5cce78e35e60dc2fda80ef61c8f8fc382e685dfc24fcf5db9" +checksum = "e93d3f0315c2eccf23453609e0ab92fe7c6ad1ca8129bcaf80b9a08c8d7fc52b" dependencies = [ "parity-scale-codec", ] @@ -2890,9 +2623,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99ad86e915f3a57b4a1b56a296e9e3f5bb5aec44189e6d85a773398c6ce614b" +checksum = "4090659c6aaa3c4d5b6c6ec909b4b0a25dec10ad92aad5f729efa8d5bd4d806a" dependencies = [ "frame-support", "frame-support-procedural", @@ -2916,9 +2649,9 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "31.0.0" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c61d2fc05eb6a5b4d6324740165ae90840667a9e8ecc55e10c65343d259838c" +checksum = "efe02c96362e3c7308cdea7545859f767194a1f3f00928f0e1357f4b8a0b3b2c" dependencies = [ "Inflector", "array-bytes 6.1.0", @@ -2935,7 +2668,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_pcg", "sc-block-builder", "sc-cli", @@ -2965,9 +2698,9 @@ dependencies = [ [[package]] name = "frame-executive" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da9af388ae194ff65aba5c7cd7afe9fdaea6a021a06417efc6e4aebd996e7a3" +checksum = "09bff9574ee2dcc349f646e1d2faadf76afd688c2ea1bbac5e4a0e19a0c19c59" dependencies = [ "frame-support", "frame-system", @@ -2996,9 +2729,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "27.0.0" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "654f8001ac929387a460ed2b1dd9ef70af81221ef2b3519bf4c91ecef88f68e4" +checksum = "b8e52c84b611d2049d9253f83a62ab0f093e4be5c42a7ef42ea5bb16d6611e32" dependencies = [ "aquamarine", "array-bytes 6.1.0", @@ -3020,7 +2753,7 @@ dependencies = [ "sp-api", "sp-arithmetic", "sp-core", - "sp-core-hashing-proc-macro", + "sp-crypto-hashing-proc-macro", "sp-debug-derive", "sp-genesis-builder", "sp-inherents", @@ -3038,13 +2771,13 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef13774b6423deb98878e75cd7d22e3bd1ed60c216b000d000a8549de402fcd2" +checksum = "3bf1d648c4007d421b9677b3c893256913498fff159dc2d85022cdd9cc432f3c" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "expander", "frame-support-procedural-tools", "itertools 0.10.5", @@ -3052,39 +2785,39 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "sp-core-hashing", - "syn 2.0.43", + "sp-crypto-hashing", + "syn 2.0.72", ] [[package]] name = "frame-support-procedural-tools" -version = "9.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3ac1266522a8c9a2d2d26d205ec3028b88582d5f3cd5cbc75d0ec8271d197b7" +checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c078db2242ea7265faa486004e7fd8daaf1a577cfcac0070ce55d926922883" +checksum = "68672b9ec6fe72d259d3879dc212c5e42e977588cdac830c76f54d9f492aeb58" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "frame-system" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a51b0fc4d1f35cc4e56c356738ce0e3d1f8483062d9243653b91fd2d20b083" +checksum = "5bc20a793c3cec0b11165c1075fe11a255b2491f3eef8230bb3073cb296e7383" dependencies = [ "cfg-if", "docify", @@ -3103,9 +2836,9 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ca6909232d9e4a2686e862e49bd68314f1ee9796ba0ec29d55300523bf89f" +checksum = "ac47ee48fee3a0b49c9ab9ee68997dee3733776a355f780cf2858449cf495d69" dependencies = [ "frame-benchmarking", "frame-support", @@ -3119,9 +2852,9 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce3dd1fb4ac9a390ebac1744bbb368fcf457a3fda0df2d788c535a3ef5819e1" +checksum = "4c1b20433c3c76b56ce905ed971631ec8c34fa64cf6c20e590afe46455fc0cc8" dependencies = [ "parity-scale-codec", "sp-api", @@ -3129,9 +2862,9 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5edad06e1918b138964e0fee7d7b6d248e7d23e7946f868b165723564ba01b09" +checksum = "0eab87d07bc2f9a2160b818d1b7506c303b3b28b6a8a5f01dc5e2641390450b5" dependencies = [ "frame-support", "parity-scale-codec", @@ -3293,9 +3026,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -3303,9 +3036,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" @@ -3332,9 +3065,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -3353,13 +3086,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -3370,20 +3103,20 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", "rustls 0.20.9", - "webpki 0.22.4", + "webpki", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -3393,9 +3126,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -3471,12 +3204,22 @@ dependencies = [ ] [[package]] -name = "ghash" -version = "0.4.4" +name = "getrandom_or_panic" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "opaque-debug 0.3.0", + "rand", + "rand_core 0.6.4", +] + +[[package]] +name = "ghash" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +dependencies = [ + "opaque-debug 0.3.0", "polyval 0.5.3", ] @@ -3513,37 +3256,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -dependencies = [ - "aho-corasick", - "bstr 1.7.0", - "fnv", - "log", - "regex", -] - -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle 2.4.1", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand_core 0.6.4", "subtle 2.4.1", ] @@ -3654,15 +3373,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.3" @@ -3859,12 +3569,6 @@ dependencies = [ "cc", ] -[[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" @@ -4020,32 +3724,13 @@ 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 = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -4080,7 +3765,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -4135,34 +3820,32 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-core", "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types", + "tokio", "tracing", ] [[package]] name = "jsonrpsee-core" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", - "arrayvec 0.7.4", "async-trait", "beef", - "futures-channel", "futures-util", - "globset", "hyper", "jsonrpsee-types", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "rustc-hash", "serde", "serde_json", @@ -4174,9 +3857,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.1.3", @@ -4187,19 +3870,20 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" +checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ - "futures-channel", "futures-util", "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", + "route-recognizer", "serde", "serde_json", "soketto", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -4209,9 +3893,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" dependencies = [ "anyhow", "beef", @@ -4228,8 +3912,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa 0.16.8", - "elliptic-curve 0.13.6", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.8", ] @@ -4299,9 +3983,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -4321,9 +4005,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libp2p" -version = "0.51.3" +version = "0.51.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097" +checksum = "f35eae38201a993ece6bdc823292d6abd1bffed1c4d0f4a3517d2bd8e1d917fe" dependencies = [ "bytes", "futures", @@ -4346,7 +4030,6 @@ dependencies = [ "libp2p-swarm", "libp2p-tcp", "libp2p-wasm-ext", - "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", "multiaddr", @@ -4397,7 +4080,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "quick-protobuf", - "rand 0.8.5", + "rand", "rw-stream-sink", "smallvec", "thiserror", @@ -4453,7 +4136,7 @@ dependencies = [ "multiaddr", "multihash", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "thiserror", "zeroize", @@ -4478,7 +4161,7 @@ dependencies = [ "libp2p-swarm", "log", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "smallvec", "thiserror", @@ -4500,7 +4183,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.10", "tokio", @@ -4536,7 +4219,7 @@ dependencies = [ "log", "once_cell", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "snow", "static_assertions", @@ -4558,7 +4241,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "void", ] @@ -4578,7 +4261,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "quinn-proto", - "rand 0.8.5", + "rand", "rustls 0.20.9", "thiserror", "tokio", @@ -4596,7 +4279,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "rand 0.8.5", + "rand", "smallvec", ] @@ -4615,7 +4298,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand 0.8.5", + "rand", "smallvec", "tokio", "void", @@ -4658,12 +4341,12 @@ dependencies = [ "futures-rustls", "libp2p-core", "libp2p-identity", - "rcgen 0.10.0", + "rcgen", "ring 0.16.20", "rustls 0.20.9", "thiserror", - "webpki 0.22.4", - "x509-parser 0.14.0", + "webpki", + "x509-parser", "yasna", ] @@ -4681,37 +4364,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "libp2p-webrtc" -version = "0.4.0-alpha.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8" -dependencies = [ - "async-trait", - "asynchronous-codec", - "bytes", - "futures", - "futures-timer", - "hex", - "if-watch", - "libp2p-core", - "libp2p-identity", - "libp2p-noise", - "log", - "multihash", - "quick-protobuf", - "quick-protobuf-codec", - "rand 0.8.5", - "rcgen 0.9.3", - "serde", - "stun", - "thiserror", - "tinytemplate", - "tokio", - "tokio-util", - "webrtc", -] - [[package]] name = "libp2p-websocket" version = "0.41.0" @@ -4772,7 +4424,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -4964,7 +4616,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -4974,11 +4626,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -4989,7 +4641,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -5000,7 +4652,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -5055,16 +4707,6 @@ dependencies = [ "rawpointer", ] -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest 0.10.7", -] - [[package]] name = "memchr" version = "2.6.4" @@ -5090,12 +4732,12 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.6.5" +name = "memmap2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ - "autocfg", + "libc", ] [[package]] @@ -5137,6 +4779,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -5180,8 +4834,8 @@ dependencies = [ "lioness", "log", "parking_lot 0.12.1", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_distr", "subtle 2.4.1", "thiserror", @@ -5325,11 +4979,11 @@ dependencies = [ [[package]] name = "names" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -5425,7 +5079,6 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", ] [[package]] @@ -5543,7 +5196,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", ] @@ -5565,7 +5218,7 @@ dependencies = [ "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -5589,22 +5242,13 @@ dependencies = [ "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", + "asn1-rs", ] [[package]] @@ -5648,7 +5292,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -5675,33 +5319,11 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[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.8", -] - -[[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.8", -] - [[package]] name = "pallet-aura" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796c9823f84c4fc3b92b170ef9339bad67f9376a16d8df943331b72809dade39" +checksum = "a611bef3c8cf281e41a43f32a4153260bdc8b7b61b901e65c7a4442529224e11" dependencies = [ "frame-support", "frame-system", @@ -5717,9 +5339,9 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37359c9f33c8f660126390b42281c0c1c6736ff2f7e1f1361299234f43fd3de8" +checksum = "3d83773e731a1760f99684b09961ed7b92acafe335f36f08ebb8313d3b9c72e2" dependencies = [ "frame-support", "frame-system", @@ -5732,10 +5354,11 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "27.0.0" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919a13c14461ab698c59aadd80d23694c98a17ed6c2dd7c8cc974577738f1836" +checksum = "a9a54b5d0c7c4c3731883d6b1ac18aff44db20c3d0a3470c8861001a17afdc85" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -5965,9 +5588,9 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8127d9f60e5b5e88014ee9423245503704fd188a972be2a02cb921a470db762" +checksum = "a5b20be8592eed7ebca2ee661fc43450088552ebe0bd483d7b101cf5968ab12d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6005,9 +5628,9 @@ dependencies = [ [[package]] name = "pallet-session" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08a1fd9bcdead33c7d8b3a483241084575e19943c0f806194b96d731cf7a80b" +checksum = "7412ac59247b300feee53709f7009a23d1c6f8c70528599f48f44e102d896d03" dependencies = [ "frame-support", "frame-system", @@ -6028,9 +5651,9 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1273597599b58a462454f8ce626b517183b7008a438dbbcc8989ea6980a10c6f" +checksum = "b6d02f7855d411913e77e57126f4a8b8a32d90d9bf47d0b747e367a1301729c3" dependencies = [ "docify", "frame-benchmarking", @@ -6045,9 +5668,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e72c2e35a574dff24f58ff8a1d19cd997858600a1cf608c3a28477fb9bfed3" +checksum = "c1b8810ddfb254c7fb8cd7698229cce513d309a43ff117b38798dae6120f477b" dependencies = [ "docify", "frame-benchmarking", @@ -6066,9 +5689,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "27.0.0" +version = "29.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fdf0cba2fe991bd14562b3e6504fa78eaf079e5b84ff6747edfe50049366aa1" +checksum = "5a5ba71f06f09e955b80dc313c333be3f8d9e8505b051558e0b7af4806b13310" dependencies = [ "frame-support", "frame-system", @@ -6083,9 +5706,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "29.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4802030b4704d9bba5e9a50a3cd6e4db3b4e4e772030a0ed5e00e3fdd3ed14e" +checksum = "08ef209d2d5d077e325bf49b024fd2eff109a5c2ca0d84ce0d50a65839e6b026" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6100,9 +5723,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12eb6403383c384bb922392292d20dad26d95f44292f08d4444ef4a16f892671" +checksum = "c78bcba80c7c61712b98a6b5640975ebd25ceb688c18e975af78a0fac81785b0" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6113,9 +5736,9 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae212409d911bfd5c3cfe078afc71375431547cf0b24f222741c4dc6a6327683" +checksum = "954f15b98c3fdebb763bb5cea4ec6803fd180d540ec5b07a9fcb2c118251d52c" dependencies = [ "frame-benchmarking", "frame-support", @@ -6141,9 +5764,9 @@ dependencies = [ "libc", "log", "lz4", - "memmap2", + "memmap2 0.5.10", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "siphasher", "snap", ] @@ -6277,15 +5900,6 @@ dependencies = [ "base64 0.13.1", ] -[[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.3.0" @@ -6323,7 +5937,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -6364,7 +5978,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -6385,24 +5999,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - [[package]] name = "pkcs8" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", - "spki 0.7.2", + "der", + "spki", ] [[package]] @@ -6594,7 +6198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -6630,6 +6234,15 @@ dependencies = [ "toml_edit 0.20.7", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -6662,14 +6275,14 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -6708,7 +6321,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -6718,7 +6331,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive 0.12.6", ] [[package]] @@ -6735,7 +6358,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease 0.1.25", - "prost", + "prost 0.11.9", "prost-types", "regex", "syn 1.0.109", @@ -6756,13 +6379,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", ] [[package]] @@ -6820,7 +6456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring 0.16.20", "rustc-hash", "rustls 0.20.9", @@ -6828,14 +6464,14 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki 0.22.4", + "webpki", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -6846,19 +6482,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -6866,20 +6489,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -6915,16 +6528,7 @@ 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -6962,19 +6566,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" -dependencies = [ - "pem", - "ring 0.16.20", - "time", - "x509-parser 0.13.2", - "yasna", -] - [[package]] name = "rcgen" version = "0.10.0" @@ -7042,7 +6633,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -7111,17 +6702,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac 0.12.1", - "zeroize", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -7202,6 +6782,12 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rpassword" version = "7.2.0" @@ -7213,17 +6799,6 @@ 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" @@ -7249,20 +6824,6 @@ dependencies = [ "winapi", ] -[[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]] name = "rustc-demangle" version = "0.1.23" @@ -7342,27 +6903,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.1" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring 0.16.20", - "sct 0.7.1", - "webpki 0.22.4", + "sct", + "webpki", ] [[package]] @@ -7374,7 +6922,7 @@ dependencies = [ "log", "ring 0.17.5", "rustls-webpki", - "sct 0.7.1", + "sct", ] [[package]] @@ -7451,9 +6999,9 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ad8791d398db62202f541849b3260ad5c9cf20a1982e3f4ad92f9a629ade76" +checksum = "357127c91373ed6d1ae582f6e3300ab5b13bcde43bbf270a891f44194ef48b70" dependencies = [ "log", "sp-core", @@ -7463,9 +7011,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3db4d42efc80eea2059076028ddddd307ca79a67ec8a00a4842259a298eb2ab" +checksum = "724c3a6eee5f0829a1b79a15e12d63ed81b33281b14004a6331a8883b2fd8fd1" dependencies = [ "futures", "futures-timer", @@ -7486,9 +7034,9 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b900efcf276c61da505e20ac275b2bae8f03b8ceba20dc7e276edec12ca49355" +checksum = "8e8b0640994965c6ff3afa13242d95a61611b83da21fd86ac2b1ebd03e241a02" dependencies = [ "parity-scale-codec", "sp-api", @@ -7502,14 +7050,14 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31471216bdcef2195151d1e3324ec6fd09a6d87b306a15fae4590c0675f0d4c1" +checksum = "0f73880050f8b04fed7f6301279ef3899df13a3891bd06156d56f9a1c50fefba" dependencies = [ "array-bytes 6.1.0", "docify", "log", - "memmap2", + "memmap2 0.9.4", "parity-scale-codec", "sc-chain-spec-derive", "sc-client-api", @@ -7520,6 +7068,7 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", + "sp-crypto-hashing", "sp-genesis-builder", "sp-io", "sp-runtime", @@ -7528,21 +7077,21 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25158f791eb48715da9322375598b541cadd1f193674e8a4d77c79ffa3d95d" +checksum = "f2e80fbdaea194762d4b4b0eec389037c25ad102676203b42d684774ae3019b8" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "sc-cli" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e59c23e005876d2eca1e90ae2deaf85b4c78861f21b9fc3caf6535ca19f6ad9" +checksum = "e8a284c10ea92b1fe789b9f0e5815d393f3a1e3bf6a4adaa884f24e36143b83b" dependencies = [ "array-bytes 6.1.0", "bip39", @@ -7555,7 +7104,7 @@ dependencies = [ "log", "names", "parity-scale-codec", - "rand 0.8.5", + "rand", "regex", "rpassword", "sc-client-api", @@ -7582,9 +7131,9 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9eb785ab5be9a6cacc3cebf137539d66cd9fb05d5472d4aa4aa83f65004c799" +checksum = "3e914dfadaaf384d8869ae47f3ec783bf6a1ac24e7827f5fec2e0e649a450a91" dependencies = [ "fnv", "futures", @@ -7610,9 +7159,9 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ca0a8a26eeb09988245f44c78552e0dc5b2f3945d1495ee711bbbf71bc2d2a" +checksum = "1f08c4f29e6d2b8915bab6435b8817fa39ef7708c04a7cf6226f803e133b017c" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -7637,9 +7186,9 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8204108702ac2f35ed3a541e00aae4656c7591cad6fff33bcc6e7774fc9607" +checksum = "c8e1ac2c698b828073982b6f5b1a466fcc345a452983356af74254ade8e9987d" dependencies = [ "async-trait", "futures", @@ -7663,9 +7212,9 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766cbbf38bbe4ce34d201e3f12011d1038c1d0c8c980aec53012f7db9fe6e110" +checksum = "a16fd09794291795ad43ea1df7190083f9a47fc0a73e9b8ec0ae98fbe53a2b34" dependencies = [ "async-trait", "futures", @@ -7693,9 +7242,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03e1635b5f86e9f76962d037d22be6422517ceded42271d7b537a98f1d9babb" +checksum = "82ec3dc31f8fd024684d1306488836680558b680a8ec38219e19f20854811f02" dependencies = [ "async-trait", "fork-tree", @@ -7720,6 +7269,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-slots", "sp-core", + "sp-crypto-hashing", "sp-inherents", "sp-keystore", "sp-runtime", @@ -7729,9 +7279,9 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b606bac306af19f6b211b24ae9c931b6aefaf21be7c8a91004e4bd99346f772" +checksum = "19f68ddb91626f901578515eed93c7919f739660161f4e9f7b9407e2d0ede981" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7743,9 +7293,9 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923ca35a57239e8d25f458d8edd075e1c051d64e388963b497fd5d8ab005f2c7" +checksum = "7ae91e5b5a120be4d13a59eaf94fd85d7c7af528482b8e21d861fa1167df3083" dependencies = [ "ahash 0.8.6", "array-bytes 6.1.0", @@ -7758,7 +7308,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -7778,6 +7328,7 @@ dependencies = [ "sp-consensus", "sp-consensus-grandpa", "sp-core", + "sp-crypto-hashing", "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", @@ -7786,9 +7337,9 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdda2a7c6f62e4628b1d7d07df6f7616b611e35abb72a4ae576ae2fd2181b97" +checksum = "4c26241f1846c897626b141e2568dbf9088036a1b18b241de23fcebc7a8f5e2e" dependencies = [ "assert_matches", "async-trait", @@ -7822,9 +7373,9 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35334a6ccb0707c1fee9f4188a3cf7f807cf44dfc5d553e95192c7d2beffac75" +checksum = "567bddd65d52951fb9bc7a7e05d1dfdfc47ff2c594ec5ca9756d27e7226635bb" dependencies = [ "async-trait", "futures", @@ -7846,9 +7397,9 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea713755b62067b9c223cef0525b6a88336ca6658fe0ed38340d8cad4963af5" +checksum = "aa2ac6c356538d67987bbb867e11a12a84ba87250c70fd50005b6d74f570a4f7" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -7869,9 +7420,9 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d0fdbc88edc041b64891c7162e02f062baa699212395db0615bd9bdcda0dd7" +checksum = "07498138dee3ddf2c71299ca372d8449880bb3a8a8a299a483094e9c26b0823e" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -7882,9 +7433,9 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a935fc2a7e8e7a7fb4fe7bc15d5be9b52a101f921867703c81a7d02a821f86" +checksum = "30a387779ab54ec1ffce0bf3a6631faada079459d42796c1895683767918a642" dependencies = [ "anyhow", "cfg-if", @@ -7901,9 +7452,9 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd39dfdb19ade5fd05d0646adc4cbadc3c89fbe270dcc7d33b7d496366cd784" +checksum = "eb603a0a703f1bc10a4e6462bec1036d8fb8b3e3eff5513a9c07f98ccb8d662d" dependencies = [ "ansi_term", "futures", @@ -7919,9 +7470,9 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "24.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa306595e3491e73d9b8291c2e3a6c8ea06fe05d1bacd29365fcbd2e9430ad" +checksum = "4cc4f6a558dd23e3bae2e9f195da822465258b9aaf211c34360d7f6efb944e54" dependencies = [ "array-bytes 6.1.0", "parking_lot 0.12.1", @@ -7934,9 +7485,9 @@ dependencies = [ [[package]] name = "sc-mixnet" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df018e1c19855361b958d205cf075b8093f394a67cd337eb4413989d8766abe4" +checksum = "45fb213c15679fe5b87c383815d7fb758c70d3e7c573948bd7fe26ff344d2272" dependencies = [ "array-bytes 4.2.0", "arrayvec 0.7.4", @@ -7964,9 +7515,9 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc4093ac710df0daa0dde6ea3613ecf391695e321923c9bb270eebd5c070bf2" +checksum = "f231c7d5e749ec428b4cfa669d759ae76cd3da4f50d7352a2d711acdc7532891" dependencies = [ "array-bytes 6.1.0", "async-channel", @@ -7986,7 +7537,7 @@ dependencies = [ "parking_lot 0.12.1", "partial_sort", "pin-project", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network-common", "sc-utils", @@ -8008,16 +7559,16 @@ dependencies = [ [[package]] name = "sc-network-bitswap" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae68646fa90d2b93bd02be2e16eb46673e6cc863c83ebe04be54a10cf0c7cb6" +checksum = "e2f89b0134738cb3d982b6e625ca93ae8dbe83ce2a06e4b6a396e4df09ed3499" dependencies = [ "async-channel", "cid", "futures", "libp2p-identity", "log", - "prost", + "prost 0.12.6", "prost-build", "sc-client-api", "sc-network", @@ -8029,9 +7580,9 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d62375edb2146c538166886ae09662b62b7205085826f276da49a11be278d905" +checksum = "3504bbff5ab016948dbab0f21a8be26324810b76eff3627ce744adb5bfc1b3ce" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -8047,9 +7598,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc9f9e0267f58062280f7249eea969a0c9f479c9ad08049ffb39a6f88e515a34" +checksum = "dad02cf809c34b53614fa61377e3289064edf6c78eb11df071d11fbf7546d7e9" dependencies = [ "ahash 0.8.6", "futures", @@ -8067,9 +7618,9 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a97885f6b4b2b5b01c47061c0e8cca10bd20599e6fd48f28044792077e82a7" +checksum = "38d84ef0b212c775f58e0304ec09166089f6b09afddf559b7c2b5702933b3be4" dependencies = [ "array-bytes 6.1.0", "async-channel", @@ -8077,7 +7628,7 @@ dependencies = [ "libp2p-identity", "log", "parity-scale-codec", - "prost", + "prost 0.12.6", "prost-build", "sc-client-api", "sc-network", @@ -8089,9 +7640,9 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7645483f69449667520359d6518320a2a938d7ef9f03037486b489cc597896" +checksum = "9aa9377059deece4e7d419d9ec456f657268c0c603e1cf98df4a920f6da83461" dependencies = [ "array-bytes 6.1.0", "async-channel", @@ -8103,7 +7654,7 @@ dependencies = [ "log", "mockall", "parity-scale-codec", - "prost", + "prost 0.12.6", "prost-build", "sc-client-api", "sc-consensus", @@ -8126,9 +7677,9 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b9a513f519b781ec238a7f33b4f71ca6333c9d3f175ca7b7850fb8ab266869" +checksum = "16c9cad4baf348725bd82eadcd1747fc112ec49c76b863755ce79c588fa73fe4" dependencies = [ "array-bytes 6.1.0", "futures", @@ -8146,9 +7697,9 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fc38515a94c441768b8f2db6caed178da929f9469e75db6b280409f82f5d42" +checksum = "1aee89f2abd406356bfd688bd7a51155dc963259e4b752bb85d1f8a061a194fd" dependencies = [ "array-bytes 6.1.0", "bytes", @@ -8163,7 +7714,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network", "sc-network-common", @@ -8181,9 +7732,9 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221845dce4e7adb57eca5f73318699b377cff29aef92a586e71aa5cef62f879b" +checksum = "fb8dadb2ae5a316e4d08cad6aacd5de1dec792f3bd94e3960795ff7ffd07211c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8191,9 +7742,9 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a1251123e0fad557607750da1b000c062ee193fad86369e6a90ab2e6e0b4e13" +checksum = "4a5acf6d89f062d1334a0c5b67e9dea97666cd47a49acb2696eab55ff1a1bf74" dependencies = [ "futures", "jsonrpsee", @@ -8224,9 +7775,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ceef96e1df9b6f2db3d5ff8703dd79ce96bf0aa6d53b17fb1ee774a73e88ba" +checksum = "e9db6aaabfa7e0c27ec15d0f0a11b994cd4bcf86e362f0d9732b4a414d793f0f" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -8245,9 +7796,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "10.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8083e1b026dcf397f8c1122b3fba6cc744c6962996df6a30e0fb75223f7637" +checksum = "691440bbaddd3bc2675309c965cc75f8bf694f51e0a28039bfc9658299fbc394" dependencies = [ "http", "jsonrpsee", @@ -8261,9 +7812,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9112cc7f746672f8080bafcb34c970e36db765f852f449b1e1640d44fe5fdc7d" +checksum = "a7f10275c62296a785f6e2ac716521e3b6e0fae470416fdf86491cbbfcc2e23d" dependencies = [ "array-bytes 6.1.0", "futures", @@ -8275,6 +7826,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", + "sc-rpc", "sc-transaction-pool-api", "sc-utils", "serde", @@ -8291,9 +7843,9 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e21ba254620ee66bec56f2e7e93f4ed2a492da50009a09e524bfd21a5fdcb30" +checksum = "e14ea779b8c5bdb0d0199c8beebcf1fdc5641e468c480e1c4684be660c8c90af" dependencies = [ "async-trait", "directories", @@ -8305,7 +7857,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "rand 0.8.5", + "rand", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -8355,9 +7907,9 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20aeec62d91b8e8f0f7497bd147d427332a76c9b054e50973c3d289685808ee" +checksum = "aa842052c41ad379eaecdfddc0d5c953d57e311ae688233f68f461b91d38da0a" dependencies = [ "log", "parity-scale-codec", @@ -8367,30 +7919,31 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a028b0b37acaa1394b6abc8344dbb4a9c26c3631b26db0e277b1c1772c73a867" +checksum = "25d2ab8f15021916a07cfbe7a08be484c5dc7d57f07bc0e2aa03260b55a5632f" dependencies = [ "derive_more", "futures", "libc", "log", - "rand 0.8.5", + "rand", "rand_pcg", "regex", "sc-telemetry", "serde", "serde_json", "sp-core", + "sp-crypto-hashing", "sp-io", "sp-std", ] [[package]] name = "sc-telemetry" -version = "14.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5a1c7282f7f56b4caaed8ebb9d723cee92ebbdd0585e6e0e8e57a9fdcc590d" +checksum = "0673a93aa0684b606abfc5fce6c882ada7bb5fad8a2ddc66a09a42bcc9664d91" dependencies = [ "chrono", "futures", @@ -8398,7 +7951,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "pin-project", - "rand 0.8.5", + "rand", "sc-utils", "serde", "serde_json", @@ -8408,13 +7961,13 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a512ed582251b8605cfa0245787f60434e241666298bd4dd5f206d6c0814d0" +checksum = "e77b4fdb4f359f19c395ba862430f3ca0efb50b0310b09753caaa06997edd606" dependencies = [ "ansi_term", - "atty", "chrono", + "is-terminal", "lazy_static", "libc", "log", @@ -8439,21 +7992,21 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c4ae9e4f957d7274ac6b59d667b66262caf6482dbb1b63f1c370528626b1272" +checksum = "151cdf86d79abf22cf2a240a7ca95041c908dbd96c2ae9a818073042aa210964" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "sc-transaction-pool" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28627585ac5e3d8095067f5052d4b98fb5d2d61d819e8f27a7057750a03984f" +checksum = "326dc8ea417c53b6787bd1bb27431d44768504451f5ce4efdde0c15877c7c121" dependencies = [ "async-trait", "futures", @@ -8469,6 +8022,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", + "sp-crypto-hashing", "sp-runtime", "sp-tracing", "sp-transaction-pool", @@ -8478,9 +8032,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8e2122ec55f2e7d14fcfad524e278e4ba7dc5f398f32e32e17c31ee519c72" +checksum = "93ae888ce3491acb1b489c3dba930d0c46c7ef9f9893ba0ab8af9125362f3d14" dependencies = [ "async-trait", "futures", @@ -8495,9 +8049,9 @@ dependencies = [ [[package]] name = "sc-utils" -version = "13.0.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6921990b07ea392b5cea4fae2153bac23cea983c09e5a6716bcae59340e9150d" +checksum = "28b1a238f5baa56405db4e440e2d2f697583736fa2e2f1aac345c438a42975f1" dependencies = [ "async-channel", "futures", @@ -8564,15 +8118,32 @@ dependencies = [ "arrayref", "arrayvec 0.5.2", "curve25519-dalek 2.1.3", - "getrandom 0.1.16", - "merlin", - "rand 0.7.3", + "merlin 2.0.1", "rand_core 0.5.1", "sha2 0.8.2", "subtle 2.4.1", "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" +dependencies = [ + "aead 0.5.2", + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek 4.1.1", + "getrandom_or_panic", + "merlin 3.0.0", + "rand_core 0.6.4", + "serde_bytes", + "sha2 0.10.8", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -8585,16 +8156,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "sct" version = "0.7.1" @@ -8605,42 +8166,16 @@ dependencies = [ "untrusted 0.9.0", ] -[[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 0.1.1", - "der 0.6.1", - "generic-array 0.14.7", - "pkcs8 0.9.0", - "subtle 2.4.1", - "zeroize", -] - [[package]] name = "sec1" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "base16ct 0.2.0", - "der 0.7.8", + "base16ct", + "der", "generic-array 0.14.7", - "pkcs8 0.10.2", + "pkcs8", "subtle 2.4.1", "zeroize", ] @@ -8721,40 +8256,50 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -8772,17 +8317,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.8.2" @@ -8853,16 +8387,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - [[package]] name = "signature" version = "2.1.0" @@ -8892,7 +8416,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" dependencies = [ - "bstr 0.2.17", + "bstr", "unicode-segmentation", ] @@ -8995,15 +8519,15 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1", ] [[package]] name = "sp-api" -version = "25.0.0" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7f4202d58db32c71adb23be744f7b0c93a8063ad9b17b9b4f81d3fc4633ae6" +checksum = "2e4f8702afd77f14a32733e2b589c02694bf79d0b3a641963c508016208724d0" dependencies = [ "hash-db 0.16.0", "log", @@ -9023,24 +8547,24 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "14.0.0" +version = "15.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f19a8b3ebe748e59c5a679bb7510251b9c96873c0f4dc7669030c8254598716" +checksum = "0301e2f77afb450fbf2b093f8b324c7ad88cc82e5e69bd5dc8658a1f068b2a96" dependencies = [ "Inflector", "blake2 0.10.6", "expander", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "sp-application-crypto" -version = "29.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd703034c3f4f34fa4965e0d4d773f50d0f56256b1759b36016b3b1baba147d8" +checksum = "547cad7a6eabb52c639ec117b3db9c6b43cf1b29a9393b18feb19e101a91833f" dependencies = [ "parity-scale-codec", "scale-info", @@ -9052,9 +8576,9 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "22.0.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dec3290d64ec9994457abe974f82fe7260c9cc32e920e4cf20611346ca7464" +checksum = "afa823ca5adc490d47dccb41d69ad482bc57a317bd341de275868378f48f131c" dependencies = [ "integer-sqrt", "num-traits", @@ -9067,9 +8591,9 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64475dafccb351ea025f06f40b205aae8de16563347622d513a0a7767090ca4d" +checksum = "1b36ce171caa7eb2bbe682c089f755fdefa71d3702e4fb1ba30d10146aef99d5" dependencies = [ "sp-api", "sp-inherents", @@ -9079,9 +8603,9 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97252dce922ebb4239e52173d9d67957892da74196372e52d05f44ff68f887a2" +checksum = "a31303e766d2e53812641bbc1f1cec03a85793fc9e627e55f0a6854b28708758" dependencies = [ "futures", "log", @@ -9098,9 +8622,9 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae7acf47fab76b2929ca26f679f1b94e66c03ae1f68637878fe6f18bc4dd160" +checksum = "cb6e512b862c4ff7a26cdcd364898cc42e181ff5cb35fbb226ff27d88c81569a" dependencies = [ "async-trait", "futures", @@ -9114,9 +8638,9 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237ffe23611f0f1e152b09e513090227752652eab2f10965825865102a86bfcc" +checksum = "4bf13c293685319751f72fa5216c7fb5f25f3e8e8fe29b4503296ed5f5466b3d" dependencies = [ "async-trait", "parity-scale-codec", @@ -9132,9 +8656,9 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d248658f288676d2c814bcf79577a5bd0b9f386bfae5c4860bfed6ca71ab973b" +checksum = "b9be2f86a2f0ce2a78b455feb547aa27604fd76a7f7a691995cbad44e0b1b9dd" dependencies = [ "async-trait", "parity-scale-codec", @@ -9152,9 +8676,9 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c01ae3526e29cc2c54daa6c55cb84911d89642f49cc6b2e49a6103f611c05a8" +checksum = "64b606164600db36e596db7abf32b4533dc9a74526d9444c4c45035427b2199b" dependencies = [ "finality-grandpa", "log", @@ -9171,9 +8695,9 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4627b5d9a9991438c42944fb704315092d6c07967469aafa135328be2f9f412" +checksum = "73a5bd1fcd84bbdc7255528c7cdb92f9357fd555f06ee553af7e340cbdab517c" dependencies = [ "parity-scale-codec", "scale-info", @@ -9184,9 +8708,9 @@ dependencies = [ [[package]] name = "sp-core" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92c65ecfdb86fa1c4809b06a2a83d6f3bdb1ef4fe4c5a4f6df19229030d5283" +checksum = "7c33c7a1568175250628567d50c4e1c54a6ac5bc1190413b9be29a9e810cbe73" dependencies = [ "array-bytes 6.1.0", "bip39", @@ -9203,18 +8727,18 @@ dependencies = [ "itertools 0.10.5", "libsecp256k1", "log", - "merlin", + "merlin 3.0.0", "parity-scale-codec", "parking_lot 0.12.1", "paste", "primitive-types", - "rand 0.8.5", + "rand", "scale-info", - "schnorrkel", + "schnorrkel 0.11.4", "secp256k1", "secrecy", "serde", - "sp-core-hashing", + "sp-crypto-hashing", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -9230,9 +8754,18 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "14.0.0" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f812cb2dff962eb378c507612a50f1c59f52d92eb97b710f35be3c2346a3cd7" +dependencies = [ + "sp-crypto-hashing", +] + +[[package]] +name = "sp-crypto-hashing" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1936171e56a51272757760cc50883d2a8c37c650b3602a0aeed05b0c4fffc5f1" +checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb" dependencies = [ "blake2b_simd", "byteorder", @@ -9243,21 +8776,21 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing-proc-macro" -version = "14.0.0" +name = "sp-crypto-hashing-proc-macro" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8497dc98fc204ba9c09abb99840d64964de1925fbd9ff74cc01aa18492c19bd8" +checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b" dependencies = [ "quote", - "sp-core-hashing", - "syn 2.0.43", + "sp-crypto-hashing", + "syn 2.0.72", ] [[package]] name = "sp-database" -version = "9.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6e8c710d6a71512af6f42d9dba9c3d1f6ad793846480babf459bbde3d60a94" +checksum = "722cbecdbf5b94578137dbd07feb51e95f7de221be0c1ff4dcfe0bb4cd986929" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -9265,20 +8798,20 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fd2c660c3e940df93f4920b183cc103443d66503f68189fa7e4b3f09996a18" +checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "sp-externalities" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0a1df458d0bba69bc011a3b0197049396272e497b207ad161289e7518b74bf" +checksum = "e7096ed024cec397804864898b093b51e14c7299f1d00c67dd5800330e02bb82" dependencies = [ "environmental", "parity-scale-codec", @@ -9288,9 +8821,9 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8152be87c61e6d74f491d05b67086408462ab0593b2340311a91a2d3d246f03" +checksum = "fd865540ec19479c7349b584ccd78cc34c3f3a628a2a69dbb6365ceec36295ee" dependencies = [ "serde_json", "sp-api", @@ -9300,9 +8833,9 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7089c364b99df5ce82c1cedcaba56f574ff06e403d9f8640bee33f87750566a2" +checksum = "607c9e35e96966645ff180a9e9f976433b96e905d0a91d8d5315e605a21f4bc0" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9315,9 +8848,9 @@ dependencies = [ [[package]] name = "sp-io" -version = "29.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c600c911757504c43f8c354edd1b0d327a1c2abfe947e490a6b62d8f1543d96" +checksum = "ec43aa073eab35fcb920d7592474d5427ea3be2bf938706a3ad955d7ba54fd8d" dependencies = [ "bytes", "ed25519-dalek", @@ -9327,6 +8860,7 @@ dependencies = [ "rustversion", "secp256k1", "sp-core", + "sp-crypto-hashing", "sp-externalities", "sp-keystore", "sp-runtime-interface", @@ -9340,11 +8874,10 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "30.0.0" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245dfdf093568086ba7e3099319998a37d5ccf6b9faab45f170c766fc1122c37" +checksum = "69cf0a2f881958466fc92bc9b39bbc2c0d815ded4a21f8f953372b0ac2e11b02" dependencies = [ - "lazy_static", "sp-core", "sp-runtime", "strum 0.24.1", @@ -9352,9 +8885,9 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b955546b815ace30f63542efda71ce4e010444596cd8316f7ef49a26fb971709" +checksum = "444f2d53968b1ce5e908882710ff1f3873fcf3e95f59d57432daf685bbacb959" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -9365,9 +8898,9 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0950218edb5c5fb4867e28814d7b13c13a3c80ea37f356dc410437105a07cff8" +checksum = "f0c768c11afbe698a090386876911da4236af199cd38a5866748df4d8628aeff" dependencies = [ "thiserror", "zstd 0.12.4", @@ -9375,9 +8908,9 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cacf4a5b315d8709b5a29ad8e736c0ad5b719e70d02aca0c29c7e3dca4a6e2" +checksum = "fa0b5e87e56c1bb26d9524d48dd127121d630f895bd5914a34f0b017489f7c1d" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -9387,9 +8920,9 @@ dependencies = [ [[package]] name = "sp-mixnet" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bd1dca687e8b360ea48c6e7351c175c8c2ca4d7f0cc0ec88274ef8519c507f" +checksum = "7bebd44b915c65aeb7e7eeaea466aba3b27cdd915c83ea83d4643c54f21ffbbf" dependencies = [ "parity-scale-codec", "scale-info", @@ -9400,9 +8933,9 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5016e6a6cb55aa55f290abe5c5f5efc35defa9eeb996a21667d18ae256c45d5c" +checksum = "4d83b955dce0b6d143bec3f60571311168f362b1c16cf044da7037a407b66c19" dependencies = [ "sp-api", "sp-core", @@ -9411,9 +8944,9 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00e40857ed3e0187f145b037c733545c5633859f1bd1d1b09deb52805fa696a" +checksum = "d8f5a17a0a11de029a8b811cb6e8b32ce7e02183cc04a3e965c383246798c416" dependencies = [ "backtrace", "lazy_static", @@ -9422,9 +8955,9 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3921819bed23ddf4ad6bf402b596a6950255b91f9b58fee88b454dd988d938d6" +checksum = "9af4b73fe7ddd88b1641cca90048c4e525e721763199e6fd29c4f590884f4d16" dependencies = [ "rustc-hash", "serde", @@ -9433,9 +8966,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "30.0.1" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4bb0ddcc4e26cc6c770b49149e1a07ad6b34ab22d3da94330994b7145a025f" +checksum = "0a95e71603a6281e91b0f1fd3d68057644be16d75a4602013187b8137db8abee" dependencies = [ "docify", "either", @@ -9444,7 +8977,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "simple-mermaid", @@ -9458,9 +8991,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "23.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0093f419cb2ef80c8ecb583ac54e05d1105710eb84add7f9483c8ea882cbaff" +checksum = "4e2321ab29d4bcc31f1ba1b4f076a81fb2a666465231e5c981c72320d74dbe63" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -9477,23 +9010,23 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "16.0.0" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ebdb4aff8286f5095871b2f950037d690edb0fed0590af5f6735352533a53b6" +checksum = "cfaf6e85b2ec12a4b99cd6d8d57d083e30c94b7f1b0d8f93547121495aae6f0c" dependencies = [ "Inflector", "expander", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "sp-session" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cdec3cb1c7f0900cfaec5de83f00841d99f2c2fbd32d44931601b43ba6d5bfa" +checksum = "3b86531090cc04d2ab3535df07146258e2fb3ab6257b0a77ef14aa08282c3d4a" dependencies = [ "parity-scale-codec", "scale-info", @@ -9507,9 +9040,9 @@ dependencies = [ [[package]] name = "sp-staking" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15411bbc26ca6d9b14d44698ef19243c8875fa7cc3260621ba28b3241c477c" +checksum = "1e14d003ecf0b610bf1305a92bdab875289b39d514c073f30e75e78c2763a788" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9522,15 +9055,15 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5027dceaa62f3c18f40593ee6a898df69c70e84e01450a17293511c4f3c46c" +checksum = "a67297e702aa32027d7766803f362a420d6d3ec9e2f84961f3c64e2e52b5aaf9" dependencies = [ "hash-db 0.16.0", "log", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "smallvec", "sp-core", "sp-externalities", @@ -9544,21 +9077,22 @@ dependencies = [ [[package]] name = "sp-statement-store" -version = "9.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ce852bff3c772be9646cc3491ee7dc8db47a3fb860659b5258c585a730013" +checksum = "309a9ae4e8134bbed8ffc510cf4d461a4a651f9250b556de782cedd876abe1ff" dependencies = [ "aes-gcm 0.10.3", "curve25519-dalek 4.1.1", "ed25519-dalek", "hkdf", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", + "sp-crypto-hashing", "sp-externalities", "sp-runtime", "sp-runtime-interface", @@ -9569,15 +9103,15 @@ dependencies = [ [[package]] name = "sp-std" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71323a3b5f189085d11123ce397b3cdfaec4437071243b51f68a38a4833fbaa7" +checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" [[package]] name = "sp-storage" -version = "18.0.0" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5300c9012180259489a97167f4c45cf3362446e5f0d0c66b6e9342968be8f22" +checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9589,9 +9123,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c6c12bc3bce3f785984843ea997e7f3da9c43ee392bf8c6f9ab183976c0cbf" +checksum = "249cd06624f2edb53b25af528ab216a508dc9d0870e158b43caac3a97e86699f" dependencies = [ "async-trait", "parity-scale-codec", @@ -9603,9 +9137,9 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b63d14c3214b8b5fe35b67bd61124b5f080cc9d1312b227e0c6cc2a198461e" +checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" dependencies = [ "parity-scale-codec", "sp-std", @@ -9616,9 +9150,9 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3927edc3371ad785725b3e50edf6769097ba64b193fc4779ec6e047f0d106dd0" +checksum = "9742861c5330bdcb42856a6eed3d3745b58ee1c92ca4c9260032ff4e6c387165" dependencies = [ "sp-api", "sp-runtime", @@ -9626,9 +9160,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "25.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c58c860d7e2e7dc267fa0d8bcf451816d9a0e387c4fcefafb15412aa7fd97fa" +checksum = "ece8e22a5419c7a336a2544654e1389fec8cac19b93081a30912842b44e8167f" dependencies = [ "async-trait", "parity-scale-codec", @@ -9642,19 +9176,18 @@ dependencies = [ [[package]] name = "sp-trie" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc3ad723c9addc4b7aafbe8bfabf638c39be3c911e11f58e924e17554003ac" +checksum = "eed48dfd05081e8b36741b10ce4eb686c135a2952227a11fe71caec89890ddbb" dependencies = [ "ahash 0.8.6", "hash-db 0.16.0", - "hashbrown 0.13.2", "lazy_static", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "scale-info", "schnellru", "sp-core", @@ -9668,16 +9201,16 @@ dependencies = [ [[package]] name = "sp-version" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f18671744ee3af2a325daa257cc7aba2c464b36cca165d61bec72ed1ddcbb51" +checksum = "ff4a660c68995663d6778df324f4e2b4efc48d55a8e9c92c22a5fb7dae7899cd" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro", + "sp-crypto-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -9686,21 +9219,21 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49535d8c7184dab46d15639c68374a30cbb1534e392fa09a1ebb059a993ad436" +checksum = "e9bc3fed32d6dacbbbfb28dd1fe0224affbb737cb6cbfca1d9149351c2b69a7d" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] name = "sp-wasm-interface" -version = "19.0.0" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ef2e859d3cde7294c3bf691f8f64244a6a9bb67e53c65729b129318757070e" +checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -9712,9 +9245,9 @@ dependencies = [ [[package]] name = "sp-weights" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8813a9942a3b900d5ce109875b91ff8ae7eb5849545ebb6464c22aa21e42622e" +checksum = "a3be30aec904994451dcacf841a9168cfbbaf817de6b24b6a1c1418cbf1af2fe" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -9741,16 +9274,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - [[package]] name = "spki" version = "0.7.2" @@ -9758,7 +9281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.8", + "der", ] [[package]] @@ -9937,12 +9460,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -9987,26 +9504,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.43", -] - -[[package]] -name = "stun" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" -dependencies = [ - "base64 0.13.1", - "crc", - "lazy_static", - "md-5", - "rand 0.8.5", - "ring 0.16.20", - "subtle 2.4.1", - "thiserror", - "tokio", - "url", - "webrtc-util", + "syn 2.0.72", ] [[package]] @@ -10017,7 +9515,7 @@ checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328" dependencies = [ "hmac 0.11.0", "pbkdf2", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.9", "zeroize", ] @@ -10031,21 +9529,21 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand 0.8.5", + "rand", "rustc-hex", ] [[package]] name = "substrate-build-script-utils" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d211fbdfa0ecd20577b61bfaaea72fbe6cdb34a689dc200337c4564761f37ceb" +checksum = "b285e7d183a32732fdc119f3d81b7915790191fad602b7c709ef247073c77a2e" [[package]] name = "substrate-frame-rpc-system" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48e02a099edb2ecc66c399364eec0102081ce64324e4952e2c6586111514f32" +checksum = "332f903d2f34703204f0003136c9abbc569d691028279996a1daf8f248a7369f" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10063,9 +9561,9 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ededbe617291db8a47d6e5155486ff1e5425f0bbf5dcb7f752730466a62bd293" +checksum = "0d8fe06b03b8a291c09507c42f92a2c2c10dd3d62975d02c7f64a92d87bfe09b" dependencies = [ "hyper", "log", @@ -10076,32 +9574,23 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "16.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8166be0b5e24dc91209ec92869bfa6e0fbe07e64ebc7e92242121c04a83e2d" +checksum = "4a39a20e17c24ede36b5bd5e7543a4cef8d8a0daf6e1a046dc31832b837a54a0" dependencies = [ - "ansi_term", "build-helper", "cargo_metadata", + "console", "filetime", "parity-wasm", "sp-maybe-compressed-blob", "strum 0.24.1", "tempfile", - "toml 0.7.8", + "toml 0.8.12", "walkdir", "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 = "1.0.0" @@ -10127,9 +9616,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -10236,7 +9725,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -10312,16 +9801,6 @@ dependencies = [ "crunchy", ] -[[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" @@ -10364,7 +9843,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -10415,14 +9894,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.22.12", ] [[package]] @@ -10436,26 +9915,37 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap 2.0.2", - "serde", - "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.18", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.0.2", "toml_datetime", - "winnow", + "winnow 0.5.18", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", ] [[package]] @@ -10464,6 +9954,10 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite 0.2.13", "tower-layer", "tower-service", "tracing", @@ -10519,7 +10013,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -10634,7 +10128,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.10", "thiserror", @@ -10691,25 +10185,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" -[[package]] -name = "turn" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" -dependencies = [ - "async-trait", - "base64 0.13.1", - "futures", - "log", - "md-5", - "rand 0.8.5", - "ring 0.16.20", - "stun", - "thiserror", - "tokio", - "webrtc-util", -] - [[package]] name = "twox-hash" version = "1.6.3" @@ -10718,7 +10193,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -10852,15 +10327,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" -dependencies = [ - "getrandom 0.2.10", -] - [[package]] name = "valuable" version = "0.1.0" @@ -10900,8 +10366,8 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_core 0.6.4", "sha2 0.10.8", "sha3", @@ -10909,15 +10375,6 @@ dependencies = [ "zeroize", ] -[[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.1" @@ -10976,7 +10433,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -11010,7 +10467,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11023,9 +10480,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-instrument" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" +checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc" dependencies = [ "parity-wasm", ] @@ -11270,7 +10727,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", @@ -11300,16 +10757,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - [[package]] name = "webpki" version = "0.22.4" @@ -11326,215 +10773,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.4", -] - -[[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 0.16.20", - "rtcp", - "rtp", - "rustls 0.19.1", - "sdp", - "serde", - "serde_json", - "sha2 0.10.8", - "stun", - "thiserror", - "time", - "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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" -dependencies = [ - "aes 0.6.0", - "aes-gcm 0.10.3", - "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", - "p256", - "p384", - "rand 0.8.5", - "rand_core 0.6.4", - "rcgen 0.10.0", - "ring 0.16.20", - "rustls 0.19.1", - "sec1 0.3.0", - "serde", - "sha1", - "sha2 0.10.8", - "signature 1.6.4", - "subtle 2.4.1", - "thiserror", - "tokio", - "webpki 0.21.4", - "webrtc-util", - "x25519-dalek 2.0.0", - "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 0.4.10", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-media" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991" -dependencies = [ - "byteorder", - "bytes", - "rand 0.8.5", - "rtp", - "thiserror", -] - -[[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 2.4.1", - "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 1.3.2", - "bytes", - "cc", - "ipnet", - "lazy_static", - "libc", - "log", - "nix", - "rand 0.8.5", - "thiserror", - "tokio", - "winapi", + "webpki", ] [[package]] @@ -11633,6 +10872,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -11663,6 +10911,22 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -11675,6 +10939,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -11687,6 +10957,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -11699,6 +10975,18 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -11711,6 +10999,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -11723,6 +11017,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -11735,6 +11035,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -11747,6 +11053,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winnow" version = "0.5.18" @@ -11756,6 +11068,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -11798,38 +11119,19 @@ dependencies = [ "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 0.13.1", - "data-encoding", - "der-parser 7.0.0", - "lazy_static", - "nom", - "oid-registry 0.4.0", - "ring 0.16.20", - "rusticata-macros", - "thiserror", - "time", -] - [[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", + "asn1-rs", "base64 0.13.1", "data-encoding", - "der-parser 8.2.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.6.1", + "oid-registry", "rusticata-macros", "thiserror", "time", @@ -11845,7 +11147,7 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -11875,7 +11177,7 @@ checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] @@ -11895,7 +11197,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.72", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b373f6ceea..93daf38624 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ repository = "https://github.com/paritytech/frontier/" [workspace.dependencies] async-trait = "0.1" bn = { package = "substrate-bn", version = "0.6", default-features = false } -clap = { version = "4.4.3", features = ["derive", "deprecated"] } +clap = { version = "4.5", features = ["derive", "deprecated"] } derive_more = "0.99" environmental = { version = "1.1.4", default-features = false } ethereum = { version = "0.14.0", default-features = false } @@ -57,7 +57,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] } hex-literal = "0.4.1" impl-serde = { version = "0.4.0", default-features = false } impl-trait-for-tuples = "0.2.1" -jsonrpsee = "0.16.3" +jsonrpsee = "0.20.3" kvdb-rocksdb = "0.19.0" libsecp256k1 = { version = "0.7.1", default-features = false } log = { version = "0.4.20", default-features = false } @@ -75,77 +75,77 @@ thiserror = "1.0" tokio = "1.32.0" # Substrate Client -sc-basic-authorship = "0.33.0" -sc-block-builder = "0.32.0" -sc-chain-spec = "26.0.0" -sc-cli = { version = "0.35.0", default-features = false } -sc-client-api = "27.0.0" -sc-client-db = { version = "0.34.0", default-features = false } -sc-consensus = "0.32.0" -sc-consensus-aura = "0.33.0" -sc-consensus-grandpa = "0.18.0" -sc-consensus-manual-seal = "0.34.0" -sc-executor = "0.31.0" -sc-keystore = "24.0.0" -sc-network = "0.33.0" -sc-network-common = "0.32.0" -sc-network-sync = "0.32.0" -sc-offchain = "28.0.0" -sc-rpc = "28.0.0" -sc-rpc-api = "0.32.0" -sc-service = { version = "0.34.0", default-features = false } -sc-telemetry = "14.0.0" -sc-transaction-pool = "27.0.0" -sc-transaction-pool-api = "27.0.0" -sc-utils = "13.0.0" +sc-basic-authorship = "0.35.0" +sc-block-builder = "0.34.0" +sc-chain-spec = "28.0.0" +sc-cli = { version = "0.37.0", default-features = false } +sc-client-api = "29.0.0" +sc-client-db = { version = "0.36.0", default-features = false } +sc-consensus = "0.34.0" +sc-consensus-aura = "0.35.0" +sc-consensus-grandpa = "0.20.0" +sc-consensus-manual-seal = "0.36.0" +sc-executor = "0.33.0" +sc-keystore = "26.0.0" +sc-network = "0.35.0" +sc-network-common = "0.34.0" +sc-network-sync = "0.34.0" +sc-offchain = "30.0.0" +sc-rpc = "30.0.0" +sc-rpc-api = "0.34.0" +sc-service = { version = "0.36.0", default-features = false } +sc-telemetry = "16.0.0" +sc-transaction-pool = "29.0.0" +sc-transaction-pool-api = "29.0.0" +sc-utils = "15.0.0" # Substrate Primitive -sp-api = { version = "25.0.0", default-features = false } -sp-block-builder = { version = "25.0.0", default-features = false } -sp-blockchain = "27.0.0" -sp-consensus = "0.31.0" -sp-consensus-aura = { version = "0.31.0", default-features = false } -sp-consensus-grandpa = { version = "12.0.0", default-features = false } -sp-core = { version = "27.0.0", default-features = false } -sp-core-hashing = { version = "14.0.0", default-features = false } -sp-core-hashing-proc-macro = { version = "14.0.0", default-features = false } -sp-database = "9.0.0" -sp-externalities = "0.24.0" -sp-inherents = { version = "25.0.0", default-features = false } -sp-io = { version = "29.0.0", default-features = false } -sp-keyring = "30.0.0" -sp-offchain = { version = "25.0.0", default-features = false } -sp-runtime = { version = "30.0.1", default-features = false } -sp-runtime-interface = { version = "23.0.0", default-features = false } -sp-session = { version = "26.0.0", default-features = false } -sp-state-machine = { version = "0.34.0", default-features = false } -sp-std = { version = "13.0.0", default-features = false } -sp-storage = { version = "18.0.0", default-features = false } -sp-timestamp = { version = "25.0.0", default-features = false } -sp-transaction-pool = { version = "25.0.0", default-features = false } -sp-version = { version = "28.0.0", default-features = false } +sp-api = { version = "27.0.1", default-features = false } +sp-block-builder = { version = "27.0.0", default-features = false } +sp-blockchain = "29.0.0" +sp-consensus = "0.33.0" +sp-consensus-aura = { version = "0.33.0", default-features = false } +sp-consensus-grandpa = { version = "14.0.0", default-features = false } +sp-core = { version = "29.0.0", default-features = false } +sp-core-hashing = { version = "16.0.0", default-features = false } +sp-core-hashing-proc-macro = { version = "16.0.0", default-features = false } +sp-database = "10.0.0" +sp-externalities = "0.26.0" +sp-inherents = { version = "27.0.0", default-features = false } +sp-io = { version = "31.0.0", default-features = false } +sp-keyring = "32.0.0" +sp-offchain = { version = "27.0.0", default-features = false } +sp-runtime = { version = "32.0.0", default-features = false } +sp-runtime-interface = { version = "25.0.0", default-features = false } +sp-session = { version = "28.0.0", default-features = false } +sp-state-machine = { version = "0.36.0", default-features = false } +sp-std = { version = "14.0.0", default-features = false } +sp-storage = { version = "20.0.0", default-features = false } +sp-timestamp = { version = "27.0.0", default-features = false } +sp-transaction-pool = { version = "27.0.0", default-features = false } +sp-version = { version = "30.0.0", default-features = false } # Substrate FRAME -frame-benchmarking = { version = "27.0.0", default-features = false } -frame-executive = { version = "27.0.0", default-features = false } -frame-support = { version = "27.0.0", default-features = false } -frame-system = { version = "27.0.0", default-features = false } -frame-system-benchmarking = { version = "27.0.0", default-features = false } -frame-system-rpc-runtime-api = { version = "25.0.0", default-features = false } -pallet-aura = { version = "26.0.0", default-features = false } -pallet-balances = { version = "27.0.0", default-features = false } -pallet-grandpa = { version = "27.0.0", default-features = false } -pallet-sudo = { version = "27.0.0", default-features = false } -pallet-timestamp = { version = "26.0.0", default-features = false } -pallet-transaction-payment = { version = "27.0.0", default-features = false } -pallet-transaction-payment-rpc = "29.0.0" -pallet-transaction-payment-rpc-runtime-api = { version = "27.0.0", default-features = false } -pallet-utility = { version = "27.0.0", default-features = false } +frame-benchmarking = { version = "29.0.0", default-features = false } +frame-executive = { version = "29.0.0", default-features = false } +frame-support = { version = "29.0.2", default-features = false } +frame-system = { version = "29.0.0", default-features = false } +frame-system-benchmarking = { version = "29.0.0", default-features = false } +frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false } +pallet-aura = { version = "28.0.0", default-features = false } +pallet-balances = { version = "29.0.2", default-features = false } +pallet-grandpa = { version = "29.0.0", default-features = false } +pallet-sudo = { version = "29.0.0", default-features = false } +pallet-timestamp = { version = "28.0.0", default-features = false } +pallet-transaction-payment = { version = "29.0.2", default-features = false } +pallet-transaction-payment-rpc = "31.0.0" +pallet-transaction-payment-rpc-runtime-api = { version = "29.0.0", default-features = false } +pallet-utility = { version = "29.0.0", default-features = false } # Substrate Utility -frame-benchmarking-cli = "31.0.0" -prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.16.0" } -substrate-build-script-utils = "10.0.0" -substrate-frame-rpc-system = "27.0.0" +frame-benchmarking-cli = "33.0.0" +prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.17.0" } +substrate-build-script-utils = "11.0.0" +substrate-frame-rpc-system = "29.0.0" #substrate-test-runtime-client = "0.1.0" -substrate-wasm-builder = "16.0.0" +substrate-wasm-builder = "18.0.1" # Frontier Client fc-api = { version = "1.0.0-dev", path = "client/api" } @@ -251,11 +251,12 @@ pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github. pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } pallet-utility = { version = "4.0.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } -substrate-prometheus-endpoint = { version = "0.10.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } +substrate-prometheus-endpoint = { version = "0.16.0" } substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } #substrate-test-runtime-client = { version = "2.0.0", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.2.0" } +sp-externalities = { version = "0.24.0" } [profile.release] # Substrate runtime requires unwinding. diff --git a/client/rpc-core/Cargo.toml b/client/rpc-core/Cargo.toml index aeafd4acaa..44fb704e6a 100644 --- a/client/rpc-core/Cargo.toml +++ b/client/rpc-core/Cargo.toml @@ -14,9 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"] ethereum = { workspace = true, features = ["with-codec", "with-serde"] } ethereum-types = { workspace = true } jsonrpsee = { workspace = true, features = ["server", "macros"] } +rlp = { workspace = true } rustc-hex = "2.1.0" serde = { workspace = true } serde_json = { workspace = true } +# Substrate +sp-core-hashing = { workspace = true, features = ["default"] } + [features] txpool = [] diff --git a/client/rpc-core/src/types/block.rs b/client/rpc-core/src/types/block.rs index 1ce10681c8..8e30b111b5 100644 --- a/client/rpc-core/src/types/block.rs +++ b/client/rpc-core/src/types/block.rs @@ -24,7 +24,7 @@ use serde::{ser::Error, Serialize, Serializer}; use crate::types::{Bytes, Transaction}; /// Block Transactions -#[derive(Debug)] +#[derive(Clone, Debug)] pub enum BlockTransactions { /// Only hashes Hashes(Vec), @@ -45,7 +45,7 @@ impl Serialize for BlockTransactions { } /// Block representation -#[derive(Debug, Serialize)] +#[derive(Clone, Debug, Serialize)] #[serde(rename_all = "camelCase")] pub struct Block { /// Header of the block diff --git a/client/rpc-core/src/types/fee.rs b/client/rpc-core/src/types/fee.rs index db2edc6890..633e939d25 100644 --- a/client/rpc-core/src/types/fee.rs +++ b/client/rpc-core/src/types/fee.rs @@ -25,7 +25,7 @@ use ethereum_types::U256; use serde::Serialize; /// `eth_feeHistory` response -#[derive(Debug, Serialize)] +#[derive(Clone, Debug, Serialize)] #[serde(rename_all = "camelCase")] pub struct FeeHistory { /// Lowest number block of the returned range. diff --git a/client/rpc-core/src/types/filter.rs b/client/rpc-core/src/types/filter.rs index eec92361df..91fb42b09c 100644 --- a/client/rpc-core/src/types/filter.rs +++ b/client/rpc-core/src/types/filter.rs @@ -173,7 +173,7 @@ impl FilteredParams { } /// Build an address-based BloomFilter. - pub fn adresses_bloom_filter(address: &Option) -> BloomFilter<'_> { + pub fn address_bloom_filter(address: &Option) -> BloomFilter<'_> { if let Some(address) = address { return address.into(); } @@ -301,7 +301,7 @@ impl FilteredParams { } /// Replace None values - aka wildcards - for the log input value in that position. - pub fn replace(&self, log: &Log, topic: FlatTopic) -> Option> { + pub fn replace(&self, topics: &[H256], topic: FlatTopic) -> Option> { let mut out: Vec = Vec::new(); match topic { VariadicValue::Single(Some(value)) => { @@ -312,7 +312,7 @@ impl FilteredParams { if let Some(v) = v { out.push(v); } else { - out.push(log.topics[k]); + out.push(topics[k]); } } } @@ -324,6 +324,26 @@ impl FilteredParams { Some(out) } + pub fn is_not_filtered( + &self, + block_number: U256, + block_hash: H256, + address: &H160, + topics: &[H256], + ) -> bool { + if self.filter.is_some() { + let block_number = block_number.as_u64(); + if !self.filter_block_range(block_number) + || !self.filter_block_hash(block_hash) + || !self.filter_address(address) + || !self.filter_topics(topics) + { + return false; + } + } + true + } + pub fn filter_block_range(&self, block_number: u64) -> bool { let mut out = true; let filter = self.filter.clone().unwrap(); @@ -357,16 +377,16 @@ impl FilteredParams { true } - pub fn filter_address(&self, log: &Log) -> bool { + pub fn filter_address(&self, address: &H160) -> bool { if let Some(input_address) = &self.filter.clone().unwrap().address { match input_address { VariadicValue::Single(x) => { - if log.address != *x { + if address != x { return false; } } VariadicValue::Multiple(x) => { - if !x.contains(&log.address) { + if !x.contains(address) { return false; } } @@ -378,13 +398,13 @@ impl FilteredParams { true } - pub fn filter_topics(&self, log: &Log) -> bool { + pub fn filter_topics(&self, topics: &[H256]) -> bool { let mut out: bool = true; for topic in self.flat_topics.clone() { match topic { VariadicValue::Single(single) => { if let Some(single) = single { - if !log.topics.starts_with(&[single]) { + if !topics.starts_with(&[single]) { out = false; } } @@ -401,15 +421,15 @@ impl FilteredParams { new_multi.pop(); } // We can discard right away any logs with lesser topics than the filter. - if new_multi.len() > log.topics.len() { + if new_multi.len() > topics.len() { out = false; break; } let replaced: Option> = - self.replace(log, VariadicValue::Multiple(new_multi)); + self.replace(topics, VariadicValue::Multiple(new_multi)); if let Some(replaced) = replaced { out = false; - if log.topics.starts_with(&replaced[..]) { + if topics.starts_with(&replaced[..]) { out = true; break; } @@ -425,7 +445,7 @@ impl FilteredParams { } /// Results of the filter_changes RPC. -#[derive(Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum FilterChanges { /// New logs. Logs(Vec), @@ -497,7 +517,7 @@ mod tests { address: Some(VariadicValue::Single(test_address)), topics: None, }; - let address_bloom = FilteredParams::adresses_bloom_filter(&filter.address); + let address_bloom = FilteredParams::address_bloom_filter(&filter.address); assert!(FilteredParams::address_in_bloom( block_bloom(), &address_bloom @@ -514,7 +534,7 @@ mod tests { address: Some(VariadicValue::Single(test_address)), topics: None, }; - let address_bloom = FilteredParams::adresses_bloom_filter(&filter.address); + let address_bloom = FilteredParams::address_bloom_filter(&filter.address); assert!(!FilteredParams::address_in_bloom( block_bloom(), &address_bloom @@ -635,7 +655,7 @@ mod tests { } else { None }; - let address_bloom = FilteredParams::adresses_bloom_filter(&filter.address); + let address_bloom = FilteredParams::address_bloom_filter(&filter.address); let topics_bloom = FilteredParams::topics_bloom_filter(&topics_input); let matches = FilteredParams::address_in_bloom(block_bloom(), &address_bloom) && FilteredParams::topics_in_bloom(block_bloom(), &topics_bloom); @@ -669,7 +689,7 @@ mod tests { } else { None }; - let address_bloom = FilteredParams::adresses_bloom_filter(&filter.address); + let address_bloom = FilteredParams::address_bloom_filter(&filter.address); let topics_bloom = FilteredParams::topics_bloom_filter(&topics_input); let matches = FilteredParams::address_in_bloom(block_bloom(), &address_bloom) && FilteredParams::topics_in_bloom(block_bloom(), &topics_bloom); diff --git a/client/rpc-core/src/types/pubsub.rs b/client/rpc-core/src/types/pubsub.rs index b19590cc89..b8196381db 100644 --- a/client/rpc-core/src/types/pubsub.rs +++ b/client/rpc-core/src/types/pubsub.rs @@ -18,55 +18,18 @@ //! Pub-Sub types. -use ethereum_types::H256; +use std::collections::BTreeMap; + +use ethereum::{ + BlockV2 as EthereumBlock, ReceiptV3 as EthereumReceipt, TransactionV2 as EthereumTransaction, +}; +use ethereum_types::{H256, U256}; use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer}; use serde_json::{from_value, Value}; +// Substrate +use sp_core_hashing::keccak_256; -use crate::types::{Filter, Log, RichHeader}; - -/// Subscription result. -#[derive(Clone, Debug, Eq, PartialEq)] -pub enum Result { - /// New block header. - Header(Box), - /// Log - Log(Box), - /// Transaction hash - TransactionHash(H256), - /// SyncStatus - SyncState(PubSubSyncStatus), -} -#[derive(Clone, Debug, Eq, PartialEq, Serialize)] -#[serde(untagged)] -pub enum PubSubSyncStatus { - Simple(bool), - Detailed(SyncStatusMetadata), -} - -/// PubSbub sync status -#[derive(Clone, Debug, Eq, PartialEq, Serialize)] -#[serde(rename_all = "camelCase")] -pub struct SyncStatusMetadata { - pub syncing: bool, - pub starting_block: u64, - pub current_block: u64, - #[serde(default = "Default::default", skip_serializing_if = "Option::is_none")] - pub highest_block: Option, -} - -impl Serialize for Result { - fn serialize(&self, serializer: S) -> ::std::result::Result - where - S: Serializer, - { - match *self { - Result::Header(ref header) => header.serialize(serializer), - Result::Log(ref log) => log.serialize(serializer), - Result::TransactionHash(ref hash) => hash.serialize(serializer), - Result::SyncState(ref sync) => sync.serialize(serializer), - } - } -} +use crate::types::{Bytes, Filter, FilteredParams, Header, Log, Rich, RichHeader}; /// Subscription kind. #[derive(Clone, Debug, Eq, PartialEq, Hash, Deserialize)] @@ -94,7 +57,7 @@ pub enum Params { } impl<'a> Deserialize<'a> for Params { - fn deserialize(deserializer: D) -> ::std::result::Result + fn deserialize(deserializer: D) -> Result where D: Deserializer<'a>, { @@ -109,3 +72,124 @@ impl<'a> Deserialize<'a> for Params { .map_err(|e| D::Error::custom(format!("Invalid Pub-Sub parameters: {}", e))) } } + +/// Subscription result. +#[derive(Clone, Debug, Eq, PartialEq)] +pub enum PubSubResult { + /// New block header. + Header(Box), + /// Log + Log(Box), + /// Transaction hash + TransactionHash(H256), + /// SyncStatus + SyncingStatus(PubSubSyncing), +} + +impl PubSubResult { + pub fn header(block: EthereumBlock) -> Self { + Self::Header(Box::new(Rich { + inner: Header { + hash: Some(H256::from(keccak_256(&rlp::encode(&block.header)))), + parent_hash: block.header.parent_hash, + uncles_hash: block.header.ommers_hash, + author: block.header.beneficiary, + miner: Some(block.header.beneficiary), + state_root: block.header.state_root, + transactions_root: block.header.transactions_root, + receipts_root: block.header.receipts_root, + number: Some(block.header.number), + gas_used: block.header.gas_used, + gas_limit: block.header.gas_limit, + extra_data: Bytes(block.header.extra_data.clone()), + logs_bloom: block.header.logs_bloom, + timestamp: U256::from(block.header.timestamp), + difficulty: block.header.difficulty, + nonce: Some(block.header.nonce), + size: Some(U256::from(rlp::encode(&block.header).len() as u32)), + }, + extra_info: BTreeMap::new(), + })) + } + + pub fn logs( + block: EthereumBlock, + receipts: Vec, + params: &FilteredParams, + ) -> impl Iterator { + let block_number = block.header.number; + let block_hash = block.header.hash(); + + let mut logs: Vec = vec![]; + let mut log_index: u32 = 0; + for (receipt_index, receipt) in receipts.into_iter().enumerate() { + let receipt_logs = match receipt { + EthereumReceipt::Legacy(d) + | EthereumReceipt::EIP2930(d) + | EthereumReceipt::EIP1559(d) => d.logs, + }; + + let transaction_hash: Option = if !receipt_logs.is_empty() { + Some(block.transactions[receipt_index].hash()) + } else { + None + }; + + let mut transaction_log_index = 0; + for log in receipt_logs { + if params.is_not_filtered(block_number, block_hash, &log.address, &log.topics) { + logs.push(Log { + address: log.address, + topics: log.topics, + data: Bytes(log.data), + block_hash: Some(block_hash), + block_number: Some(block_number), + transaction_hash, + transaction_index: Some(U256::from(receipt_index)), + log_index: Some(U256::from(log_index)), + transaction_log_index: Some(U256::from(transaction_log_index)), + removed: false, + }); + } + transaction_log_index += 1; + log_index += 1; + } + } + logs.into_iter().map(|log| Self::Log(Box::new(log))) + } + + pub fn transaction_hash(tx: &EthereumTransaction) -> Self { + Self::TransactionHash(tx.hash()) + } +} + +impl Serialize for PubSubResult { + fn serialize(&self, serializer: S) -> Result + where + S: Serializer, + { + match *self { + Self::Header(ref header) => header.serialize(serializer), + Self::Log(ref log) => log.serialize(serializer), + Self::TransactionHash(ref hash) => hash.serialize(serializer), + Self::SyncingStatus(ref sync) => sync.serialize(serializer), + } + } +} + +#[derive(Clone, Debug, Eq, PartialEq, Serialize)] +#[serde(untagged)] +pub enum PubSubSyncing { + Synced(bool), + Syncing(SyncingStatus), +} + +/// Pubsub sync status +#[derive(Clone, Debug, Eq, PartialEq, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct SyncingStatus { + pub starting_block: u64, + pub current_block: u64, + #[serde(default = "Default::default", skip_serializing_if = "Option::is_none")] + pub highest_block: Option, +} diff --git a/client/rpc-core/src/types/sync.rs b/client/rpc-core/src/types/sync.rs index 908322899a..2b119736bd 100644 --- a/client/rpc-core/src/types/sync.rs +++ b/client/rpc-core/src/types/sync.rs @@ -22,7 +22,7 @@ use ethereum_types::{H512, U256}; use serde::{Serialize, Serializer}; /// Sync info -#[derive(Debug, Eq, PartialEq, Default, Serialize)] +#[derive(Clone, Debug, Eq, PartialEq, Default, Serialize)] #[serde(rename_all = "camelCase")] pub struct SyncInfo { /// Starting block @@ -50,7 +50,7 @@ pub struct Peers { pub peers: Vec, } -#[derive(Debug, Serialize)] +#[derive(Clone, Debug, Serialize)] #[serde(untagged)] pub enum PeerCount { U32(u32), @@ -114,7 +114,7 @@ pub struct PipProtocolInfo { } /// Sync status -#[derive(Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] pub enum SyncStatus { /// Info when syncing Info(SyncInfo), diff --git a/client/rpc-core/src/types/txpool.rs b/client/rpc-core/src/types/txpool.rs index 5fd9bcb31a..89d2859895 100644 --- a/client/rpc-core/src/types/txpool.rs +++ b/client/rpc-core/src/types/txpool.rs @@ -30,7 +30,7 @@ pub trait Get { fn get(hash: H256, from_address: H160, txn: &EthereumTransaction) -> Self; } -#[derive(Debug, Serialize)] +#[derive(Clone, Debug, Serialize)] pub struct TxPoolResult { pub pending: T, pub queued: T, diff --git a/client/rpc-core/src/types/work.rs b/client/rpc-core/src/types/work.rs index 88af66691e..6ee0f541a0 100644 --- a/client/rpc-core/src/types/work.rs +++ b/client/rpc-core/src/types/work.rs @@ -21,7 +21,7 @@ use serde::{Serialize, Serializer}; /// The result of an `eth_getWork` call: it differs based on an option /// whether to send the block number. -#[derive(Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct Work { /// The proof-of-work hash. pub pow_hash: H256, diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 9d7c46d8a2..31c64882e4 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -32,7 +32,6 @@ tokio = { workspace = true, features = ["sync"] } prometheus-endpoint = { workspace = true } sc-client-api = { workspace = true } sc-consensus-aura = { workspace = true } -sp-externalities = { workspace = true } sc-network = { workspace = true } sc-network-common = { workspace = true } sc-network-sync = { workspace = true } @@ -47,6 +46,7 @@ sp-blockchain = { workspace = true } sp-consensus = { workspace = true } sp-consensus-aura = { workspace = true, features = ["default"] } sp-core = { workspace = true, features = ["default"] } +sp-externalities = { workspace = true, features = ["default"] } sp-inherents = { workspace = true, features = ["default"] } sp-io = { workspace = true, features = ["default"] } sp-runtime = { workspace = true, features = ["default"] } diff --git a/client/rpc/src/eth/filter.rs b/client/rpc/src/eth/filter.rs index b0a34465ec..fc58574e9d 100644 --- a/client/rpc/src/eth/filter.rs +++ b/client/rpc/src/eth/filter.rs @@ -188,7 +188,7 @@ where from_number: NumberFor, current_number: NumberFor, }, - Error(jsonrpsee::core::Error), + Error(jsonrpsee::types::ErrorObjectOwned), } let key = U256::from(index.value()); @@ -712,7 +712,7 @@ where } else { None }; - let address_bloom_filter = FilteredParams::adresses_bloom_filter(&filter.address); + let address_bloom_filter = FilteredParams::address_bloom_filter(&filter.address); let topics_bloom_filter = FilteredParams::topics_bloom_filter(&topics_input); while current_number <= to { @@ -787,17 +787,17 @@ fn filter_block_logs<'a>( let mut add: bool = true; match (filter.address.clone(), filter.topics.clone()) { (Some(_), Some(_)) => { - if !params.filter_address(&log) || !params.filter_topics(&log) { + if !params.filter_address(&log.address) || !params.filter_topics(&log.topics) { add = false; } } (Some(_), _) => { - if !params.filter_address(&log) { + if !params.filter_address(&log.address) { add = false; } } (_, Some(_)) => { - if !params.filter_topics(&log) { + if !params.filter_topics(&log.topics) { add = false; } } diff --git a/client/rpc/src/eth/submit.rs b/client/rpc/src/eth/submit.rs index c10fe9c2a7..4c8e1ccbbe 100644 --- a/client/rpc/src/eth/submit.rs +++ b/client/rpc/src/eth/submit.rs @@ -61,7 +61,7 @@ where Err(e) => return Err(e), }; - match accounts.get(0) { + match accounts.first() { Some(account) => *account, None => return Err(internal_err("no signer available")), } diff --git a/client/rpc/src/eth_pubsub.rs b/client/rpc/src/eth_pubsub.rs index 9466983b95..10de5c8214 100644 --- a/client/rpc/src/eth_pubsub.rs +++ b/client/rpc/src/eth_pubsub.rs @@ -16,31 +16,29 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use std::{collections::BTreeMap, marker::PhantomData, sync::Arc}; +use std::{marker::PhantomData, sync::Arc}; -use ethereum::{BlockV2 as EthereumBlock, TransactionV2 as EthereumTransaction}; -use ethereum_types::{H256, U256}; -use futures::{FutureExt as _, StreamExt as _}; -use jsonrpsee::{types::SubscriptionResult, SubscriptionSink}; +use ethereum::TransactionV2 as EthereumTransaction; +use futures::{future, FutureExt as _, StreamExt as _}; +use jsonrpsee::{core::traits::IdProvider, server::PendingSubscriptionSink}; // Substrate use sc_client_api::{ backend::{Backend, StorageProvider}, client::BlockchainEvents, }; use sc_network_sync::SyncingService; -use sc_rpc::SubscriptionTaskExecutor; -use sc_transaction_pool_api::TransactionPool; +use sc_rpc::{utils::{pipe_from_stream, to_sub_message}, SubscriptionTaskExecutor}; +use sc_transaction_pool_api::{InPoolTransaction, TransactionPool, TxHash}; use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_consensus::SyncOracle; -use sp_core::hashing::keccak_256; use sp_runtime::traits::{Block as BlockT, UniqueSaturatedInto}; // Frontier use fc_mapping_sync::{EthereumBlockNotification, EthereumBlockNotificationSinks}; use fc_rpc_core::{ types::{ - pubsub::{Kind, Params, PubSubSyncStatus, Result as PubSubResult, SyncStatusMetadata}, - Bytes, FilteredParams, Header, Log, Rich, + pubsub::{Kind, Params, PubSubResult, PubSubSyncing, SyncingStatus}, + FilteredParams, }, EthPubSubApiServer, }; @@ -50,7 +48,7 @@ use fp_rpc::EthereumRuntimeRPCApi; #[derive(Debug)] pub struct EthereumSubIdProvider; -impl jsonrpsee::core::traits::IdProvider for EthereumSubIdProvider { +impl IdProvider for EthereumSubIdProvider { fn next_id(&self) -> jsonrpsee::types::SubscriptionId<'static> { format!("0x{}", hex::encode(rand::random::().to_le_bytes())).into() } @@ -61,22 +59,40 @@ pub struct EthPubSub { pool: Arc

, client: Arc, sync: Arc>, - subscriptions: SubscriptionTaskExecutor, + executor: SubscriptionTaskExecutor, overrides: Arc>, starting_block: u64, pubsub_notification_sinks: Arc>>, _marker: PhantomData, } +impl Clone for EthPubSub { + fn clone(&self) -> Self { + Self { + pool: self.pool.clone(), + client: self.client.clone(), + sync: self.sync.clone(), + executor: self.executor.clone(), + overrides: self.overrides.clone(), + starting_block: self.starting_block, + pubsub_notification_sinks: self.pubsub_notification_sinks.clone(), + _marker: PhantomData::, + } + } +} impl EthPubSub where - C: HeaderBackend, + P: TransactionPool + 'static, + C: ProvideRuntimeApi, + C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + StorageProvider, + BE: Backend + 'static, { pub fn new( pool: Arc

, client: Arc, sync: Arc>, - subscriptions: SubscriptionTaskExecutor, + executor: SubscriptionTaskExecutor, overrides: Arc>, pubsub_notification_sinks: Arc< EthereumBlockNotificationSinks>, @@ -89,112 +105,119 @@ where pool, client, sync, - subscriptions, + executor, overrides, starting_block, pubsub_notification_sinks, _marker: PhantomData, } } -} -struct EthSubscriptionResult; -impl EthSubscriptionResult { - pub fn new_heads(block: EthereumBlock) -> PubSubResult { - PubSubResult::Header(Box::new(Rich { - inner: Header { - hash: Some(H256::from(keccak_256(&rlp::encode(&block.header)))), - parent_hash: block.header.parent_hash, - uncles_hash: block.header.ommers_hash, - author: block.header.beneficiary, - miner: Some(block.header.beneficiary), - state_root: block.header.state_root, - transactions_root: block.header.transactions_root, - receipts_root: block.header.receipts_root, - number: Some(block.header.number), - gas_used: block.header.gas_used, - gas_limit: block.header.gas_limit, - extra_data: Bytes(block.header.extra_data.clone()), - logs_bloom: block.header.logs_bloom, - timestamp: U256::from(block.header.timestamp), - difficulty: block.header.difficulty, - nonce: Some(block.header.nonce), - size: Some(U256::from(rlp::encode(&block.header).len() as u32)), - }, - extra_info: BTreeMap::new(), - })) + fn notify_header( + &self, + notification: EthereumBlockNotification, + ) -> future::Ready> { + let res = if notification.is_new_best { + let schema = fc_storage::onchain_storage_schema(&*self.client, notification.hash); + let handler = self + .overrides + .schemas + .get(&schema) + .unwrap_or(&self.overrides.fallback); + handler.current_block(notification.hash) + } else { + None + }; + future::ready(res.map(PubSubResult::header)) } - pub fn logs( - block: EthereumBlock, - receipts: Vec, + + fn notify_logs( + &self, + notification: EthereumBlockNotification, params: &FilteredParams, - ) -> Vec { - let block_hash = Some(H256::from(keccak_256(&rlp::encode(&block.header)))); - let mut logs: Vec = vec![]; - let mut log_index: u32 = 0; - for (receipt_index, receipt) in receipts.into_iter().enumerate() { - let receipt_logs = match receipt { - ethereum::ReceiptV3::Legacy(d) - | ethereum::ReceiptV3::EIP2930(d) - | ethereum::ReceiptV3::EIP1559(d) => d.logs, + ) -> future::Ready>> { + let res = if notification.is_new_best { + let substrate_hash = notification.hash; + + let schema = fc_storage::onchain_storage_schema(&*self.client, substrate_hash); + let handler = self + .overrides + .schemas + .get(&schema) + .unwrap_or(&self.overrides.fallback); + + let block = handler.current_block(substrate_hash); + let receipts = handler.current_receipts(substrate_hash); + + match (block, receipts) { + (Some(block), Some(receipts)) => Some((block, receipts)), + _ => None, + } + } else { + None + }; + future::ready(res.map(|(block, receipts)| PubSubResult::logs(block, receipts, params))) + } + + fn pending_transaction(&self, hash: &TxHash

) -> future::Ready> { + let res = if let Some(xt) = self.pool.ready_transaction(hash) { + let best_block = self.client.info().best_hash; + + let api = self.client.runtime_api(); + + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(best_block) + { + api_version + } else { + return future::ready(None); }; - let mut transaction_log_index: u32 = 0; - let transaction_hash: Option = if receipt_logs.len() > 0 { - Some(block.transactions[receipt_index].hash()) + + let xts = vec![xt.data().clone()]; + + let txs: Option> = if api_version > 1 { + api.extrinsic_filter(best_block, xts).ok() } else { - None + #[allow(deprecated)] + if let Ok(legacy) = api.extrinsic_filter_before_version_2(best_block, xts) { + Some(legacy.into_iter().map(|tx| tx.into()).collect()) + } else { + None + } }; - for log in receipt_logs { - if Self::add_log(block_hash.unwrap(), &log, &block, params) { - logs.push(Log { - address: log.address, - topics: log.topics, - data: Bytes(log.data), - block_hash, - block_number: Some(block.header.number), - transaction_hash, - transaction_index: Some(U256::from(receipt_index)), - log_index: Some(U256::from(log_index)), - transaction_log_index: Some(U256::from(transaction_log_index)), - removed: false, - }); + + match txs { + Some(txs) => { + if txs.len() == 1 { + Some(txs[0].clone()) + } else { + None + } } - log_index += 1; - transaction_log_index += 1; + _ => None, } - } - logs - } - fn add_log( - block_hash: H256, - ethereum_log: ðereum::Log, - block: &EthereumBlock, - params: &FilteredParams, - ) -> bool { - let log = Log { - address: ethereum_log.address, - topics: ethereum_log.topics.clone(), - data: Bytes(ethereum_log.data.clone()), - block_hash: None, - block_number: None, - transaction_hash: None, - transaction_index: None, - log_index: None, - transaction_log_index: None, - removed: false, + } else { + None }; - if params.filter.is_some() { - let block_number = - UniqueSaturatedInto::::unique_saturated_into(block.header.number); - if !params.filter_block_range(block_number) - || !params.filter_block_hash(block_hash) - || !params.filter_address(&log) - || !params.filter_topics(&log) - { - return false; - } + future::ready(res.map(|tx| PubSubResult::transaction_hash(&tx))) + } + + async fn syncing_status(&self) -> PubSubSyncing { + if self.sync.is_major_syncing() { + // Best imported block. + let current_number = self.client.info().best_number; + // Get the target block to sync. + let highest_number = self.sync.best_seen_block().await.ok().flatten(); + + PubSubSyncing::Syncing(SyncingStatus { + starting_block: self.starting_block, + current_block: UniqueSaturatedInto::::unique_saturated_into(current_number), + highest_block: highest_number + .map(UniqueSaturatedInto::::unique_saturated_into), + }) + } else { + PubSubSyncing::Synced(false) } - true } } @@ -208,198 +231,64 @@ where C: HeaderBackend + StorageProvider, BE: Backend + 'static, { - fn subscribe( - &self, - mut sink: SubscriptionSink, - kind: Kind, - params: Option, - ) -> SubscriptionResult { - sink.accept()?; - + fn subscribe(&self, pending: PendingSubscriptionSink, kind: Kind, params: Option) { let filtered_params = match params { Some(Params::Logs(filter)) => FilteredParams::new(Some(filter)), _ => FilteredParams::default(), }; - let client = self.client.clone(); + let pubsub = self.clone(); // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. let (inner_sink, block_notification_stream) = sc_utils::mpsc::tracing_unbounded("pubsub_notification_stream", 100_000); self.pubsub_notification_sinks.lock().push(inner_sink); - let pool = self.pool.clone(); - let sync = self.sync.clone(); - let overrides = self.overrides.clone(); - let starting_block = self.starting_block; + let fut = async move { match kind { - Kind::Logs => { + Kind::NewHeads => { let stream = block_notification_stream - .filter_map(move |notification| { - if notification.is_new_best { - let substrate_hash = notification.hash; - - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - substrate_hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(substrate_hash); - let receipts = handler.current_receipts(substrate_hash); - - match (receipts, block) { - (Some(receipts), Some(block)) => { - futures::future::ready(Some((block, receipts))) - } - _ => futures::future::ready(None), - } - } else { - futures::future::ready(None) - } - }) - .flat_map(move |(block, receipts)| { - futures::stream::iter(EthSubscriptionResult::logs( - block, - receipts, - &filtered_params, - )) - }) - .map(|x| PubSubResult::Log(Box::new(x))); - sink.pipe_from_stream(stream).await; + .filter_map(move |notification| pubsub.notify_header(notification)); + pipe_from_stream(pending, stream).await } - Kind::NewHeads => { + Kind::Logs => { let stream = block_notification_stream .filter_map(move |notification| { - if notification.is_new_best { - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - notification.hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(notification.hash); - futures::future::ready(block) - } else { - futures::future::ready(None) - } + pubsub.notify_logs(notification, &filtered_params) }) - .map(EthSubscriptionResult::new_heads); - sink.pipe_from_stream(stream).await; + .flat_map(futures::stream::iter); + pipe_from_stream(pending, stream).await } Kind::NewPendingTransactions => { - use sc_transaction_pool_api::InPoolTransaction; - + let pool = pubsub.pool.clone(); let stream = pool .import_notification_stream() - .filter_map(move |txhash| { - if let Some(xt) = pool.ready_transaction(&txhash) { - let best_block = client.info().best_hash; - - let api = client.runtime_api(); - - let api_version = if let Ok(Some(api_version)) = - api.api_version::>(best_block) - { - api_version - } else { - return futures::future::ready(None); - }; - - let xts = vec![xt.data().clone()]; - - let txs: Option> = if api_version > 1 { - api.extrinsic_filter(best_block, xts).ok() - } else { - #[allow(deprecated)] - if let Ok(legacy) = - api.extrinsic_filter_before_version_2(best_block, xts) - { - Some(legacy.into_iter().map(|tx| tx.into()).collect()) - } else { - None - } - }; - - let res = match txs { - Some(txs) => { - if txs.len() == 1 { - Some(txs[0].clone()) - } else { - None - } - } - _ => None, - }; - futures::future::ready(res) - } else { - futures::future::ready(None) - } - }) - .map(|transaction| PubSubResult::TransactionHash(transaction.hash())); - sink.pipe_from_stream(stream).await; + .filter_map(move |hash| pubsub.pending_transaction(&hash)); + pipe_from_stream(pending, stream).await; } Kind::Syncing => { - let client = Arc::clone(&client); - let sync = Arc::clone(&sync); - // Gets the node syncing status. - // The response is expected to be serialized either as a plain boolean - // if the node is not syncing, or a structure containing syncing metadata - // in case it is. - async fn status, B: BlockT>( - client: Arc, - sync: Arc>, - starting_block: u64, - ) -> PubSubSyncStatus { - if sync.is_major_syncing() { - // Get the target block to sync. - // This value is only exposed through substrate async Api - // in the `NetworkService`. - let highest_block = sync - .status() - .await - .ok() - .and_then(|res| res.best_seen_block) - .map(UniqueSaturatedInto::::unique_saturated_into); - // Best imported block. - let current_block = UniqueSaturatedInto::::unique_saturated_into( - client.info().best_number, - ); - - PubSubSyncStatus::Detailed(SyncStatusMetadata { - syncing: true, - starting_block, - current_block, - highest_block, - }) - } else { - PubSubSyncStatus::Simple(false) - } - } + let Ok(sink) = pending.accept().await else { + return; + }; // On connection subscriber expects a value. // Because import notifications are only emitted when the node is synced or // in case of reorg, the first event is emitted right away. - let _ = sink.send(&PubSubResult::SyncState( - status(Arc::clone(&client), Arc::clone(&sync), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; // When the node is not under a major syncing (i.e. from genesis), react // normally to import notifications. // // Only send new notifications down the pipe when the syncing status changed. - let mut stream = client.clone().import_notification_stream(); - let mut last_syncing_status = sync.is_major_syncing(); + let mut stream = pubsub.client.import_notification_stream(); + let mut last_syncing_status = pubsub.sync.is_major_syncing(); while (stream.next().await).is_some() { - let syncing_status = sync.is_major_syncing(); + let syncing_status = pubsub.sync.is_major_syncing(); if syncing_status != last_syncing_status { - let _ = sink.send(&PubSubResult::SyncState( - status(client.clone(), sync.clone(), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = + to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; } last_syncing_status = syncing_status; } @@ -407,11 +296,8 @@ where } } .boxed(); - self.subscriptions.spawn( - "frontier-rpc-subscription", - Some("rpc"), - fut.map(drop).boxed(), - ); - Ok(()) + + self.executor + .spawn("frontier-rpc-subscription", Some("rpc"), fut); } } diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs index 2a217a41b5..6b41e11827 100644 --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -285,24 +285,26 @@ pub mod frontier_backend_client { } } -pub fn err(code: i32, message: T, data: Option<&[u8]>) -> jsonrpsee::core::Error { - jsonrpsee::core::Error::Call(jsonrpsee::types::error::CallError::Custom( - jsonrpsee::types::error::ErrorObject::owned( - code, - message.to_string(), - data.map(|bytes| { - jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) - .expect("fail to serialize data") - }), - ), - )) +pub fn err( + code: i32, + message: T, + data: Option<&[u8]>, +) -> jsonrpsee::types::error::ErrorObjectOwned { + jsonrpsee::types::error::ErrorObject::owned( + code, + message.to_string(), + data.map(|bytes| { + jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) + .expect("fail to serialize data") + }), + ) } -pub fn internal_err(message: T) -> jsonrpsee::core::Error { +pub fn internal_err(message: T) -> jsonrpsee::types::error::ErrorObjectOwned { err(jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, None) } -pub fn internal_err_with_data(message: T, data: &[u8]) -> jsonrpsee::core::Error { +pub fn internal_err_with_data(message: T, data: &[u8]) -> jsonrpsee::types::error::ErrorObjectOwned { err( jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, @@ -341,7 +343,7 @@ mod tests { use std::{path::PathBuf, sync::Arc}; use futures::executor; - use sc_block_builder::BlockBuilderProvider; + use sc_block_builder::BlockBuilderBuilder; use sp_blockchain::HeaderBackend; use sp_consensus::BlockOrigin; use sp_runtime::{ diff --git a/client/rpc/src/signer.rs b/client/rpc/src/signer.rs index c1c90fb4a0..cf3ddae099 100644 --- a/client/rpc/src/signer.rs +++ b/client/rpc/src/signer.rs @@ -18,7 +18,7 @@ use ethereum::TransactionV2 as EthereumTransaction; use ethereum_types::{H160, H256}; -use jsonrpsee::core::Error; +use jsonrpsee::types::ErrorObjectOwned; // Substrate use sp_core::hashing::keccak_256; // Frontier @@ -35,7 +35,7 @@ pub trait EthSigner: Send + Sync { &self, message: TransactionMessage, address: &H160, - ) -> Result; + ) -> Result; } pub struct EthDevSigner { @@ -75,7 +75,7 @@ impl EthSigner for EthDevSigner { &self, message: TransactionMessage, address: &H160, - ) -> Result { + ) -> Result { let mut transaction = None; for secret in &self.keys { diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 855d3b9d7e..65c7701519 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -8,7 +8,7 @@ use prometheus_endpoint::Registry; use sc_client_api::{Backend, BlockBackend}; use sc_consensus::BasicQueue; use sc_executor::NativeExecutionDispatch; -use sc_network_sync::warp::WarpSyncParams; +use sc_network_sync::strategy::warp::{WarpSyncParams, WarpSyncProvider}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; @@ -304,7 +304,7 @@ where None } else { net_config.add_notification_protocol(grandpa_protocol_config); - let warp_sync: Arc> = + let warp_sync: Arc> = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new( backend.clone(), grandpa_link.shared_authority_set().clone(), diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index fc7dc58cb1..86fe7a3763 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -177,6 +177,8 @@ impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; /// The aggregated dispatch type that is available for extrinsics. type RuntimeCall = RuntimeCall; + /// The aggregated RuntimeTask type. + type RuntimeTask = RuntimeTask; /// The index type for storing how many extrinsics an account has signed. type Nonce = Nonce; /// The type for hashing blocks and tries. @@ -278,7 +280,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = (); type MaxLocks = MaxLocks; type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); }