diff --git a/Cargo.lock b/Cargo.lock index d04e1a10390886842e588789ca9423d8cce686af..47aee8f69532d2b4ac1d7326d52de6025540f610 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,11 +23,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.27.1", + "gimli 0.28.0", ] [[package]] @@ -36,13 +36,44 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "rand_core 0.6.4", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "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]] @@ -52,45 +83,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", ] +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", + "subtle", +] + +[[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead 0.5.2", + "aes 0.8.3", + "cipher 0.4.4", + "ctr 0.9.2", + "ghash 0.5.0", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + [[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if 1.0.0", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -109,11 +203,59 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -124,6 +266,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + [[package]] name = "array-bytes" version = "4.2.0" @@ -132,18 +280,9 @@ checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -153,9 +292,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -164,182 +303,164 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] [[package]] -name = "assert_matches" -version = "1.5.0" +name = "asn1-rs" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] [[package]] -name = "async-channel" -version = "1.8.0" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1-rs-impl" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "async-io" -version = "1.12.0" +name = "asn1_der" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" -dependencies = [ - "async-lock", - "autocfg", - "concurrent-queue", - "futures-lite", - "libc", - "log", - "parking", - "polling", - "slab", - "socket2", - "waker-fn", - "windows-sys 0.42.0", -] +checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] -name = "async-lock" -version = "2.6.0" +name = "assert_matches" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" -dependencies = [ - "event-listener", - "futures-lite", -] +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] -name = "async-process" -version = "1.6.0" +name = "async-channel" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if 1.0.0", + "concurrent-queue", "event-listener", - "futures-lite", - "libc", - "signal-hook", - "windows-sys 0.42.0", + "futures-core", ] [[package]] -name = "async-std" -version = "1.12.0" +name = "async-io" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-channel", - "async-global-executor", - "async-io", "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", + "autocfg", + "cfg-if 1.0.0", + "concurrent-queue", "futures-lite", - "gloo-timers", - "kv-log-macro", "log", - "memchr", - "once_cell", - "pin-project-lite 0.2.9", - "pin-utils", + "parking", + "polling", + "rustix 0.37.23", "slab", - "wasm-bindgen-futures", + "socket2 0.4.9", + "waker-fn", ] [[package]] -name = "async-std-resolver" -version = "0.22.0" +name = "async-lock" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", + "event-listener", ] [[package]] -name = "async-task" -version = "4.3.0" +name = "async-recursion" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "asynchronous-codec" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", ] [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -360,16 +481,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.19.0", + "addr2line 0.21.0", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.30.3", + "object 0.32.1", "rustc-demangle", ] @@ -385,6 +506,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base58" version = "0.2.0" @@ -399,15 +526,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beef" @@ -433,6 +560,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "bitvec" version = "1.0.1" @@ -451,52 +584,42 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq 0.1.5", + "digest 0.10.7", ] [[package]] name = "blake2b_simd" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "arrayvec 0.7.4", + "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "arrayvec 0.7.4", + "constant_time_eq", ] [[package]] name = "blake3" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "cc", "cfg-if 1.0.0", - "constant_time_eq 0.2.4", + "constant_time_eq", ] [[package]] @@ -505,7 +628,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding", + "block-padding 0.1.5", "byte-tools", "byteorder", "generic-array 0.12.4", @@ -517,16 +640,26 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +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 = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "generic-array 0.14.6", + "block-padding 0.2.1", + "cipher 0.2.5", ] [[package]] @@ -539,17 +672,21 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.0" +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "bounded-collections" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6" dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", + "log", + "parity-scale-codec", + "scale-info", + "serde", ] [[package]] @@ -560,9 +697,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.2.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "serde", @@ -579,9 +716,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-slice-cast" @@ -601,6 +738,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + [[package]] name = "byteorder" version = "1.4.3" @@ -609,48 +752,61 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "camino" -version = "1.1.2" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.14.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.16", + "semver 1.0.18", "serde", "serde_json", + "thiserror", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "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", ] [[package]] @@ -687,7 +843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if 1.0.0", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -698,26 +854,25 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.48.5", ] [[package]] @@ -737,31 +892,50 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.16.3", "serde", "unsigned-varint", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "cipher" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", - "clap_derive 3.2.18", + "bitflags 1.3.2", + "clap_derive 3.2.25", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -770,52 +944,58 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ - "bitflags", - "clap_derive 4.1.0", - "clap_lex 0.3.1", - "is-terminal", - "once_cell", + "clap_builder", + "clap_derive 4.4.2", +] + +[[package]] +name = "clap_builder" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.5.1", "strsim", - "termcolor", ] [[package]] name = "clap_complete" -version = "4.1.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" dependencies = [ - "clap 4.1.4", + "clap 4.4.2", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck 0.4.1", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -829,12 +1009,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cmake" @@ -855,6 +1032,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "colored" version = "2.0.4" @@ -881,9 +1064,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.4" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" +checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" dependencies = [ "strum", "strum_macros", @@ -932,54 +1115,49 @@ dependencies = [ "smallvec", "sp-arithmetic", "sp-consensus-babe", + "sp-consensus-grandpa", "sp-core", "sp-distance", "sp-membership", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 5.0.0", "sp-weights", ] [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -993,9 +1171,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core2" @@ -1017,29 +1195,29 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" +checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" +checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", @@ -1047,6 +1225,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli 0.26.2", + "hashbrown 0.12.3", "log", "regalloc2", "smallvec", @@ -1055,33 +1234,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" +checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" +checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4" [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" +checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e" dependencies = [ "cranelift-codegen", "log", @@ -1091,15 +1270,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" +checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59" [[package]] name = "cranelift-native" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" +checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49" dependencies = [ "cranelift-codegen", "libc", @@ -1108,9 +1287,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" +checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1122,6 +1301,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -1133,9 +1327,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1143,9 +1337,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -1154,22 +1348,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", ] @@ -1182,11 +1376,23 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.3.2" +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", + "zeroize", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1198,7 +1404,8 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "rand_core 0.6.4", "typenum", ] @@ -1208,7 +1415,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1218,7 +1425,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1229,7 +1436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1238,17 +1445,26 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher 0.4.4", ] [[package]] name = "ctrlc" -version = "3.2.4" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix 0.26.2", - "windows-sys 0.42.0", + "nix 0.27.1", + "windows-sys 0.48.0", ] [[package]] @@ -1259,13 +1475,13 @@ checksum = "17c2113609da80892316eeacd21e63c359536814b07146d4caa17ad7676e0db3" dependencies = [ "async-trait", "atty", - "clap 3.2.23", + "clap 3.2.25", "console", "cucumber-codegen", "cucumber-expressions", "derive_more", "either", - "futures 0.3.26", + "futures 0.3.28", "gherkin", "globwalk", "inventory", @@ -1288,7 +1504,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.107", + "syn 1.0.109", "synthez", ] @@ -1333,23 +1549,37 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.0" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms 3.1.2", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ - "cfg-if 1.0.0", - "fiat-crypto", - "packed_simd_2", - "platforms 3.0.2", - "subtle", - "zeroize", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" dependencies = [ "cc", "cxxbridge-flags", @@ -1359,9 +1589,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "c4ce20f6b8433da4841b1dadfb9468709868022d829d5ca1f2ffbda928455ea3" dependencies = [ "cc", "codespan-reporting", @@ -1369,31 +1599,31 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "darling" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1401,40 +1631,40 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-encoding-macro" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1442,12 +1672,12 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" dependencies = [ "data-encoding", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1469,11 +1699,51 @@ dependencies = [ [[package]] name = "der" -version = "0.5.1" +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" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", ] [[package]] @@ -1484,7 +1754,49 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", +] + +[[package]] +name = "derive-syn-parse" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.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", ] [[package]] @@ -1495,7 +1807,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1519,16 +1831,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -1574,12 +1887,23 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "distance-oracle" version = "0.1.0" dependencies = [ "bincode", - "clap 4.1.4", + "clap 4.4.2", "dubp-wot", "flate2", "fnv", @@ -1592,21 +1916,11 @@ dependencies = [ "sp-distance", "sp-runtime", "subxt", - "time 0.1.45", + "time", "time-macros", "tokio", ] -[[package]] -name = "dns-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" -dependencies = [ - "byteorder", - "quick-error", -] - [[package]] name = "downcast" version = "0.11.0" @@ -1621,9 +1935,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dubp-wot" @@ -1643,20 +1957,21 @@ name = "duniter" version = "0.3.0" dependencies = [ "async-io", - "clap 4.1.4", + "clap 4.4.2", "clap_complete", "common-runtime", "dc-distance", "distance-oracle", + "enum-as-inner", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", - "futures 0.3.26", + "futures 0.3.28", "g1-runtime", "gdev-runtime", "gtest-runtime", "hex", - "jsonrpsee 0.15.1", + "jsonrpsee", "lazy_static", "log", "maplit", @@ -1676,10 +1991,10 @@ dependencies = [ "sc-client-db", "sc-consensus", "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-grandpa", "sc-consensus-manual-seal", - "sc-consensus-uncles", "sc-executor", - "sc-finality-grandpa", "sc-keystore", "sc-network", "sc-network-common", @@ -1696,9 +2011,9 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-grandpa", "sp-core", "sp-distance", - "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keyring", @@ -1710,6 +2025,7 @@ dependencies = [ "sp-storage", "sp-timestamp", "sp-transaction-pool", + "sp-transaction-storage-proof", "sp-trie", "substrate-build-script-utils", "substrate-frame-rpc-system", @@ -1723,7 +2039,7 @@ version = "3.0.0" dependencies = [ "anyhow", "async-trait", - "clap 3.2.23", + "clap 3.2.25", "ctrlc", "cucumber", "distance-oracle", @@ -1734,6 +2050,7 @@ dependencies = [ "portpicker", "serde_json", "sp-keyring", + "sp-runtime", "subxt", "tokio", ] @@ -1746,6 +2063,7 @@ dependencies = [ "hex-literal", "parity-scale-codec", "sp-core", + "sp-runtime", "subxt", "tokio", ] @@ -1758,7 +2076,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -1779,25 +2097,39 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" + +[[package]] +name = "ecdsa" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +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.13.4" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.7.8", + "digest 0.10.7", + "elliptic-curve 0.13.5", + "rfc6979 0.4.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] @@ -1806,7 +2138,17 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", +] + +[[package]] +name = "ed25519" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.1.0", ] [[package]] @@ -1816,13 +2158,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", + "ed25519 1.5.3", "rand 0.7.3", "serde", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +dependencies = [ + "curve25519-dalek 4.1.0", + "ed25519 2.2.2", + "rand_core 0.6.4", + "serde", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "ed25519-zebra" version = "3.1.0" @@ -1830,7 +2186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek 3.2.0", - "hashbrown", + "hashbrown 0.12.3", "hex", "rand_core 0.6.4", "sha2 0.9.9", @@ -1839,24 +2195,47 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "elliptic-curve" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +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", + "zeroize", +] [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ - "base16ct", - "crypto-bigint", - "der", - "ff", - "generic-array 0.14.6", - "group", + "base16ct 0.2.0", + "crypto-bigint 0.5.3", + "digest 0.10.7", + "ff 0.13.0", + "generic-array 0.14.7", + "group 0.13.0", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -1869,9 +2248,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] @@ -1885,7 +2264,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1927,18 +2306,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059" dependencies = [ "fsio", - "indexmap", + "indexmap 1.9.3", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" -version = "0.2.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -1963,7 +2348,20 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", +] + +[[package]] +name = "expander" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" +dependencies = [ + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -1984,7 +2382,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "synstructure", ] @@ -2002,13 +2400,19 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fdlimit" version = "0.2.1" @@ -2020,9 +2424,19 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "ff" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", "subtle", @@ -2030,9 +2444,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.17" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "file-per-thread-logger" @@ -2046,24 +2460,24 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.42.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] name = "finality-grandpa" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" +checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "log", "num-traits", @@ -2092,9 +2506,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", @@ -2134,16 +2548,16 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2157,9 +2571,10 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", + "frame-support-procedural", "frame-system", "linregress", "log", @@ -2173,35 +2588,33 @@ dependencies = [ "sp-io", "sp-runtime", "sp-runtime-interface", - "sp-std", + "sp-std 5.0.0", "sp-storage", + "static_assertions", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.1.4", + "clap 4.4.2", "comfy-table", "frame-benchmarking", "frame-support", "frame-system", "gethostname", "handlebars", - "hash-db", "itertools", - "kvdb", "lazy_static", "linked-hash-map", "log", - "memory-db", "parity-scale-codec", "rand 0.8.5", - "rand_pcg 0.3.1", + "rand_pcg", "sc-block-builder", "sc-cli", "sc-client-api", @@ -2211,7 +2624,6 @@ dependencies = [ "sc-sysinfo", "serde", "serde_json", - "serde_nanos", "sp-api", "sp-blockchain", "sp-core", @@ -2221,9 +2633,9 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-std 5.0.0", "sp-storage", "sp-trie", - "tempfile", "thiserror", "thousands", ] @@ -2231,7 +2643,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", @@ -2241,15 +2653,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-tracing", ] [[package]] name = "frame-metadata" -version = "15.0.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" +checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec", @@ -2257,12 +2669,31 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-remote-externalities" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" +dependencies = [ + "async-recursion", + "futures 0.3.28", + "jsonrpsee", + "log", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "substrate-rpc-client", + "tokio", +] + [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", @@ -2283,7 +2714,7 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std", + "sp-std 5.0.0", "sp-tracing", "sp-weights", "tt-call", @@ -2292,43 +2723,45 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "Inflector", "cfg-expr", + "derive-syn-parse", "frame-support-procedural-tools", "itertools", + "proc-macro-warning", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "log", @@ -2338,7 +2771,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-version", "sp-weights", ] @@ -2346,7 +2779,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -2355,13 +2788,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "sp-api", @@ -2370,15 +2803,21 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "fs2" version = "0.4.3" @@ -2389,13 +2828,23 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs4" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +dependencies = [ + "rustix 0.38.13", + "windows-sys 0.48.0", +] + [[package]] name = "fsevent" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fsevent-sys", ] @@ -2424,7 +2873,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -2448,9 +2897,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -2463,9 +2912,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -2473,15 +2922,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -2491,34 +2940,34 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -2528,21 +2977,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.20.9", + "webpki 0.22.1", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -2552,9 +3001,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2564,7 +3013,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "pin-utils", "slab", ] @@ -2632,9 +3081,7 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-consensus-vrf", "sp-core", - "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keyring", @@ -2642,7 +3089,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 5.0.0", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -2704,11 +3151,9 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-consensus-slots", - "sp-consensus-vrf", + "sp-consensus-grandpa", "sp-core", "sp-distance", - "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keyring", @@ -2716,7 +3161,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 5.0.0", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -2733,12 +3178,13 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2767,17 +3213,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2793,7 +3237,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug 0.3.0", + "polyval 0.6.1", ] [[package]] @@ -2807,7 +3261,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 1.0.107", + "syn 1.0.109", "textwrap 0.12.1", "thiserror", "typed-builder", @@ -2815,13 +3269,13 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.7" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" +checksum = "ba330b70a5341d3bc730b8e205aaee97ddab5d9c448c4f51a7c2d924266fa8f9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -2831,21 +3285,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -2860,23 +3314,11 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "graphql-introspection-query" version = "0.2.0" @@ -2921,7 +3363,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2932,16 +3374,27 @@ checksum = "e56b093bfda71de1da99758b036f4cc811fd2511c8a76f75680e9ffbd2bb4251" dependencies = [ "graphql_client_codegen", "proc-macro2", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "group" -version = "0.11.0" +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", +] + +[[package]] +name = "group" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff", + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] @@ -3001,9 +3454,7 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-consensus-vrf", "sp-core", - "sp-finality-grandpa", "sp-inherents", "sp-io", "sp-keyring", @@ -3011,7 +3462,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std", + "sp-std 5.0.0", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -3019,9 +3470,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -3029,7 +3480,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -3038,9 +3489,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.3.6" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" +checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683" dependencies = [ "log", "pest", @@ -3052,9 +3503,9 @@ dependencies = [ [[package]] name = "hash-db" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4" [[package]] name = "hash256-std-hasher" @@ -3071,9 +3522,24 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.3.3" @@ -3100,24 +3566,30 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] -name = "hex-literal" -version = "0.3.4" +name = "hkdf" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] [[package]] name = "hmac" @@ -3139,6 +3611,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "hmac-drbg" version = "0.3.0" @@ -3146,10 +3627,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3163,9 +3653,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -3180,9 +3670,15 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", ] +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + [[package]] name = "httparse" version = "1.8.0" @@ -3191,9 +3687,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3203,9 +3699,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -3217,8 +3713,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", - "socket2", + "pin-project-lite 0.2.13", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -3234,11 +3730,27 @@ dependencies = [ "http", "hyper", "log", - "rustls", + "rustls 0.20.9", + "rustls-native-certs", + "tokio", + "tokio-rustls 0.23.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls 0.21.7", "rustls-native-certs", "tokio", - "tokio-rustls", - "webpki-roots", + "tokio-rustls 0.24.1", + "webpki-roots 0.23.1", ] [[package]] @@ -3256,26 +3768,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi 0.3.9", + "windows 0.48.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -3297,9 +3808,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3317,20 +3828,21 @@ dependencies = [ [[package]] name = "if-watch" -version = "2.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", "fnv", - "futures 0.3.26", + "futures 0.3.28", "if-addrs", "ipnet", "log", "rtnetlink", "system-configuration", - "windows", + "tokio", + "windows 0.34.0", ] [[package]] @@ -3376,20 +3888,30 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "inflections" version = "1.1.1" @@ -3402,7 +3924,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -3416,6 +3938,15 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "instant" version = "0.1.12" @@ -3434,6 +3965,25 @@ dependencies = [ "num-traits", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "inventory" version = "0.2.3" @@ -3446,18 +3996,13 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - -[[package]] -name = "io-lifetimes" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.2", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3477,32 +4022,31 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.3", "widestring", - "winapi 0.3.9", + "windows-sys 0.48.0", "winreg", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes 1.0.5", - "rustix 0.36.7", - "windows-sys 0.42.0", + "hermit-abi 0.3.2", + "rustix 0.38.13", + "windows-sys 0.48.0", ] [[package]] @@ -3516,105 +4060,73 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ - "jsonrpsee-core 0.15.1", - "jsonrpsee-http-server", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", - "jsonrpsee-types 0.15.1", + "jsonrpsee-server", + "jsonrpsee-types", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", - "tracing", -] - -[[package]] -name = "jsonrpsee" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" -dependencies = [ - "jsonrpsee-client-transport 0.16.2", - "jsonrpsee-core 0.16.2", - "jsonrpsee-http-client", - "jsonrpsee-types 0.16.2", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" -dependencies = [ - "futures-util", - "http", - "jsonrpsee-core 0.15.1", - "jsonrpsee-types 0.15.1", - "pin-project", - "rustls-native-certs", - "soketto", - "thiserror", - "tokio", - "tokio-rustls", - "tokio-util", "tracing", - "webpki-roots", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" dependencies = [ "futures-util", "http", - "jsonrpsee-core 0.16.2", - "jsonrpsee-types 0.16.2", + "jsonrpsee-core", + "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tracing", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "async-lock", "async-trait", "beef", @@ -3622,10 +4134,8 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "http", "hyper", - "jsonrpsee-types 0.15.1", - "lazy_static", + "jsonrpsee-types", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3635,44 +4145,19 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", - "unicase", -] - -[[package]] -name = "jsonrpsee-core" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" -dependencies = [ - "anyhow", - "async-lock", - "async-trait", - "beef", - "futures-channel", - "futures-timer", - "futures-util", - "hyper", - "jsonrpsee-types 0.16.2", - "rustc-hash", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", ] [[package]] name = "jsonrpsee-http-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", - "hyper-rustls", - "jsonrpsee-core 0.16.2", - "jsonrpsee-types 0.16.2", + "hyper-rustls 0.24.1", + "jsonrpsee-core", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", @@ -3681,55 +4166,46 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" -dependencies = [ - "futures-channel", - "futures-util", - "hyper", - "jsonrpsee-core 0.15.1", - "jsonrpsee-types 0.15.1", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-futures", -] - [[package]] name = "jsonrpsee-proc-macros" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ + "heck 0.4.1", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] -name = "jsonrpsee-types" -version = "0.15.1" +name = "jsonrpsee-server" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ - "anyhow", - "beef", + "futures-channel", + "futures-util", + "http", + "hyper", + "jsonrpsee-core", + "jsonrpsee-types", "serde", "serde_json", - "thiserror", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" dependencies = [ "anyhow", "beef", @@ -3741,53 +4217,34 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" -dependencies = [ - "http", - "jsonrpsee-client-transport 0.15.1", - "jsonrpsee-core 0.15.1", - "jsonrpsee-types 0.15.1", -] - -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" +checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ - "futures-channel", - "futures-util", "http", - "jsonrpsee-core 0.15.1", - "jsonrpsee-types 0.15.1", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] name = "k256" -version = "0.10.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if 1.0.0", - "ecdsa", - "elliptic-curve", - "sec1", + "ecdsa 0.16.8", + "elliptic-curve 0.13.5", + "once_cell", + "sha2 0.10.7", ] [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -3802,33 +4259,22 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "kvdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] @@ -3846,35 +4292,28 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libm" -version = "0.1.4" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libp2p" -version = "0.49.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" +checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" dependencies = [ "bytes", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", - "lazy_static", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-dns", "libp2p-identify", "libp2p-kad", @@ -3883,14 +4322,15 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", + "libp2p-quic", "libp2p-request-response", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", "libp2p-wasm-ext", + "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", - "multiaddr", + "multiaddr 0.16.0", "parking_lot 0.12.1", "pin-project", "smallvec", @@ -3898,30 +4338,31 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", - "ed25519-dalek", + "ed25519-dalek 1.0.1", "either", "fnv", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "instant", - "lazy_static", "log", - "multiaddr", - "multihash", + "multiaddr 0.16.0", + "multihash 0.16.3", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", "rw-stream-sink", - "sha2 0.10.6", + "sec1 0.3.0", + "sha2 0.10.7", "smallvec", "thiserror", "unsigned-varint", @@ -3929,15 +4370,42 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-core" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" +dependencies = [ + "either", + "fnv", + "futures 0.3.28", + "futures-timer", + "instant", + "libp2p-identity", + "log", + "multiaddr 0.17.1", + "multihash 0.17.0", + "multistream-select", + "once_cell", + "parking_lot 0.12.1", + "pin-project", + "quick-protobuf", + "rand 0.8.5", + "rw-stream-sink", + "smallvec", + "thiserror", + "unsigned-varint", + "void", +] + [[package]] name = "libp2p-dns" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" +checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "async-std-resolver", - "futures 0.3.26", - "libp2p-core", + "futures 0.3.28", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "smallvec", @@ -3946,46 +4414,64 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.40.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" +checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", - "lru 0.8.1", - "prost", - "prost-build", - "prost-codec", - "smallvec", + "lru", + "prost", + "prost-build", + "prost-codec", + "smallvec", + "thiserror", + "void", +] + +[[package]] +name = "libp2p-identity" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" +dependencies = [ + "bs58", + "ed25519-dalek 2.0.0", + "log", + "multiaddr 0.17.1", + "multihash 0.17.0", + "quick-protobuf", + "rand 0.8.5", + "sha2 0.10.7", "thiserror", - "void", + "zeroize", ] [[package]] name = "libp2p-kad" -version = "0.41.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22" +checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "asynchronous-codec", "bytes", "either", "fnv", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "prost", "prost-build", "rand 0.8.5", - "sha2 0.10.6", + "sha2 0.10.7", "smallvec", "thiserror", "uint", @@ -3995,31 +4481,31 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" +checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ - "async-io", "data-encoding", - "dns-parser", - "futures 0.3.26", + "futures 0.3.28", "if-watch", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", "smallvec", - "socket2", + "socket2 0.4.9", + "tokio", + "trust-dns-proto", "void", ] [[package]] name = "libp2p-metrics" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9" +checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" dependencies = [ - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-identify", "libp2p-kad", "libp2p-ping", @@ -4029,14 +4515,14 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" +checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", - "futures 0.3.26", - "libp2p-core", + "futures 0.3.28", + "libp2p-core 0.38.0", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -4047,53 +4533,75 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" +checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.26", - "lazy_static", - "libp2p-core", + "futures 0.3.28", + "libp2p-core 0.38.0", "log", + "once_cell", "prost", "prost-build", "rand 0.8.5", - "sha2 0.10.6", + "sha2 0.10.7", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.40.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" +checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", "void", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" +dependencies = [ + "bytes", + "futures 0.3.28", + "futures-timer", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-tls", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.9", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-request-response" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" +checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", - "futures 0.3.26", + "futures 0.3.28", "instant", - "libp2p-core", + "libp2p-core 0.38.0", "libp2p-swarm", "log", "rand 0.8.5", @@ -4103,92 +4611,144 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.40.1" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" +checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "instant", - "libp2p-core", + "libp2p-core 0.38.0", + "libp2p-swarm-derive", "log", "pin-project", "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" +checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck 0.4.1", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "libp2p-tcp" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" +checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "async-io", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "if-watch", "libc", - "libp2p-core", + "libp2p-core 0.38.0", "log", - "socket2", + "socket2 0.4.9", + "tokio", +] + +[[package]] +name = "libp2p-tls" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" +dependencies = [ + "futures 0.3.28", + "futures-rustls", + "libp2p-core 0.39.2", + "libp2p-identity", + "rcgen 0.10.0", + "ring", + "rustls 0.20.9", + "thiserror", + "webpki 0.22.1", + "x509-parser 0.14.0", + "yasna", ] [[package]] name = "libp2p-wasm-ext" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "js-sys", - "libp2p-core", + "libp2p-core 0.38.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", ] +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", + "futures 0.3.28", + "futures-timer", + "hex", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-noise", + "log", + "multihash 0.16.3", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", + "tokio", + "tokio-util", + "webrtc", +] + [[package]] name = "libp2p-websocket" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" +checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", - "futures 0.3.26", + "futures 0.3.28", "futures-rustls", - "libp2p-core", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "quicksink", "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] name = "libp2p-yamux" -version = "0.41.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12" +checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ - "futures 0.3.26", - "libp2p-core", + "futures 0.3.28", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "thiserror", @@ -4245,9 +4805,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "cmake", @@ -4258,9 +4818,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] @@ -4282,25 +4842,30 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" +checksum = "4de04dcecc58d366391f9920245b85ffa684558a5ef6e7736e754347c3aea9c2" dependencies = [ "nalgebra", - "statrs", ] [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -4314,22 +4879,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", - "value-bag", -] - -[[package]] -name = "lru" -version = "0.7.8" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" @@ -4337,7 +4889,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -4396,7 +4948,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -4407,33 +4959,43 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memfd" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.36.7", + "rustix 0.37.23", ] [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -4449,22 +5011,20 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "memory-db" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ "hash-db", - "hashbrown", - "parity-util-mem", ] [[package]] @@ -4487,9 +5047,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -4499,9 +5059,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -4527,14 +5087,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -4563,9 +5122,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if 1.0.0", "downcast", @@ -4578,27 +5137,46 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "multibase", + "multihash 0.16.3", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", - "multihash", + "log", + "multibase", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -4627,13 +5205,24 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.6", + "digest 0.10.7", "multihash-derive", - "sha2 0.10.6", + "sha2 0.10.7", "sha3", "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +dependencies = [ + "core2", + "multihash-derive", + "unsigned-varint", +] + [[package]] name = "multihash-derive" version = "0.8.1" @@ -4644,7 +5233,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "synstructure", ] @@ -4661,7 +5250,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", - "futures 0.3.26", + "futures 0.3.28", "log", "pin-project", "smallvec", @@ -4670,31 +5259,29 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.27.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462fffe4002f4f2e1f6a9dcf12cc1a6fc0e15989014efc02a941d3e0f5dc2120" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.1", + "num-rational", "num-traits", - "rand 0.8.5", - "rand_distr", "simba", "typenum", ] [[package]] name = "nalgebra-macros" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4726,9 +5313,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.38" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -4754,7 +5341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -4780,7 +5367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", - "futures 0.3.26", + "futures 0.3.28", "log", "netlink-packet-core", "netlink-sys", @@ -4790,15 +5377,15 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ - "async-io", "bytes", - "futures 0.3.26", + "futures 0.3.28", "libc", "log", + "tokio", ] [[package]] @@ -4813,29 +5400,23 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", + "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if 1.0.0", "libc", - "static_assertions", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nohash-hasher" version = "0.2.0" @@ -4854,9 +5435,9 @@ dependencies = [ [[package]] name = "nom_locate" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e299bf5ea7b212e811e71174c5d1a5d065c4c0ad0c8691ecb1f97e3e66025e" +checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" dependencies = [ "bytecount", "memchr", @@ -4875,7 +5456,7 @@ version = "4.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" dependencies = [ - "bitflags", + "bitflags 1.3.2", "filetime", "fsevent", "fsevent-sys", @@ -4889,20 +5470,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -4911,9 +5481,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -4924,7 +5494,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "itoa", ] @@ -4938,18 +5508,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -4957,49 +5515,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.3", + "num-bigint", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", - "libm 0.2.6", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] name = "num_enum" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5018,20 +5575,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "crc32fast", - "hashbrown", - "indexmap", + "hashbrown 0.12.3", + "indexmap 1.9.3", "memchr", ] [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" 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", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -5055,11 +5630,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -5070,13 +5645,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -5087,11 +5662,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -5100,24 +5674,36 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] -name = "packed_simd_2" -version = "0.3.8" +name = "p256" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "cfg-if 1.0.0", - "libm 0.1.4", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2 0.10.7", +] + +[[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.7", ] [[package]] name = "pallet-atomic-swap" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", @@ -5126,13 +5712,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", @@ -5142,7 +5728,7 @@ dependencies = [ "sp-application-crypto", "sp-authority-discovery", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5164,28 +5750,27 @@ dependencies = [ "sp-membership", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-authorship", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5198,18 +5783,18 @@ dependencies = [ "scale-info", "sp-application-crypto", "sp-consensus-babe", - "sp-consensus-vrf", + "sp-core", "sp-io", "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5218,7 +5803,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5235,13 +5820,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5252,7 +5837,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5272,7 +5857,7 @@ dependencies = [ "sp-distance", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5293,7 +5878,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5309,7 +5894,7 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5319,7 +5904,7 @@ dependencies = [ "num_enum", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5340,13 +5925,13 @@ dependencies = [ "sp-io", "sp-membership", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5357,13 +5942,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-application-crypto", + "sp-consensus-grandpa", "sp-core", - "sp-finality-grandpa", "sp-io", "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5381,13 +5966,13 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5401,7 +5986,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5419,13 +6004,13 @@ dependencies = [ "sp-io", "sp-membership", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5435,7 +6020,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5453,7 +6038,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5471,13 +6056,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5488,7 +6073,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5504,13 +6089,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5519,13 +6104,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5535,13 +6120,14 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", @@ -5555,7 +6141,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 5.0.0", "sp-trie", ] @@ -5576,13 +6162,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-session", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", @@ -5590,13 +6176,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5607,14 +6193,14 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-timestamp", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-support", "frame-system", @@ -5624,15 +6210,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "jsonrpsee 0.15.1", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -5646,7 +6232,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5658,7 +6244,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5669,7 +6255,7 @@ dependencies = [ "scale-info", "serde", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5688,7 +6274,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -5702,13 +6288,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-benchmarking", "frame-support", @@ -5718,16 +6304,16 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "parity-db" -version = "0.3.17" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fdb726a43661fa54b43e7114e6b88b2289cae388eb3ad766d9d1754d83fce" +checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" dependencies = [ - "blake2-rfc", + "blake2", "crc32fast", "fs2", "hex", @@ -5737,16 +6323,17 @@ dependencies = [ "memmap2", "parking_lot 0.12.1", "rand 0.8.5", + "siphasher", "snap", ] [[package]] name = "parity-scale-codec" -version = "3.3.0" +version = "3.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3840933452adf7b3b9145e27086a5a3376c619dca1a21b1e5a5af0d54979bed" +checksum = "f88eaac72ead1b9bd4ce747d577dbd2ad31fb0a56a9a20c611bf27bd1b97fbed" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bitvec", "byte-slice-cast", "bytes", @@ -5757,56 +6344,21 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.4" +version = "3.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" +checksum = "33bdcd446e9400b6ad9fc85b4aea68846c258b07c3efb994679ae82707b133f0" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", -] - -[[package]] -name = "parity-send-wrapper" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" - -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown", - "impl-trait-for-tuples", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types", - "winapi 0.3.9", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn 1.0.107", - "synstructure", + "syn 1.0.109", ] [[package]] -name = "parity-wasm" -version = "0.32.0" +name = "parity-send-wrapper" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac" -dependencies = [ - "byteorder", -] +checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-wasm" @@ -5816,9 +6368,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -5865,31 +6417,31 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac 0.11.1", ] [[package]] name = "pbkdf2" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac 0.11.1", + "digest 0.10.7", ] [[package]] @@ -5919,27 +6471,46 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9555b1514d2d99d78150d3c799d4c357a3e2c2a8062cd108e93a06d9057629c5" +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +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.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.5.4" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" +checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.5.4" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" +checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" dependencies = [ "pest", "pest_generator", @@ -5947,56 +6518,56 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.4" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" +checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "pest_meta" -version = "2.5.4" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" +checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" dependencies = [ "once_cell", "pest", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.0.0", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -6007,9 +6578,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -6019,20 +6590,29 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", - "zeroize", + "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", ] [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "placeholder" @@ -6052,22 +6632,24 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "platforms" -version = "3.0.2" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "polling" -version = "2.5.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", + "bitflags 1.3.2", "cfg-if 1.0.0", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite 0.2.13", + "windows-sys 0.48.0", ] [[package]] @@ -6078,7 +6660,7 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", ] [[package]] @@ -6090,7 +6672,19 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.1", ] [[package]] @@ -6124,15 +6718,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -6140,12 +6734,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6168,7 +6762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", - "toml", + "toml 0.5.11", ] [[package]] @@ -6180,7 +6774,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "version_check", ] @@ -6195,6 +6789,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-warning" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "proc-macro2" version = "1.0.66" @@ -6238,14 +6843,14 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "prost" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", "prost-derive", @@ -6253,9 +6858,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck 0.4.1", @@ -6268,16 +6873,16 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 1.0.107", + "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-codec" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987" +checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", "bytes", @@ -6288,24 +6893,23 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "prost-types" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "bytes", "prost", ] @@ -6324,6 +6928,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-protobuf" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +dependencies = [ + "byteorder", +] + [[package]] name = "quicksink" version = "0.1.2" @@ -6335,6 +6948,24 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn-proto" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.9", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.1", +] + [[package]] name = "quote" version = "1.0.33" @@ -6361,7 +6992,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg 0.2.1", ] [[package]] @@ -6410,17 +7040,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", + "getrandom 0.2.10", ] [[package]] @@ -6432,15 +7052,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_pcg" version = "0.3.1" @@ -6478,13 +7089,38 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -6493,7 +7129,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -6502,36 +7138,36 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.14" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.14" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "regalloc2" -version = "0.3.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" +checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" dependencies = [ "fxhash", "log", @@ -6541,13 +7177,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -6556,48 +7193,51 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "env_logger 0.9.3", - "log", - "parity-scale-codec", - "serde", - "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", - "substrate-rpc-client", -] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "region" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ + "bitflags 1.3.2", + "libc", + "mach", "winapi 0.3.9", ] [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -6614,7 +7254,7 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "serde", "serde_json", "serde_urlencoded", @@ -6640,15 +7280,25 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", - "hmac 0.11.0", + "crypto-bigint 0.4.9", + "hmac 0.12.1", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + [[package]] name = "ring" version = "0.16.20" @@ -6675,19 +7325,30 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", - "futures 0.3.26", + "futures 0.3.28", "log", "netlink-packet-route", "netlink-proto", "nix 0.24.3", "thiserror", + "tokio", ] [[package]] @@ -6700,6 +7361,20 @@ dependencies = [ "winapi 0.3.9", ] +[[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 = "run_script" version = "0.6.4" @@ -6711,9 +7386,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -6733,54 +7408,101 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.18", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", ] [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", - "io-lifetimes 0.7.5", + "io-lifetimes", "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", ] [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", - "io-lifetimes 1.0.5", + "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.7", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "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" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.1", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "sct", - "webpki", + "rustls-webpki 0.101.4", + "sct 0.7.0", ] [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -6790,18 +7512,38 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.4", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "base64 0.21.0", + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-hook" @@ -6812,7 +7554,7 @@ dependencies = [ "ci_info", "getopts", "nias", - "toml", + "toml 0.5.11", ] [[package]] @@ -6821,16 +7563,25 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "pin-project", "static_assertions", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safe_arch" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +dependencies = [ + "bytemuck", +] [[package]] name = "same-file" @@ -6844,7 +7595,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "log", "sp-core", @@ -6855,9 +7606,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "log", "parity-scale-codec", @@ -6878,7 +7629,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6888,52 +7639,53 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-state-machine", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "impl-trait-for-tuples", "memmap2", - "parity-scale-codec", "sc-chain-spec-derive", - "sc-network-common", + "sc-client-api", + "sc-executor", + "sc-network", "sc-telemetry", "serde", "serde_json", + "sp-blockchain", "sp-core", "sp-runtime", + "sp-state-machine", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", "chrono", - "clap 4.1.4", + "clap 4.4.2", "fdlimit", - "futures 0.3.26", + "futures 0.3.28", "libp2p", "log", "names", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", @@ -6962,11 +7714,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "fnv", - "futures 0.3.26", - "hash-db", + "futures 0.3.28", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -6983,14 +7734,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", - "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "hash-db", "kvdb", @@ -7002,6 +7752,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", + "schnellru", "sp-arithmetic", "sp-blockchain", "sp-core", @@ -7014,13 +7765,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -7038,10 +7790,10 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.28", "log", "parity-scale-codec", "sc-block-builder", @@ -7067,27 +7819,24 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", "fork-tree", - "futures 0.3.26", + "futures 0.3.28", "log", - "merlin", - "num-bigint 0.2.6", - "num-rational 0.2.4", + "num-bigint", + "num-rational", "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", "sc-client-api", "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", "sc-keystore", "sc-telemetry", - "schnorrkel", - "serde", + "scale-info", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -7095,21 +7844,40 @@ dependencies = [ "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", - "sp-consensus-vrf", "sp-core", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", - "sp-version", "substrate-prometheus-endpoint", "thiserror", ] +[[package]] +name = "sc-consensus-babe-rpc" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" +dependencies = [ + "futures 0.3.28", + "jsonrpsee", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-rpc-api", + "serde", + "sp-api", + "sp-application-crypto", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-core", + "sp-keystore", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7119,15 +7887,55 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "sc-consensus-grandpa" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" +dependencies = [ + "ahash 0.8.3", + "array-bytes", + "async-trait", + "dyn-clone", + "finality-grandpa", + "fork-tree", + "futures 0.3.28", + "futures-timer", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "sc-block-builder", + "sc-chain-spec", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-telemetry", + "sc-utils", + "serde_json", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-consensus-grandpa", + "sp-core", + "sp-keystore", + "sp-runtime", + "substrate-prometheus-endpoint", + "thiserror", +] + [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "assert_matches", "async-trait", - "futures 0.3.26", - "jsonrpsee 0.15.1", + "futures 0.3.28", + "jsonrpsee", "log", "parity-scale-codec", "sc-client-api", @@ -7156,10 +7964,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "log", "parity-scale-codec", @@ -7174,27 +7982,14 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "thiserror", -] - -[[package]] -name = "sc-consensus-uncles" -version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "sc-client-api", - "sp-authorship", - "sp-runtime", - "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "lazy_static", - "lru 0.7.8", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", @@ -7202,12 +7997,10 @@ dependencies = [ "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", "sp-runtime-interface", - "sp-tasks", "sp-trie", "sp-version", "sp-wasm-interface", @@ -7218,13 +8011,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", "wasm-instrument", @@ -7234,14 +8024,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -7249,77 +8037,33 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ + "anyhow", "cfg-if 1.0.0", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm 0.45.0", - "rustix 0.35.13", + "rustix 0.36.15", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] -[[package]] -name = "sc-finality-grandpa" -version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "ahash", - "array-bytes", - "async-trait", - "dyn-clone", - "finality-grandpa", - "fork-tree", - "futures 0.3.26", - "futures-timer", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-consensus", - "sc-keystore", - "sc-network", - "sc-network-common", - "sc-network-gossip", - "sc-telemetry", - "sc-utils", - "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-finality-grandpa", - "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", -] - [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "ansi_term", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "log", - "parity-util-mem", "sc-client-api", + "sc-network", "sc-network-common", - "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", ] @@ -7327,7 +8071,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", "async-trait", @@ -7342,30 +8086,27 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", + "async-channel", "async-trait", "asynchronous-codec", - "bitflags", "bytes", - "cid", "either", "fnv", - "fork-tree", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "ip_network", "libp2p", - "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.8", + "lru", + "mockall", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -7375,6 +8116,7 @@ dependencies = [ "serde", "serde_json", "smallvec", + "snow", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -7389,60 +8131,63 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "cid", - "futures 0.3.26", + "futures 0.3.28", "libp2p", "log", "prost", "prost-build", "sc-client-api", + "sc-network", "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", "unsigned-varint", - "void", ] [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ + "array-bytes", "async-trait", - "bitflags", + "bitflags 1.3.2", "bytes", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "libp2p", - "linked_hash_set", "parity-scale-codec", "prost-build", "sc-consensus", "sc-peerset", + "sc-utils", "serde", "smallvec", "sp-blockchain", "sp-consensus", - "sp-finality-grandpa", + "sp-consensus-grandpa", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "ahash", - "futures 0.3.26", + "ahash 0.8.3", + "futures 0.3.28", "futures-timer", "libp2p", "log", - "lru 0.7.8", + "lru", + "sc-network", "sc-network-common", "sc-peerset", "sp-runtime", @@ -7453,16 +8198,17 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", - "futures 0.3.26", + "futures 0.3.28", "libp2p", "log", "parity-scale-codec", "prost", "prost-build", "sc-client-api", + "sc-network", "sc-network-common", "sc-peerset", "sp-blockchain", @@ -7474,20 +8220,23 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", + "async-trait", "fork-tree", - "futures 0.3.26", + "futures 0.3.28", + "futures-timer", "libp2p", "log", - "lru 0.7.8", + "lru", "mockall", "parity-scale-codec", "prost", "prost-build", "sc-client-api", "sc-consensus", + "sc-network", "sc-network-common", "sc-peerset", "sc-utils", @@ -7495,26 +8244,28 @@ dependencies = [ "sp-arithmetic", "sp-blockchain", "sp-consensus", + "sp-consensus-grandpa", "sp-core", - "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", - "futures 0.3.26", - "hex", + "futures 0.3.28", "libp2p", "log", "parity-scale-codec", "pin-project", + "sc-network", "sc-network-common", "sc-peerset", + "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", @@ -7523,22 +8274,23 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", "bytes", "fnv", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.2", "libp2p", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", + "sc-network", "sc-network-common", "sc-peerset", "sc-utils", @@ -7553,9 +8305,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "libp2p", "log", "sc-utils", @@ -7566,7 +8318,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7575,11 +8327,10 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", - "hash-db", - "jsonrpsee 0.15.1", + "futures 0.3.28", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7600,18 +8351,16 @@ dependencies = [ "sp-runtime", "sp-session", "sp-version", + "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", - "jsonrpsee 0.15.1", - "log", + "jsonrpsee", "parity-scale-codec", - "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -7620,7 +8369,6 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", "sp-version", "thiserror", ] @@ -7628,53 +8376,60 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", - "jsonrpsee 0.15.1", + "http", + "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", ] [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", + "array-bytes", + "futures 0.3.28", + "futures-util", "hex", - "jsonrpsee 0.15.1", + "jsonrpsee", + "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-chain-spec", + "sc-client-api", "sc-transaction-pool-api", "serde", "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "sp-version", "thiserror", + "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", - "hash-db", - "jsonrpsee 0.15.1", + "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -7693,6 +8448,7 @@ dependencies = [ "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", + "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -7702,19 +8458,15 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", "sp-storage", - "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -7731,48 +8483,62 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", - "sc-client-api", "sp-core", ] +[[package]] +name = "sc-storage-monitor" +version = "0.1.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" +dependencies = [ + "clap 4.4.2", + "fs4", + "futures 0.3.28", + "log", + "sc-client-db", + "sc-utils", + "sp-core", + "thiserror", + "tokio", +] + [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "libc", "log", - "rand 0.7.3", - "rand_pcg 0.2.1", + "rand 0.8.5", + "rand_pcg", "regex", "sc-telemetry", "serde", "serde_json", "sp-core", "sp-io", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "chrono", - "futures 0.3.26", + "futures 0.3.28", "libp2p", "log", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", + "sc-utils", "serde", "serde_json", "thiserror", @@ -7782,7 +8548,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "ansi_term", "atty", @@ -7813,26 +8579,26 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "linked-hash-map", "log", + "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -7851,10 +8617,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "futures 0.3.26", + "futures 0.3.28", "log", "serde", "sp-blockchain", @@ -7865,14 +8631,16 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", + "async-channel", + "futures 0.3.28", "futures-timer", "lazy_static", "log", "parking_lot 0.12.1", "prometheus", + "sp-arithmetic", ] [[package]] @@ -7888,21 +8656,63 @@ dependencies = [ [[package]] name = "scale-decode" -version = "0.4.0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e5527e4b3bf079d4c0b2f253418598c380722ba37ef20fac9088081407f2b6" +dependencies = [ + "parity-scale-codec", + "primitive-types", + "scale-bits", + "scale-decode-derive", + "scale-info", + "thiserror", +] + +[[package]] +name = "scale-decode-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b38741b2f78e4391b94eac6b102af0f6ea2b0f7fe65adb55d7f4004f507854db" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "scale-encode" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d823d4be477fc33321f93d08fb6c2698273d044f01362dc27573a750deb7c233" +checksum = "15546e5efbb45f0fc2291f7e202dee8623274c5d8bbfdf9c6886cc8b44a7ced3" dependencies = [ "parity-scale-codec", + "primitive-types", "scale-bits", + "scale-encode-derive", "scale-info", "thiserror", ] +[[package]] +name = "scale-encode-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd983cf0a9effd76138554ead18a6de542d1af175ac12fd5e91836c5c0268082" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "scale-info" -version = "2.3.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -7914,27 +8724,28 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "scale-value" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a5e7810815bd295da73e4216d1dfbced3c7c7c7054d70fa5f6e4c58123fff4" +checksum = "11f549769261561e6764218f847e500588f9a79a289de49ce92f9e26642a3574" dependencies = [ "either", "frame-metadata", "parity-scale-codec", "scale-bits", "scale-decode", + "scale-encode", "scale-info", "serde", "thiserror", @@ -7943,11 +8754,22 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "schnellru" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +dependencies = [ + "ahash 0.8.3", + "cfg-if 1.0.0", + "hashbrown 0.13.2", ] [[package]] @@ -7970,15 +8792,25 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scratch" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] -name = "scratch" -version = "1.0.3" +name = "sct" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "sct" @@ -7990,6 +8822,18 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + [[package]] name = "sealed" version = "0.3.0" @@ -7999,7 +8843,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -8011,18 +8855,33 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "sec1" -version = "0.2.1" +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", + "zeroize", +] + +[[package]] +name = "sec1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "der", - "generic-array 0.14.6", - "pkcs8", + "base16ct 0.2.0", + "der 0.7.8", + "generic-array 0.14.7", + "pkcs8 0.10.2", "subtle", "zeroize", ] @@ -8056,11 +8915,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -8069,9 +8928,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -8088,9 +8947,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -8118,14 +8977,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa", "ryu", @@ -8133,10 +8992,10 @@ dependencies = [ ] [[package]] -name = "serde_nanos" -version = "0.1.2" +name = "serde_spanned" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -8166,6 +9025,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.8.2" @@ -8193,22 +9063,22 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -8222,44 +9092,45 @@ dependencies = [ ] [[package]] -name = "signal-hook" -version = "0.3.14" +name = "signal-hook-registry" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", - "signal-hook-registry", ] [[package]] -name = "signal-hook-registry" -version = "1.4.0" +name = "signature" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "libc", + "digest 0.10.7", + "rand_core 0.6.4", ] [[package]] name = "signature" -version = "1.4.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ - "digest 0.9.0", + "digest 0.10.7", "rand_core 0.6.4", ] [[package]] name = "simba" -version = "0.5.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e82063457853d00243beda9952e910b82593e4b07ae9f721b9278a99a0d3d5c" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", "num-traits", "paste", + "wide", ] [[package]] @@ -8270,30 +9141,36 @@ checksum = "2230cd5c29b815c9b699fb610b49a5ed65588f3509d9f0108be3a885da629333" dependencies = [ "colored", "log", - "time 0.3.23", + "time", "windows-sys 0.42.0", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "slice-group-by" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "snap" @@ -8303,31 +9180,41 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" +checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.0", + "curve25519-dalek 4.1.0", "rand_core 0.6.4", "ring", "rustc_version", - "sha2 0.10.6", + "sha2 0.10.7", "subtle", ] [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "soketto" version = "0.7.1" @@ -8337,7 +9224,8 @@ dependencies = [ "base64 0.13.1", "bytes", "flate2", - "futures 0.3.26", + "futures 0.3.28", + "http", "httparse", "log", "rand 0.8.5", @@ -8347,16 +9235,18 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "hash-db", "log", "parity-scale-codec", + "scale-info", "sp-api-proc-macro", "sp-core", + "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 5.0.0", "sp-trie", "sp-version", "thiserror", @@ -8365,88 +9255,77 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ + "Inflector", "blake2", + "expander", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", - "sp-std", + "sp-std 5.0.0", "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std", -] - -[[package]] -name = "sp-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "async-trait", - "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "log", - "lru 0.7.8", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -8460,26 +9339,22 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "futures 0.3.26", - "futures-timer", + "futures 0.3.28", "log", - "parity-scale-codec", "sp-core", "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std", - "sp-version", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", "parity-scale-codec", @@ -8490,17 +9365,16 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "merlin", "parity-scale-codec", "scale-info", "serde", @@ -8508,55 +9382,57 @@ dependencies = [ "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-consensus-vrf", "sp-core", "sp-inherents", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-timestamp", ] [[package]] -name = "sp-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +name = "sp-consensus-grandpa" +version = "4.0.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ + "finality-grandpa", + "log", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-keystore", "sp-runtime", - "sp-std", - "sp-timestamp", + "sp-std 5.0.0", ] [[package]] -name = "sp-consensus-vrf" +name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "scale-info", - "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", + "serde", + "sp-std 5.0.0", + "sp-timestamp", ] [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "array-bytes", - "base58", - "bitflags", + "bitflags 1.3.2", "blake2", - "byteorder", + "bounded-collections", + "bs58", "dyn-clonable", "ed25519-zebra", - "futures 0.3.26", + "futures 0.3.28", "hash-db", "hash256-std-hasher", "impl-serde", @@ -8564,61 +9440,74 @@ dependencies = [ "libsecp256k1", "log", "merlin", - "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", + "paste", "primitive-types", - "rand 0.7.3", + "rand 0.8.5", "regex", "scale-info", "schnorrkel", "secp256k1", "secrecy", "serde", - "sp-core-hashing", + "sp-core-hashing 5.0.0", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", - "sp-std", + "sp-std 5.0.0", "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "blake2", + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.7", + "sha3", + "sp-std 5.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27449abdfbe41b473e625bce8113745e81d65777dd1d5a8462cf24137930dad8" +dependencies = [ + "blake2b_simd", "byteorder", - "digest 0.10.6", - "sha2 0.10.6", + "digest 0.10.7", + "sha2 0.10.7", "sha3", - "sp-std", + "sp-std 7.0.0", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "proc-macro2", "quote", - "sp-core-hashing", - "syn 1.0.107", + "sp-core-hashing 5.0.0", + "syn 2.0.32", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8626,12 +9515,12 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -8645,83 +9534,66 @@ dependencies = [ "serde", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "thiserror", ] [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "0.13.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", "sp-storage", ] -[[package]] -name = "sp-finality-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "finality-grandpa", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", + "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "thiserror", ] [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "bytes", - "futures 0.3.26", - "hash-db", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", + "futures 0.3.28", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "rustversion", "secp256k1", "sp-core", "sp-externalities", "sp-keystore", "sp-runtime-interface", "sp-state-machine", - "sp-std", + "sp-std 5.0.0", "sp-tracing", "sp-trie", - "sp-wasm-interface", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "lazy_static", "sp-core", @@ -8731,15 +9603,12 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "0.13.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "async-trait", - "futures 0.3.26", - "merlin", + "futures 0.3.28", "parity-scale-codec", "parking_lot 0.12.1", - "schnorrkel", "serde", "sp-core", "sp-externalities", @@ -8749,10 +9618,10 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "thiserror", - "zstd", + "zstd 0.12.4", ] [[package]] @@ -8764,13 +9633,24 @@ dependencies = [ "scale-info", "serde", "sp-runtime", - "sp-std", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.1.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" +dependencies = [ + "frame-metadata", + "parity-scale-codec", + "scale-info", + "sp-std 5.0.0", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "sp-api", "sp-core", @@ -8779,8 +9659,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "backtrace", "lazy_static", @@ -8790,7 +9670,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "rustc-hash", "serde", @@ -8799,31 +9679,30 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-application-crypto", "sp-arithmetic", "sp-core", "sp-io", - "sp-std", + "sp-std 5.0.0", "sp-weights", ] [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8831,7 +9710,7 @@ dependencies = [ "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", - "sp-std", + "sp-std 5.0.0", "sp-storage", "sp-tracing", "sp-wasm-interface", @@ -8840,34 +9719,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.107", -] - -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", + "syn 2.0.32", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "scale-info", @@ -8875,96 +9740,88 @@ dependencies = [ "sp-core", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "scale-info", + "serde", + "sp-core", "sp-runtime", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "0.13.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "hash-db", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", "sp-panic-handler", - "sp-std", + "sp-std 5.0.0", "sp-trie", "thiserror", "tracing", - "trie-root", ] [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" + +[[package]] +name = "sp-std" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de8eef39962b5b97478719c493bed2926cf70cb621005bbf68ebe58252ff986" [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive", - "sp-std", -] - -[[package]] -name = "sp-tasks" -version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" -dependencies = [ - "log", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std", + "sp-std 5.0.0", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "thiserror", ] [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -8973,7 +9830,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "sp-api", "sp-runtime", @@ -8982,7 +9839,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", "log", @@ -8991,27 +9848,27 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-trie", ] [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "ahash", + "ahash 0.8.3", "hash-db", - "hashbrown", + "hashbrown 0.13.2", "lazy_static", - "lru 0.7.8", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", "scale-info", + "schnellru", "sp-core", - "sp-std", + "sp-std 5.0.0", "thiserror", "tracing", "trie-db", @@ -9021,16 +9878,16 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.45.0", + "parity-wasm", "scale-info", "serde", "sp-core-hashing-proc-macro", "sp-runtime", - "sp-std", + "sp-std 5.0.0", "sp-version-proc-macro", "thiserror", ] @@ -9038,23 +9895,24 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +version = "7.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", "wasmi", "wasmtime", ] @@ -9062,9 +9920,8 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -9072,7 +9929,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-debug-derive", - "sp-std", + "sp-std 5.0.0", ] [[package]] @@ -9083,19 +9940,29 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.5.4" +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" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der", + "der 0.7.8", ] [[package]] name = "ss58-registry" -version = "1.38.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e40c020d72bc0a9c5660bb71e4a6fdef081493583062c474740a7d59f55f0e7b" +checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" dependencies = [ "Inflector", "num-format", @@ -9124,7 +9991,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "libc", "parking_lot 0.11.2", @@ -9143,20 +10010,7 @@ dependencies = [ "memchr", "proc-macro2", "quote", - "syn 1.0.107", -] - -[[package]] -name = "statrs" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" -dependencies = [ - "approx", - "lazy_static", - "nalgebra", - "num-traits", - "rand 0.8.5", + "syn 1.0.109", ] [[package]] @@ -9184,7 +10038,26 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 1.0.107", + "syn 1.0.109", +] + +[[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", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", ] [[package]] @@ -9203,7 +10076,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "platforms 2.0.0", ] @@ -9211,17 +10084,15 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.26", - "jsonrpsee 0.15.1", + "futures 0.3.28", + "jsonrpsee", "log", "parity-scale-codec", - "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -9232,9 +10103,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "futures-util", "hyper", "log", "prometheus", @@ -9245,10 +10115,10 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "async-trait", - "jsonrpsee 0.15.1", + "jsonrpsee", "log", "sc-rpc-api", "serde", @@ -9258,7 +10128,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ "ansi_term", "build-helper", @@ -9267,9 +10137,18 @@ dependencies = [ "sp-maybe-compressed-blob", "strum", "tempfile", - "toml", + "toml 0.7.8", "walkdir", - "wasm-gc-api", + "wasm-opt", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", ] [[package]] @@ -9280,24 +10159,31 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.24.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.32#c1266b43252514d42febde8d6f66cc3b14be94ef" +version = "0.28.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.42#64bde2b02a30e619b8efede5eec46104c600e15c" dependencies = [ - "bitvec", + "base58", + "blake2", "derivative", + "either", "frame-metadata", - "futures 0.3.26", - "getrandom 0.2.8", + "futures 0.3.28", + "getrandom 0.2.10", "hex", - "jsonrpsee 0.16.2", + "impl-serde", + "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.1", + "primitive-types", + "scale-bits", "scale-decode", + "scale-encode", "scale-info", "scale-value", "serde", "serde_json", "sp-core", + "sp-core-hashing 8.0.0", "sp-runtime", "subxt-macro", "subxt-metadata", @@ -9307,51 +10193,51 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.24.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.32#c1266b43252514d42febde8d6f66cc3b14be94ef" +version = "0.28.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.42#64bde2b02a30e619b8efede5eec46104c600e15c" dependencies = [ "darling", "frame-metadata", "heck 0.4.1", "hex", - "jsonrpsee 0.16.2", + "jsonrpsee", "parity-scale-codec", - "proc-macro-error", "proc-macro2", "quote", "scale-info", "subxt-metadata", - "syn 1.0.107", + "syn 1.0.109", + "thiserror", "tokio", ] [[package]] name = "subxt-macro" -version = "0.24.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.32#c1266b43252514d42febde8d6f66cc3b14be94ef" +version = "0.28.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.42#64bde2b02a30e619b8efede5eec46104c600e15c" dependencies = [ "darling", "proc-macro-error", "subxt-codegen", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "subxt-metadata" -version = "0.24.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.32#c1266b43252514d42febde8d6f66cc3b14be94ef" +version = "0.28.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.42#64bde2b02a30e619b8efede5eec46104c600e15c" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core-hashing 8.0.0", ] [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -9360,9 +10246,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -9377,7 +10263,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "unicode-xid", ] @@ -9387,7 +10273,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033178d0acccffc5490021657006e6a8dd586ee9dc6f7c24e7608b125e568cb1" dependencies = [ - "syn 1.0.107", + "syn 1.0.109", "synthez-codegen", "synthez-core", ] @@ -9398,7 +10284,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69263462a40e46960f070618e20094ce69e783a41f86e54bc75545136afd597a" dependencies = [ - "syn 1.0.107", + "syn 1.0.109", "synthez-core", ] @@ -9411,16 +10297,16 @@ dependencies = [ "proc-macro2", "quote", "sealed 0.3.0", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -9443,29 +10329,28 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall 0.2.16", - "remove_dir_all", - "winapi 0.3.9", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix 0.38.13", + "windows-sys 0.48.0", ] [[package]] name = "tera" -version = "1.17.1" +version = "1.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c" +checksum = "970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8" dependencies = [ "globwalk", "lazy_static", @@ -9488,9 +10373,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "textwrap" @@ -9509,22 +10394,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] @@ -9535,10 +10420,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if 1.0.0", "once_cell", ] @@ -9551,17 +10437,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.3.23" @@ -9593,23 +10468,33 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.7", "thiserror", "unicode-normalization", "wasm-bindgen", "zeroize", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -9627,40 +10512,39 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", - "mio 0.8.5", + "mio 0.8.8", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -9672,33 +10556,44 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.9", + "tokio", + "webpki 0.22.1", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.7", "tokio", - "webpki", ] [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "tokio", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "tokio", "tracing", ] @@ -9712,6 +10607,75 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.13", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -9725,27 +10689,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.9", + "log", + "pin-project-lite 0.2.13", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -9807,12 +10772,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -9820,9 +10785,9 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" +checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ "hash-db", ] @@ -9845,8 +10810,10 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", + "socket2 0.4.9", "thiserror", "tinyvec", + "tokio", "tracing", "url", ] @@ -9866,6 +10833,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", + "tokio", "tracing", "trust-dns-proto", ] @@ -9879,28 +10847,37 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.42#38b19717f847d3eda654b6465802c244ea6372a6" dependencies = [ - "clap 4.1.4", - "frame-try-runtime", + "async-trait", + "clap 4.4.2", + "frame-remote-externalities", + "hex", "log", "parity-scale-codec", - "remote-externalities", - "sc-chain-spec", "sc-cli", "sc-executor", "sc-service", "serde", + "serde_json", + "sp-api", + "sp-consensus-aura", + "sp-consensus-babe", "sp-core", + "sp-debug-derive", "sp-externalities", + "sp-inherents", "sp-io", "sp-keystore", + "sp-rpc", "sp-runtime", "sp-state-machine", + "sp-timestamp", + "sp-transaction-storage-proof", "sp-version", "sp-weights", "substrate-rpc-client", - "zstd", + "zstd 0.12.4", ] [[package]] @@ -9909,14 +10886,33 @@ 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 0.3.28", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] + [[package]] name = "twox-hash" version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", - "digest 0.10.6", + "cfg-if 1.0.0", + "digest 0.10.7", "rand 0.8.5", "static_assertions", ] @@ -9929,7 +10925,7 @@ checksum = "f85f4270f4f449a3f2c0cf2aecc8415e388a597aeacc7d55fc749c5c968c8533" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -9940,9 +10936,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uint" @@ -10006,26 +11002,17 @@ dependencies = [ "unic-common", ] -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -10060,7 +11047,17 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "subtle", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", "subtle", ] @@ -10075,9 +11072,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ "asynchronous-codec", "bytes", @@ -10093,12 +11090,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] @@ -10113,21 +11110,26 @@ dependencies = [ ] [[package]] -name = "valuable" -version = "0.1.0" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "value-bag" -version = "1.0.0-alpha.9" +name = "uuid" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "ctor", - "version_check", + "getrandom 0.2.10", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -10152,6 +11154,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -10160,22 +11171,20 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -10185,12 +11194,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -10199,9 +11202,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -10209,24 +11212,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -10236,9 +11239,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10246,41 +11249,71 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] -name = "wasm-gc-api" -version = "0.1.11" +name = "wasm-instrument" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" +dependencies = [ + "parity-wasm", +] + +[[package]] +name = "wasm-opt" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9" +checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41" dependencies = [ - "log", - "parity-wasm 0.32.0", - "rustc-demangle", + "anyhow", + "libc", + "strum", + "strum_macros", + "tempfile", + "thiserror", + "wasm-opt-cxx-sys", + "wasm-opt-sys", ] [[package]] -name = "wasm-instrument" -version = "0.3.0" +name = "wasm-opt-cxx-sys" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" +checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4" dependencies = [ - "parity-wasm 0.45.0", + "anyhow", + "cxx", + "cxx-build", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-sys" +version = "0.111.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7" +dependencies = [ + "anyhow", + "cc", + "cxx", + "cxx-build", + "regex", ] [[package]] @@ -10289,7 +11322,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -10304,7 +11337,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "parity-wasm 0.45.0", + "parity-wasm", "wasmi-validation", "wasmi_core", ] @@ -10315,7 +11348,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ - "parity-wasm 0.45.0", + "parity-wasm", ] [[package]] @@ -10325,31 +11358,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm 0.2.6", + "libm", "memory_units", - "num-rational 0.4.1", + "num-rational", "num-traits", + "region", ] [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ - "indexmap", + "indexmap 1.9.3", + "url", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" dependencies = [ "anyhow", "bincode", "cfg-if 1.0.0", - "indexmap", + "indexmap 1.9.3", "libc", "log", "object 0.29.0", @@ -10365,23 +11400,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" +checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c" dependencies = [ "anyhow", "base64 0.13.1", @@ -10389,19 +11424,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.35.13", + "rustix 0.36.15", "serde", - "sha2 0.9.9", - "toml", - "windows-sys 0.36.1", - "zstd", + "sha2 0.10.7", + "toml 0.5.11", + "windows-sys 0.42.0", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-cranelift" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" +checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4" dependencies = [ "anyhow", "cranelift-codegen", @@ -10420,14 +11455,14 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" dependencies = [ "anyhow", "cranelift-entity", "gimli 0.26.2", - "indexmap", + "indexmap 1.9.3", "log", "object 0.29.0", "serde", @@ -10439,9 +11474,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -10452,37 +11487,47 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix 0.35.13", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" dependencies = [ "object 0.29.0", "once_cell", - "rustix 0.35.13", + "rustix 0.36.15", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", - "indexmap", + "indexmap 1.9.3", "libc", "log", "mach", @@ -10490,19 +11535,18 @@ dependencies = [ "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.35.13", - "thiserror", + "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" dependencies = [ "cranelift-entity", "serde", @@ -10512,9 +11556,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -10522,9 +11566,19 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", @@ -10536,34 +11590,259 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki", + "webpki 0.22.1", ] [[package]] -name = "wepoll-ffi" -version = "0.1.2" +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.2", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.7", + "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.2", + "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", + "rustls 0.19.1", + "sec1 0.3.0", + "serde", + "sha1", + "sha2 0.10.7", + "signature 1.6.4", + "subtle", + "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.9", + "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", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ + "async-trait", + "bitflags 1.3.2", + "bytes", "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix 0.24.3", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi 0.3.9", ] [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.13", +] + +[[package]] +name = "wide" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +dependencies = [ + "bytemuck", + "safe_arch", ] [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -10622,16 +11901,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets 0.48.5", ] [[package]] @@ -10640,13 +11915,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -10655,7 +11930,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.42.1", + "windows-targets 0.42.2", ] [[package]] @@ -10664,50 +11939,50 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -10717,21 +11992,15 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -10741,21 +12010,15 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -10765,21 +12028,15 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -10789,33 +12046,27 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -10825,29 +12076,33 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" +name = "winnow" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +dependencies = [ + "memchr", +] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -10880,12 +12135,61 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +dependencies = [ + "curve25519-dalek 4.1.0", + "rand_core 0.6.4", + "serde", + "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", + "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", + "base64 0.13.1", + "data-encoding", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + [[package]] name = "xtask" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.1.4", + "clap 4.4.2", "frame-metadata", "graphql_client", "hex", @@ -10909,7 +12213,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -10919,29 +12223,37 @@ dependencies = [ [[package]] name = "yap" -version = "0.7.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc77f52dc9e9b10d55d3f4462c3b7fc393c4f17975d641542833ab2d3bc26ef" +checksum = "e2a7eb6d82a11e4d0b8e6bda8347169aff4ccd8235d039bba7c47482d977dcf7" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", - "synstructure", + "syn 2.0.32", ] [[package]] @@ -10950,7 +12262,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +dependencies = [ + "zstd-safe 6.0.6", ] [[package]] @@ -10963,11 +12284,21 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" -version = "2.0.6+zstd.1.5.2" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index c95bc94fae11599c1fbd3e1a320dd973149221e9..9faa42692112d3a34c801b483c802566ab970c94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,22 +42,16 @@ try-runtime = [ [build-dependencies] clap = { version = "4.0" } #clap_complete = { version = "4.0" } -substrate-build-script-utils = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } +substrate-build-script-utils = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42' } [dev-dependencies] rusty-hook = "^0.11.2" # Dependencies for specific targets [target.'cfg(any(target_arch="x86_64", target_arch="aarch64"))'.dependencies] -sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false, features = [ - "wasmtime", -] } -sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false, features = [ - "wasmtime", -] } -sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", features = [ - "memory-tracker", -] } +sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42" } [dependencies] @@ -74,69 +68,71 @@ sp-distance = { path = 'primitives/distance' } sp-membership = { path = 'primitives/membership' } # crates.io dependencies -async-io = "1.3" -clap = { version = "4.0", features = ["derive"] } -clap_complete = { version = "4" } -futures = { version = "0.3.1", features = ["compat"] } -hex = "0.4.3" -jsonrpsee = { version = "0.15.1", features = ["server"] } -lazy_static = "1.4.0" -log = "0.4" -maplit = '1.0.2' -memmap2 = "0.5.0" -serde = "1.0" -serde_json = "1.0.64" -tracing-core = "0.1.28" +async-io = { version = "1.6.0", default-features = false } +clap = { version = "4.0.9", default-features = false, features = ["derive"] } +clap_complete = { version = "4", default-features = false } +futures = { version = "0.3.28", default-features = false, features = ["compat"] } +hex = { version = "0.4.3", default-features = false } +jsonrpsee = { version = "0.16.2", default-features = false, features = ["server"] } +lazy_static = { version = "1.4.0", default-features = false } +log = { version = "0.4", default-features = false } +maplit = { version = '1.0.2', default-features = false } +memmap2 = { version = "0.5.10", default-features = false } +serde = { version = "1.0", default-features = false } +serde_json = { version = "1.0.64", default-features = false } +tracing-core = { version = "0.1.28", default-features = false } +enum-as-inner = { version = "=0.5.1", default-features = false } #https://github.com/bluejekyll/trust-dns/issues/1946 num-format = "0.4.4" # substrate dependencies -frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -frame-benchmarking-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -frame-system = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false } -pallet-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -pallet-transaction-payment = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false } -pallet-transaction-payment-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-basic-authorship = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-chain-spec = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false } -sc-client-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -babe = { package = "sc-consensus-babe", git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -manual-seal = { package = "sc-consensus-manual-seal", git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-client-db = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false } -sc-consensus-uncles = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-executor = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-finality-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-network = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-network-common = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-rpc-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", default-features = false } -sc-telemetry = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sc-transaction-pool-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-authority-discovery = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-block-builder = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-blockchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-consensus-babe = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-core = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-finality-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-inherents = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-io = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-offchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-runtime = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-session = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-storage = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-timestamp = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -substrate-frame-rpc-system = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -try-runtime-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32", optional = true } +frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +frame-benchmarking-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +pallet-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +pallet-transaction-payment = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-basic-authorship = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-chain-spec = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-client-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-consensus-babe = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-consensus-babe-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-consensus-manual-seal = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-client-db = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-executor = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-network = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-network-common = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-rpc-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-telemetry = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sc-transaction-pool-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-authority-discovery = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-transaction-storage-proof = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-block-builder = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-blockchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-consensus-babe = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-consensus-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sc-consensus-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-core = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-inherents = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-offchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-session = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-storage = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-timestamp = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +substrate-frame-rpc-system = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +try-runtime-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", optional = true, default-features = false } [workspace] resolver = "2" @@ -179,7 +175,6 @@ members = [ # This list is ordered alphabetically. [profile.dev.package] blake2 = { opt-level = 3 } -blake2-rfc = { opt-level = 3 } blake2b_simd = { opt-level = 3 } chacha20poly1305 = { opt-level = 3 } cranelift-codegen = { opt-level = 3 } @@ -227,73 +222,78 @@ panic = "unwind" [patch.crates-io] -#[patch."https://github.com/duniter/substrate"] -#fork-tree = { path = "../substrate/utils/fork-tree" } -#frame-support = { path = "../substrate/frame/support" } -#frame-support-procedural = { path = "../substrate/frame/support/procedural" } -#frame-support-procedural-tools = { path = "../substrate/frame/support/procedural/tools" } -#frame-system = { path = "../substrate/frame/system" } -#frame-benchmarking = { path = "../substrate/frame/benchmarking" } -#frame-benchmarking-cli = { path = "../substrate/utils/frame/benchmarking-cli" } -#sc-basic-authorship = { path = "../substrate/client/basic-authorship" } -#sc-block-builder = { path = "../substrate/client/block-builder" } -#sc-chain-spec = { path = "../substrate/client/chain-spec" } -#sc-cli = { path = "../substrate/client/cli" } -#sc-client-api = { path = "../substrate/client/api" } -#sc-client-db = { path = "../substrate/client/db" } -#sc-consensus = { path = "../substrate/client/consensus/common" } -#sc-consensus-aura = { path = "../substrate/client/consensus/aura" } -#sc-consensus-babe = { path = "../substrate/client/consensus/babe" } -#sc-consensus-manual-seal = { path = "../substrate/client/consensus/manual-seal" } -#sc-consensus-slots = { path = "../substrate/client/consensus/slots" } -#sc-consensus-uncles = { path = "../substrate/client/consensus/uncles" } -#sc-executor = { path = "../substrate/client/executor" } -#sc-executor-common = { path = "../substrate/client/executor/common" } -#sc-executor-wasmi = { path = "../substrate/client/executor/wasmi" } -#sc-executor-wasmtime = { path = "../substrate/client/executor/wasmtime" } -#sc-finality-grandpa = { path = "../substrate/client/finality-grandpa" } -#sc-keystore = { path = "../substrate/client/keystore" } -#sc-network = { path = "../substrate/client/network" } -#sc-rpc-api = { path = "../substrate/client/rpc-api" } -#sc-service = { path = "../substrate/client/service" } -#sc-telemetry = { path = "../substrate/client/telemetry" } -#sc-transaction-pool = { path = "../substrate/client/transaction-pool" } -#sc-transaction-pool-api = { path = "../substrate/client/transaction-pool/api" } -#sp-api = { path = "../substrate/primitives/api" } -#sp-application-crypto = { path = "../substrate/primitives/application-crypto" } -#sp-arithmetic = { path = "../substrate/primitives/arithmetic" } -#sp-authority-discovery = { path = "../substrate/primitives/authority-discovery" } -#sp-authorship = { path = "../substrate/primitives/authorship" } -#sp-block-builder = { path = "../substrate/primitives/block-builder" } -#sp-blockchain = { path = "../substrate/primitives/blockchain" } -#sp-consensus = { path = "../substrate/primitives/consensus/common" } -#sp-consensus-babe = { path = "../substrate/primitives/consensus/babe" } -#sp-consensus-slots = { path = "../substrate/primitives/consensus/slots" } -#sp-consensus-vrf = { path = "../substrate/primitives/consensus/vrf" } -#sp-core = { path = "../substrate/primitives/core" } -#sp-core-hashing = { path = "../substrate/primitives/core/hashing" } -#sp-core-hashing-proc-macro = { path = "../substrate/primitives/core/hashing/proc-macro" } -#sp-debug-derive = { path = "../substrate/primitives/debug-derive" } -#sp-externalities = { path = "../substrate/primitives/externalities" } -#sp-finality-grandpa = { path = "../substrate/primitives/finality-grandpa" } -#sp-inherents = { path = "../substrate/primitives/inherents" } -#sp-io = { path = "../substrate/primitives/io" } -#sp-keyring = { path = "../substrate/primitives/keyring" } -#sp-keystore = { path = "../substrate/primitives/keystore" } -#sp-maybe-compressed-blob = { path = "../substrate/primitives/maybe-compressed-blob" } -#sp-offchain = { path = "../substrate/primitives/offchain" } -#sp-panic-handler = { path = "../substrate/primitives/panic-handler" } -#sp-rpc = { path = "../substrate/primitives/rpc" } -#sp-runtime = { path = "../substrate/primitives/runtime" } -#sp-session = { path = "../substrate/primitives/session" } -#sp-staking = { path = "../substrate/primitives/staking" } -#sp-state-machine = { path = "../substrate/primitives/state-machine" } -#sp-std = { path = "../substrate/primitives/std" } -#sp-storage = { path = "../substrate/primitives/storage" } -#sp-timestamp = { path = "../substrate/primitives/timestamp" } -#sp-tracing = { path = "../substrate/primitives/tracing" } -#sp-transaction-pool = { path = "../substrate/primitives/transaction-pool" } -#sp-trie = { path = "../substrate/primitives/trie" } -#sp-version = { path = "../substrate/primitives/version" } -#sp-weights = { path = "../substrate/primitives/weights" } -#substrate-prometheus-endpoint = { path = "../substrate/utils/prometheus" } +# # the following patch can be useful to debug substrate dependency +# # added by tuxmain on 0.9.32 update +# # updated by hugo on 0.9.42 update (benjamin) +# [patch.'https://github.com/duniter/substrate'] +# pallet-balances = {path = '../substrate/frame/balances'} +# fork-tree = { path = "../substrate/utils/fork-tree" } +# frame-support = { path = "../substrate/frame/support" } +# frame-support-procedural = { path = "../substrate/frame/support/procedural" } +# frame-support-procedural-tools = { path = "../substrate/frame/support/procedural/tools" } +# frame-system = { path = "../substrate/frame/system" } +# frame-benchmarking = { path = "../substrate/frame/benchmarking" } +# frame-benchmarking-cli = { path = "../substrate/utils/frame/benchmarking-cli" } +# sc-basic-authorship = { path = "../substrate/client/basic-authorship" } +# sc-block-builder = { path = "../substrate/client/block-builder" } +# sc-chain-spec = { path = "../substrate/client/chain-spec" } +# sc-cli = { path = "../substrate/client/cli" } +# sc-client-api = { path = "../substrate/client/api" } +# sc-client-db = { path = "../substrate/client/db" } +# sc-network-common = { path = "../substrate/client/network/common" } +# sc-consensus = { path = "../substrate/client/consensus/common" } +# sc-consensus-aura = { path = "../substrate/client/consensus/aura" } +# sc-consensus-babe = { path = "../substrate/client/consensus/babe" } +# sc-consensus-babe-rpc = { path = "../substrate/client/consensus/babe/rpc" } +# sc-consensus-manual-seal = { path = "../substrate/client/consensus/manual-seal" } +# sc-consensus-slots = { path = "../substrate/client/consensus/slots" } +# sc-executor = { path = "../substrate/client/executor" } +# sc-executor-common = { path = "../substrate/client/executor/common" } +# sc-executor-wasmi = { path = "../substrate/client/executor/wasmi" } +# sc-executor-wasmtime = { path = "../substrate/client/executor/wasmtime" } +# sc-keystore = { path = "../substrate/client/keystore" } +# sc-network = { path = "../substrate/client/network" } +# sc-rpc-api = { path = "../substrate/client/rpc-api" } +# sc-service = { path = "../substrate/client/service" } +# sc-utils = { path = "../substrate/client/utils" } +# sc-telemetry = { path = "../substrate/client/telemetry" } +# sc-transaction-pool = { path = "../substrate/client/transaction-pool" } +# sc-transaction-pool-api = { path = "../substrate/client/transaction-pool/api" } +# sc-peerset = { path = "../substrate/client/peerset" } +# sp-api = { path = "../substrate/primitives/api" } +# sp-application-crypto = { path = "../substrate/primitives/application-crypto" } +# sp-arithmetic = { path = "../substrate/primitives/arithmetic" } +# sp-authority-discovery = { path = "../substrate/primitives/authority-discovery" } +# sp-block-builder = { path = "../substrate/primitives/block-builder" } +# sp-blockchain = { path = "../substrate/primitives/blockchain" } +# sp-consensus = { path = "../substrate/primitives/consensus/common" } +# sp-consensus-babe = { path = "../substrate/primitives/consensus/babe" } +# sp-consensus-slots = { path = "../substrate/primitives/consensus/slots" } +# sp-core = { path = "../substrate/primitives/core" } +# sp-core-hashing = { path = "../substrate/primitives/core/hashing" } +# sp-core-hashing-proc-macro = { path = "../substrate/primitives/core/hashing/proc-macro" } +# sp-debug-derive = { path = "../substrate/primitives/debug-derive" } +# sp-externalities = { path = "../substrate/primitives/externalities" } +# sp-consensus-grandpa = { path = "../substrate/primitives/consensus/grandpa" } +# sp-inherents = { path = "../substrate/primitives/inherents" } +# sp-io = { path = "../substrate/primitives/io" } +# sp-keyring = { path = "../substrate/primitives/keyring" } +# sp-keystore = { path = "../substrate/primitives/keystore" } +# sp-maybe-compressed-blob = { path = "../substrate/primitives/maybe-compressed-blob" } +# sp-offchain = { path = "../substrate/primitives/offchain" } +# sp-panic-handler = { path = "../substrate/primitives/panic-handler" } +# sp-rpc = { path = "../substrate/primitives/rpc" } +# sp-runtime = { path = "../substrate/primitives/runtime" } +# sp-session = { path = "../substrate/primitives/session" } +# sp-staking = { path = "../substrate/primitives/staking" } +# sp-state-machine = { path = "../substrate/primitives/state-machine" } +# sp-std = { path = "../substrate/primitives/std" } +# sp-storage = { path = "../substrate/primitives/storage" } +# sp-timestamp = { path = "../substrate/primitives/timestamp" } +# sp-tracing = { path = "../substrate/primitives/tracing" } +# sp-transaction-pool = { path = "../substrate/primitives/transaction-pool" } +# sp-transaction-storage-proof = { path = "../substrate/primitives/transaction-storage-proof" } +# sp-trie = { path = "../substrate/primitives/trie" } +# sp-version = { path = "../substrate/primitives/version" } +# sp-weights = { path = "../substrate/primitives/weights" } +# substrate-prometheus-endpoint = { path = "../substrate/utils/prometheus" } diff --git a/client/distance/Cargo.toml b/client/distance/Cargo.toml index 27f16c31e957d63ad3a64cb87490d2a2094f7a54..6ece8d3fa23d2f64fc8cf7646e92d6e7c202e925 100644 --- a/client/distance/Cargo.toml +++ b/client/distance/Cargo.toml @@ -27,23 +27,23 @@ version = '3.1.5' [dependencies.frame-support] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sc-client-api] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-core] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-keystore] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/client/distance/src/lib.rs b/client/distance/src/lib.rs index ea345101015990ac80c3ce4ee269367ce4c7a450..821be0c6de3ffcb154af4bcb9447f3c39c0d1900 100644 --- a/client/distance/src/lib.rs +++ b/client/distance/src/lib.rs @@ -43,15 +43,13 @@ where IdtyIndex: Decode + Encode + PartialEq + TypeInfo, { let &[owner_key] = owner_keys else { - return Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new( - None - )) + return Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new(None)); }; let owner_key = sp_runtime::AccountId32::new(owner_key.0); let session_index = client .storage( - &parent, + parent, &StorageKey( frame_support::storage::storage_prefix(b"Session", b"CurrentIndex").to_vec(), ), @@ -63,7 +61,7 @@ where let published_results = client .storage( - &parent, + parent, &StorageKey( frame_support::storage::storage_prefix( b"Distance", diff --git a/distance-oracle/Cargo.toml b/distance-oracle/Cargo.toml index 60240d9f20bb33b4802b57cb25b972a6b2a346fb..12095aacea5c26fd2795e98a1c737ff44920fdd1 100644 --- a/distance-oracle/Cargo.toml +++ b/distance-oracle/Cargo.toml @@ -15,9 +15,9 @@ log = "0.4.17" num-traits = "0.2.15" rayon = "1.7.0" simple_logger = "4.2.0" -sp-core = { git = "https://github.com/duniter/substrate.git", branch = "duniter-substrate-v0.9.32" } -sp-runtime = { git = "https://github.com/duniter/substrate.git", branch = "duniter-substrate-v0.9.32" } -subxt = { git = 'https://github.com/duniter/subxt.git', branch = "duniter-substrate-v0.9.32" } +sp-core = { git = "https://github.com/duniter/substrate.git", branch = "duniter-substrate-v0.9.42" } +sp-runtime = { git = "https://github.com/duniter/substrate.git", branch = "duniter-substrate-v0.9.42" } +subxt = { git = 'https://github.com/duniter/subxt.git', branch = "duniter-substrate-v0.9.42" } time = "<=0.3.23"# required for MSRV time-macros = "=0.2.10" diff --git a/distance-oracle/src/api.rs b/distance-oracle/src/api.rs index ee5ce2587325f15a61cc08c09e723b732a68929c..8a769981139c698133ecb68d7dca7ed8ceb2aa31 100644 --- a/distance-oracle/src/api.rs +++ b/distance-oracle/src/api.rs @@ -20,7 +20,7 @@ use sp_core::H256; use subxt::storage::StorageKey; pub type Client = subxt::OnlineClient<crate::RuntimeConfig>; -pub type AccountId = subxt::ext::sp_runtime::AccountId32; +pub type AccountId = subxt::utils::AccountId32; pub type IdtyIndex = u32; pub async fn client(rpc_url: String) -> Client { @@ -30,21 +30,14 @@ pub async fn client(rpc_url: String) -> Client { } pub async fn parent_hash(client: &Client) -> H256 { - client - .storage() - .fetch(&runtime::storage().system().parent_hash(), None) - .await - .expect("Cannot fetch parent hash") - .expect("Parent hash is None") + client.rpc().block_hash(None).await.unwrap().unwrap() } pub async fn current_session(client: &Client, parent_hash: H256) -> u32 { client .storage() - .fetch( - &runtime::storage().session().current_index(), - Some(parent_hash), - ) + .at(parent_hash) + .fetch(&runtime::storage().session().current_index()) .await .expect("Cannot fetch current session") .unwrap_or_default() @@ -57,15 +50,13 @@ pub async fn current_pool( ) -> Option<runtime::runtime_types::pallet_distance::types::EvaluationPool<AccountId, IdtyIndex>> { client .storage() - .fetch( - &match current_session % 3 { - 0 => runtime::storage().distance().evaluation_pool1(), - 1 => runtime::storage().distance().evaluation_pool2(), - 2 => runtime::storage().distance().evaluation_pool0(), - _ => unreachable!("n%3<3"), - }, - Some(parent_hash), - ) + .at(parent_hash) + .fetch(&match current_session % 3 { + 0 => runtime::storage().distance().evaluation_pool1(), + 1 => runtime::storage().distance().evaluation_pool2(), + 2 => runtime::storage().distance().evaluation_pool0(), + _ => unreachable!("n%3<3"), + }) .await .expect("Cannot fetch current pool") } @@ -73,10 +64,8 @@ pub async fn current_pool( pub async fn evaluation_block(client: &Client, parent_hash: H256) -> H256 { client .storage() - .fetch( - &runtime::storage().distance().evaluation_block(), - Some(parent_hash), - ) + .at(parent_hash) + .fetch(&runtime::storage().distance().evaluation_block()) .await .expect("Cannot fetch evaluation block") .expect("No evaluation block") @@ -86,11 +75,8 @@ pub async fn member_iter(client: &Client, evaluation_block: H256) -> MemberIter MemberIter( client .storage() - .iter( - runtime::storage().membership().membership(0), - 100, - Some(evaluation_block), - ) + .at(evaluation_block) + .iter(runtime::storage().membership().membership(0), 100) .await .expect("Cannot fetch memberships"), ) @@ -100,9 +86,7 @@ pub struct MemberIter( subxt::storage::KeyIter< crate::RuntimeConfig, Client, - subxt::metadata::DecodeStaticType< - runtime::runtime_types::sp_membership::MembershipData<u32>, - >, + runtime::runtime_types::sp_membership::MembershipData<u32>, >, ); @@ -120,23 +104,14 @@ pub async fn cert_iter(client: &Client, evaluation_block: H256) -> CertIter { CertIter( client .storage() - .iter( - runtime::storage().cert().certs_by_receiver(0), - 100, - Some(evaluation_block), - ) + .at(evaluation_block) + .iter(runtime::storage().cert().certs_by_receiver(0), 100) .await .expect("Cannot fetch certifications"), ) } -pub struct CertIter( - subxt::storage::KeyIter< - crate::RuntimeConfig, - Client, - subxt::metadata::DecodeStaticType<Vec<(IdtyIndex, u32)>>, - >, -); +pub struct CertIter(subxt::storage::KeyIter<crate::RuntimeConfig, Client, Vec<(IdtyIndex, u32)>>); impl CertIter { pub async fn next( diff --git a/distance-oracle/src/lib.rs b/distance-oracle/src/lib.rs index be8b8432eb500d46ac8b30502371c6564e8eba33..738e43bbcb06c92a87508ea7a1372401e7b406dd 100644 --- a/distance-oracle/src/lib.rs +++ b/distance-oracle/src/lib.rs @@ -41,17 +41,15 @@ pub mod runtime {} pub enum RuntimeConfig {} impl subxt::config::Config for RuntimeConfig { type Index = u32; - type BlockNumber = u32; + // type BlockNumber = u32; type Hash = sp_core::H256; - type Hashing = subxt::ext::sp_runtime::traits::BlakeTwo256; + type Hasher = subxt::config::substrate::BlakeTwo256; type AccountId = AccountId; type Address = subxt::ext::sp_runtime::MultiAddress<Self::AccountId, u32>; - type Header = subxt::ext::sp_runtime::generic::Header< - Self::BlockNumber, - subxt::ext::sp_runtime::traits::BlakeTwo256, - >; + type Header = + subxt::config::substrate::SubstrateHeader<u32, subxt::config::substrate::BlakeTwo256>; type Signature = subxt::ext::sp_runtime::MultiSignature; - type ExtrinsicParams = subxt::tx::BaseExtrinsicParams<Self, Tip>; + type ExtrinsicParams = subxt::config::extrinsic_params::BaseExtrinsicParams<Self, Tip>; } #[derive(Copy, Clone, Debug, Default, Encode)] @@ -89,7 +87,11 @@ impl Default for Settings { } pub async fn run_and_save(client: &api::Client, settings: Settings) { - let Some((evaluation, current_session, evaluation_result_path)) = run(client, &settings, true).await else {return}; + let Some((evaluation, current_session, evaluation_result_path)) = + run(client, &settings, true).await + else { + return; + }; let mut evaluation_result_file = std::fs::OpenOptions::new() .write(true) @@ -152,10 +154,10 @@ pub async fn run( // Fetch the pending identities let Some(evaluation_pool) = api::current_pool(client, parent_hash, current_session).await - else { - debug!("Nothing to do: Pool does not exist"); - return None - }; + else { + debug!("Nothing to do: Pool does not exist"); + return None; + }; // Stop if nothing to evaluate if evaluation_pool.evaluations.0.is_empty() { diff --git a/docs/dev/upgrade-substrate.md b/docs/dev/upgrade-substrate.md index 2f98d776bbaec0dd67b6d3c1a9040f8ba44b11f1..2345be020332b81228b7e51c35169a7467f1e007 100644 --- a/docs/dev/upgrade-substrate.md +++ b/docs/dev/upgrade-substrate.md @@ -5,8 +5,10 @@ We need to keep up to date with Substrate. Here is an empirical guide. Let's say for the example that we want to upgrade from `v0.9.26` to `v0.9.32`. ## Upgrade Substrate fork - -TBD (only Élois has done this for now) +1. Checkout the latest Substrate Polkadot branch `polkadot-v0.9.xy` in [our Substrate](https://github.com/duniter/substrate/) +2. Create a new branch `duniter-substrate-v0.9.xy` +3. Cherry-pick `3ad5e1a1fdac5398d4911272a34e1f16c1bdd8f0`, `87ef489034ca2b15c4f30da387e06b1f6716d9a2` and `c36ab4f32454318a47777b24b6533c44121fc10b` +4. Run `cargo check` to check the cherry-picking ## Upgrade Subxt fork diff --git a/end2end-tests/Cargo.toml b/end2end-tests/Cargo.toml index 95e15c04acbbcdfd5179b8b5e1a7ecab6e6cc9a4..d933ba05a95ef0b2e5dc3b3e2154eda043a2645c 100644 --- a/end2end-tests/Cargo.toml +++ b/end2end-tests/Cargo.toml @@ -18,12 +18,13 @@ distance-oracle = { path = "../distance-oracle", default_features = false } env_logger = "0.9.0" hex = "0.4" notify = "4.0" -parity-scale-codec = "3.1.5" +parity-scale-codec = "3.4.0" portpicker = "0.1.1" -serde_json = "1.0.64" -sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } -subxt = { git = 'https://github.com/duniter/subxt.git', branch = 'duniter-substrate-v0.9.32' } -tokio = { version = "1.15.0", features = ["macros"] } +serde_json = "1.0.96" +sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.42", default-features = false } +subxt = { git = 'https://github.com/duniter/subxt.git', branch = 'duniter-substrate-v0.9.42', default-features = false, features = ["substrate-compat", "jsonrpsee-ws"] } +tokio = { version = "1.28", features = ["macros", "time", "rt-multi-thread"], default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false , features = ["std"] } [[test]] name = "cucumber_tests" diff --git a/end2end-tests/cucumber-features/transfer_all.feature b/end2end-tests/cucumber-features/transfer_all.feature index 23b516ee4733765aa80ef9932fbda193168e4728..c68f85b607473b1d1faa60627b2ee7cf69552286 100644 --- a/end2end-tests/cucumber-features/transfer_all.feature +++ b/end2end-tests/cucumber-features/transfer_all.feature @@ -2,7 +2,7 @@ Feature: Balance transfer all Scenario: If bob sends all his ĞDs to Dave - When bob sends all her ĞDs to dave + When bob sends all his ĞDs to dave """ Bob is a member, as such he is not allowed to empty his account completely, if he tries to do so, the existence deposit (2 ĞD) must remain. diff --git a/end2end-tests/tests/common/balances.rs b/end2end-tests/tests/common/balances.rs index 47be324774e7600397d166fef3f879bcfda872d5..a09421ae2ba08043a1baf85661de4d166cf68c78 100644 --- a/end2end-tests/tests/common/balances.rs +++ b/end2end-tests/tests/common/balances.rs @@ -18,7 +18,7 @@ use super::gdev; use super::gdev::runtime_types::pallet_balances; use super::*; use sp_keyring::AccountKeyring; -use subxt::{ext::sp_runtime::MultiAddress, tx::PairSigner}; +use subxt::{tx::PairSigner, utils::MultiAddress}; pub async fn set_balance(client: &Client, who: AccountKeyring, amount: u64) -> Result<()> { let _events = create_block_with_extrinsic( @@ -29,10 +29,9 @@ pub async fn set_balance(client: &Client, who: AccountKeyring, amount: u64) -> R &gdev::tx() .sudo() .sudo(gdev::runtime_types::gdev_runtime::RuntimeCall::Balances( - pallet_balances::pallet::Call::set_balance { - who: MultiAddress::Id(who.to_account_id()), + pallet_balances::pallet::Call::force_set_balance { + who: MultiAddress::Id(who.to_account_id().into()), new_free: amount, - new_reserved: 0, }, )), &PairSigner::new(SUDO_ACCOUNT.pair()), @@ -81,7 +80,7 @@ pub async fn transfer_all(client: &Client, from: AccountKeyring, to: AccountKeyr client .tx() .create_signed( - &gdev::tx().balances().transfer_all(to.clone().into(), false), + &gdev::tx().balances().transfer_all(to.into(), false), &from, BaseExtrinsicParamsBuilder::new(), ) diff --git a/end2end-tests/tests/common/cert.rs b/end2end-tests/tests/common/cert.rs index d380720a92253525a3cf6006ea077df41d962595..6b78e324829ee1236d5d5079d068c562d4971fd9 100644 --- a/end2end-tests/tests/common/cert.rs +++ b/end2end-tests/tests/common/cert.rs @@ -18,7 +18,7 @@ use super::gdev; use super::gdev::runtime_types::pallet_certification; use super::*; use sp_keyring::AccountKeyring; -use subxt::{ext::sp_runtime::MultiAddress, tx::PairSigner}; +use subxt::{tx::PairSigner, utils::MultiAddress}; pub async fn certify(client: &Client, from: AccountKeyring, to: AccountKeyring) -> Result<()> { let signer = PairSigner::new(from.pair()); @@ -27,12 +27,18 @@ pub async fn certify(client: &Client, from: AccountKeyring, to: AccountKeyring) let issuer_index = client .storage() - .fetch(&gdev::storage().identity().identity_index_of(&from), None) + .at_latest() + .await + .unwrap() + .fetch(&gdev::storage().identity().identity_index_of(&from.into())) .await? .unwrap(); let receiver_index = client .storage() - .fetch(&gdev::storage().identity().identity_index_of(&to), None) + .at_latest() + .await + .unwrap() + .fetch(&gdev::storage().identity().identity_index_of(&to.into())) .await? .unwrap(); diff --git a/end2end-tests/tests/common/distance.rs b/end2end-tests/tests/common/distance.rs index e1a8f1ecaa6e002400aa0f456eac9284b99e0d8a..e7ff6d6d4542b706bfc1f21b9016587de342adbf 100644 --- a/end2end-tests/tests/common/distance.rs +++ b/end2end-tests/tests/common/distance.rs @@ -19,8 +19,8 @@ use super::gdev::runtime_types::pallet_identity; use super::*; use crate::DuniterWorld; use sp_keyring::AccountKeyring; -use subxt::ext::sp_runtime::AccountId32; use subxt::tx::{PairSigner, Signer}; +use subxt::utils::AccountId32; pub async fn request_evaluation(client: &Client, origin: AccountKeyring) -> Result<()> { let origin = PairSigner::new(origin.pair()); diff --git a/end2end-tests/tests/common/identity.rs b/end2end-tests/tests/common/identity.rs index 735e655fd66fa8d55bb74e709a7d0fc5946e245a..0aa26bf916fc60b821775b995e5dd16f53b478e6 100644 --- a/end2end-tests/tests/common/identity.rs +++ b/end2end-tests/tests/common/identity.rs @@ -22,7 +22,7 @@ use sp_keyring::AccountKeyring; use subxt::tx::PairSigner; type BlockNumber = u32; -type AccountId = subxt::ext::sp_core::crypto::AccountId32; +type AccountId = subxt::utils::AccountId32; type IdtyData = gdev::runtime_types::common_runtime::entities::IdtyData; type IdtyValue = gdev::runtime_types::pallet_identity::types::IdtyValue<BlockNumber, AccountId, IdtyData>; @@ -42,7 +42,7 @@ pub async fn create_identity( client .tx() .create_signed( - &gdev::tx().identity().create_identity(to), + &gdev::tx().identity().create_identity(to.into()), &from, BaseExtrinsicParamsBuilder::new(), ) @@ -94,13 +94,15 @@ pub async fn validate_identity(client: &Client, from: AccountKeyring, to: u32) - } // get identity index from account keyring name -pub async fn get_identity_index(world: &mut DuniterWorld, account: String) -> Result<u32> { - let account = AccountKeyring::from_str(&account) +pub async fn get_identity_index(world: &DuniterWorld, account: String) -> Result<u32> { + let account: AccountId = AccountKeyring::from_str(&account) .expect("unknown account") - .to_account_id(); + .to_account_id() + .into(); let identity_index = world .read(&gdev::storage().identity().identity_index_of(&account)) + .await .await? .ok_or_else(|| anyhow::anyhow!("identity {} has no associated index", account)) .unwrap(); @@ -108,11 +110,12 @@ pub async fn get_identity_index(world: &mut DuniterWorld, account: String) -> Re Ok(identity_index) } // get identity value from account keyring name -pub async fn get_identity_value(world: &mut DuniterWorld, account: String) -> Result<IdtyValue> { +pub async fn get_identity_value(world: &DuniterWorld, account: String) -> Result<IdtyValue> { let identity_index = get_identity_index(world, account).await.unwrap(); let identity_value = world .read(&gdev::storage().identity().identities(identity_index)) + .await .await? .ok_or_else(|| { anyhow::anyhow!( diff --git a/end2end-tests/tests/common/mod.rs b/end2end-tests/tests/common/mod.rs index 956a2f546b94d77a6b77f09c0eb5069226c77d77..4ef62d59257ad90fcc31c7180a873708b7b27408 100644 --- a/end2end-tests/tests/common/mod.rs +++ b/end2end-tests/tests/common/mod.rs @@ -37,9 +37,9 @@ use std::path::{Path, PathBuf}; use std::process::Command; use std::str::FromStr; use std::time::{Duration, Instant}; +use subxt::config::extrinsic_params::BaseExtrinsicParamsBuilder; use subxt::ext::{sp_core, sp_runtime}; use subxt::rpc::rpc_params; -use subxt::tx::BaseExtrinsicParamsBuilder; pub type Client = subxt::OnlineClient<GdevConfig>; pub type Event = gdev::Event; @@ -50,14 +50,14 @@ pub type TxProgress = subxt::tx::TxProgress<GdevConfig, Client>; pub enum GdevConfig {} impl subxt::config::Config for GdevConfig { type Index = u32; - type BlockNumber = u32; type Hash = sp_core::H256; - type Hashing = sp_runtime::traits::BlakeTwo256; - type AccountId = sp_runtime::AccountId32; + type AccountId = subxt::utils::AccountId32; type Address = sp_runtime::MultiAddress<Self::AccountId, u32>; - type Header = sp_runtime::generic::Header<Self::BlockNumber, sp_runtime::traits::BlakeTwo256>; + type Header = + subxt::config::substrate::SubstrateHeader<u32, subxt::config::substrate::BlakeTwo256>; + type Hasher = subxt::config::substrate::BlakeTwo256; type Signature = sp_runtime::MultiSignature; - type ExtrinsicParams = subxt::tx::BaseExtrinsicParams<Self, Tip>; + type ExtrinsicParams = subxt::config::extrinsic_params::BaseExtrinsicParams<Self, Tip>; } #[derive(Copy, Clone, Debug, Default, Encode)] diff --git a/end2end-tests/tests/common/oneshot.rs b/end2end-tests/tests/common/oneshot.rs index fcd9419375f80faae03c13576daf085282bdb674..6bfe2189d5e2dd730bd99ba90ab54c0159fdb702 100644 --- a/end2end-tests/tests/common/oneshot.rs +++ b/end2end-tests/tests/common/oneshot.rs @@ -19,10 +19,8 @@ use super::gdev::runtime_types::pallet_balances; use super::gdev::runtime_types::pallet_oneshot_account; use super::*; use sp_keyring::AccountKeyring; -use subxt::{ - ext::sp_runtime::{AccountId32, MultiAddress}, - tx::PairSigner, -}; +use subxt::utils::AccountId32; +use subxt::{tx::PairSigner, utils::MultiAddress}; pub enum Account { Normal(AccountKeyring), diff --git a/end2end-tests/tests/cucumber_tests.rs b/end2end-tests/tests/cucumber_tests.rs index f706b170dae09fbaed0ced5ac8ffdbf43fa4cd02..80a1772ac1ad1c1b5be78707b590a993721047bc 100644 --- a/end2end-tests/tests/cucumber_tests.rs +++ b/end2end-tests/tests/cucumber_tests.rs @@ -64,37 +64,39 @@ impl DuniterWorld { self.ignore_errors } // Read storage entry on last block - fn read<'a, Address>( + async fn read<'a, Address>( &self, address: &'a Address, ) -> impl std::future::Future< - Output = std::result::Result< - Option<<Address::Target as subxt::metadata::DecodeWithMetadata>::Target>, - subxt::error::Error, - >, + Output = std::result::Result<Option<Address::Target>, subxt::error::Error>, > + 'a where Address: subxt::storage::StorageAddress<IsFetchable = subxt::storage::address::Yes> + 'a, { - self.client().storage().fetch(address, None) + self.client() + .storage() + .at_latest() + .await + .unwrap() + .fetch(address) } // Read storage entry with default value (on last block) - fn read_or_default<'a, Address>( + async fn read_or_default<'a, Address>( &self, address: &'a Address, - ) -> impl std::future::Future< - Output = std::result::Result< - <Address::Target as subxt::metadata::DecodeWithMetadata>::Target, - subxt::error::Error, - >, - > + 'a + ) -> impl std::future::Future<Output = std::result::Result<Address::Target, subxt::error::Error>> + 'a where Address: subxt::storage::StorageAddress< IsFetchable = subxt::storage::address::Yes, IsDefaultable = subxt::storage::address::Yes, > + 'a, { - self.client().storage().fetch_or_default(address, None) + self.client() + .storage() + .at_latest() + .await + .unwrap() + .fetch_or_default(address) } } @@ -149,6 +151,7 @@ fn parse_amount(amount: u64, unit: &str) -> (u64, bool) { // ===== given ===== +#[allow(clippy::needless_pass_by_ref_mut)] #[given(regex = r"([a-zA-Z]+) ha(?:ve|s) (\d+) (ĞD|cĞD|UD|mUD)")] async fn who_have(world: &mut DuniterWorld, who: String, amount: u64, unit: String) -> Result<()> { // Parse inputs @@ -158,6 +161,7 @@ async fn who_have(world: &mut DuniterWorld, who: String, amount: u64, unit: Stri if is_ud { let current_ud_amount = world .read(&gdev::storage().universal_dividend().current_ud()) + .await .await? .unwrap_or_default(); amount = (amount * current_ud_amount) / 1_000; @@ -171,6 +175,7 @@ async fn who_have(world: &mut DuniterWorld, who: String, amount: u64, unit: Stri // ===== when ===== +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"(\d+) blocks? later")] async fn n_blocks_later(world: &mut DuniterWorld, n: usize) -> Result<()> { for _ in 0..n { @@ -179,6 +184,7 @@ async fn n_blocks_later(world: &mut DuniterWorld, n: usize) -> Result<()> { Ok(()) } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"([a-zA-Z]+) sends? (\d+) (ĞD|cĞD|UD|mUD) to ([a-zA-Z]+)$")] async fn transfer( world: &mut DuniterWorld, @@ -205,6 +211,7 @@ async fn transfer( } } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"([a-zA-Z]+) sends? (\d+) (ĞD|cĞD) to oneshot ([a-zA-Z]+)")] async fn create_oneshot_account( world: &mut DuniterWorld, @@ -223,6 +230,7 @@ async fn create_oneshot_account( common::oneshot::create_oneshot_account(world.client(), from, amount, to).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"oneshot ([a-zA-Z]+) consumes? into (oneshot|account) ([a-zA-Z]+)")] async fn consume_oneshot_account( world: &mut DuniterWorld, @@ -246,6 +254,7 @@ async fn consume_oneshot_account( regex = r"oneshot ([a-zA-Z]+) consumes? (\d+) (ĞD|cĞD) into (oneshot|account) ([a-zA-Z]+) and the rest into (oneshot|account) ([a-zA-Z]+)" )] #[allow(clippy::too_many_arguments)] +#[allow(clippy::needless_pass_by_ref_mut)] async fn consume_oneshot_account_with_remaining( world: &mut DuniterWorld, from: String, @@ -284,6 +293,7 @@ async fn consume_oneshot_account_with_remaining( .await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"([a-zA-Z]+) sends? all (?:his|her) (?:ĞDs?|DUs?|UDs?) to ([a-zA-Z]+)")] async fn send_all_to(world: &mut DuniterWorld, from: String, to: String) -> Result<()> { // Parse inputs @@ -293,6 +303,7 @@ async fn send_all_to(world: &mut DuniterWorld, from: String, to: String) -> Resu common::balances::transfer_all(world.client(), from, to).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"([a-zA-Z]+) certifies ([a-zA-Z]+)")] async fn certifies(world: &mut DuniterWorld, from: String, to: String) -> Result<()> { // Parse inputs @@ -302,6 +313,7 @@ async fn certifies(world: &mut DuniterWorld, from: String, to: String) -> Result common::cert::certify(world.client(), from, to).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r"([a-zA-Z]+) creates identity for ([a-zA-Z]+)")] async fn creates_identity(world: &mut DuniterWorld, from: String, to: String) -> Result<()> { // Parse inputs @@ -311,6 +323,7 @@ async fn creates_identity(world: &mut DuniterWorld, from: String, to: String) -> common::identity::create_identity(world.client(), from, to).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r#"([a-zA-Z]+) confirms (?:his|her) identity with pseudo "([a-zA-Z]+)""#)] async fn confirm_identity(world: &mut DuniterWorld, from: String, pseudo: String) -> Result<()> { let from = AccountKeyring::from_str(&from).expect("unknown from"); @@ -318,6 +331,7 @@ async fn confirm_identity(world: &mut DuniterWorld, from: String, pseudo: String common::identity::confirm_identity(world.client(), from, pseudo).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r#"([a-zA-Z]+) validates ([a-zA-Z]+) identity"#)] async fn validate_identity(world: &mut DuniterWorld, from: String, to: String) -> Result<()> { // input names to keyrings @@ -329,6 +343,7 @@ async fn validate_identity(world: &mut DuniterWorld, from: String, to: String) - common::identity::validate_identity(world.client(), from, to).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r#"([a-zA-Z]+) requests distance evaluation"#)] async fn request_distance_evaluation(world: &mut DuniterWorld, who: String) -> Result<()> { let who = AccountKeyring::from_str(&who).expect("unknown origin"); @@ -336,6 +351,7 @@ async fn request_distance_evaluation(world: &mut DuniterWorld, who: String) -> R common::distance::request_evaluation(world.client(), who).await } +#[allow(clippy::needless_pass_by_ref_mut)] #[when(regex = r#"([a-zA-Z]+) runs distance oracle"#)] async fn run_distance_oracle(world: &mut DuniterWorld, who: String) -> Result<()> { let who = AccountKeyring::from_str(&who).expect("unknown origin"); @@ -350,6 +366,7 @@ async fn run_distance_oracle(world: &mut DuniterWorld, who: String) -> Result<() // ===== then ==== +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"([a-zA-Z]+) should have (\d+) (ĞD|cĞD)")] async fn should_have( world: &mut DuniterWorld, @@ -358,18 +375,21 @@ async fn should_have( unit: String, ) -> Result<()> { // Parse inputs - let who = AccountKeyring::from_str(&who) + let who: subxt::utils::AccountId32 = AccountKeyring::from_str(&who) .expect("unknown to") - .to_account_id(); + .to_account_id() + .into(); let (amount, _is_ud) = parse_amount(amount, &unit); let who_account = world .read_or_default(&gdev::storage().system().account(&who)) + .await .await?; assert_eq!(who_account.data.free, amount); Ok(()) } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"([a-zA-Z]+) should have oneshot (\d+) (ĞD|cĞD)")] async fn should_have_oneshot( world: &mut DuniterWorld, @@ -378,18 +398,21 @@ async fn should_have_oneshot( unit: String, ) -> Result<()> { // Parse inputs - let who = AccountKeyring::from_str(&who) + let who: subxt::utils::AccountId32 = AccountKeyring::from_str(&who) .expect("unknown to") - .to_account_id(); + .to_account_id() + .into(); let (amount, _is_ud) = parse_amount(amount, &unit); let oneshot_amount = world .read(&gdev::storage().oneshot_account().oneshot_accounts(&who)) + .await .await?; assert_eq!(oneshot_amount.unwrap_or(0), amount); Ok(()) } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"Current UD amount should be (\d+).(\d+)")] async fn current_ud_amount_should_be( world: &mut DuniterWorld, @@ -399,21 +422,25 @@ async fn current_ud_amount_should_be( let expected = (amount * 100) + cents; let actual = world .read_or_default(&gdev::storage().universal_dividend().current_ud()) + .await .await?; assert_eq!(actual, expected); Ok(()) } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"Monetary mass should be (\d+).(\d+)")] async fn monetary_mass_should_be(world: &mut DuniterWorld, amount: u64, cents: u64) -> Result<()> { let expected = (amount * 100) + cents; let actual = world .read_or_default(&gdev::storage().universal_dividend().monetary_mass()) + .await .await?; assert_eq!(actual, expected); Ok(()) } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"([a-zA-Z]+) should be certified by ([a-zA-Z]+)")] async fn should_be_certified_by( world: &mut DuniterWorld, @@ -421,12 +448,14 @@ async fn should_be_certified_by( issuer: String, ) -> Result<()> { // Parse inputs - let receiver_account = AccountKeyring::from_str(&receiver) + let receiver_account: subxt::utils::AccountId32 = AccountKeyring::from_str(&receiver) .expect("unknown to") - .to_account_id(); - let issuer_account = AccountKeyring::from_str(&issuer) + .to_account_id() + .into(); + let issuer_account: subxt::utils::AccountId32 = AccountKeyring::from_str(&issuer) .expect("unknown to") - .to_account_id(); + .to_account_id() + .into(); // get corresponding identities index let issuer_index = world @@ -435,6 +464,7 @@ async fn should_be_certified_by( .identity() .identity_index_of(&issuer_account), ) + .await .await? .unwrap(); let receiver_index = world @@ -443,11 +473,13 @@ async fn should_be_certified_by( .identity() .identity_index_of(&receiver_account), ) + .await .await? .unwrap(); let issuers = world .read_or_default(&gdev::storage().cert().certs_by_receiver(receiver_index)) + .await .await?; // look for certification by issuer/receiver pair @@ -463,6 +495,7 @@ async fn should_be_certified_by( } } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"([a-zA-Z]+) should have distance result in (\d+) sessions?")] async fn should_have_distance_result_in_sessions( world: &mut DuniterWorld, @@ -474,12 +507,14 @@ async fn should_have_distance_result_in_sessions( let who = AccountKeyring::from_str(&who).unwrap().to_account_id(); let idty_id = world - .read(&gdev::storage().identity().identity_index_of(&who)) + .read(&gdev::storage().identity().identity_index_of(&who.into())) + .await .await? .unwrap(); let current_session = world .read(&gdev::storage().session().current_index()) + .await .await? .unwrap_or_default(); @@ -491,6 +526,7 @@ async fn should_have_distance_result_in_sessions( _ => unreachable!("n%3<3"), }) .await + .await .unwrap() .ok_or_else(|| anyhow::anyhow!("given pool is empty"))?; @@ -503,17 +539,20 @@ async fn should_have_distance_result_in_sessions( Err(anyhow::anyhow!("no evaluation in given pool").into()) } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"([a-zA-Z]+) should have distance ok")] async fn should_have_distance_ok(world: &mut DuniterWorld, who: String) -> Result<()> { let who = AccountKeyring::from_str(&who).unwrap().to_account_id(); let idty_id = world - .read(&gdev::storage().identity().identity_index_of(&who)) + .read(&gdev::storage().identity().identity_index_of(&who.into())) + .await .await? .unwrap(); match world .read(&gdev::storage().distance().identity_distance_status(idty_id)) + .await .await? { Some((_, gdev::runtime_types::pallet_distance::types::DistanceStatus::Valid)) => Ok(()), @@ -540,6 +579,7 @@ impl FromStr for IdtyStatus { } } +#[allow(clippy::needless_pass_by_ref_mut)] #[then(regex = r"([a-zA-Z]+) identity should be ([a-zA-Z ]+)")] async fn identity_status_should_be( world: &mut DuniterWorld, diff --git a/live-tests/Cargo.toml b/live-tests/Cargo.toml index 52e0e475d068d79b70cbece0f0e8b492bf0b84de..9882e6e1a31f47c82ba178803a0867b6029dc14f 100644 --- a/live-tests/Cargo.toml +++ b/live-tests/Cargo.toml @@ -10,8 +10,9 @@ version = '3.0.0' [dev-dependencies] anyhow = "1.0" -hex-literal = "0.3" -parity-scale-codec = "3.1.5" -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -subxt = { git = 'https://github.com/duniter/subxt', branch = 'duniter-substrate-v0.9.32' } -tokio = { version = "1.15.0", features = ["macros"] } +hex-literal = "0.4" +parity-scale-codec = "3.4.0" +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +subxt = { git = 'https://github.com/duniter/subxt', branch = 'duniter-substrate-v0.9.42', default-features = false, features = ["jsonrpsee-ws"] } +tokio = { version = "1.28", features = ["macros", "time", "rt-multi-thread"], default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false , features = ["std"] } # https://github.com/paritytech/subxt/issues/437 \ No newline at end of file diff --git a/live-tests/tests/sanity_gdev.rs b/live-tests/tests/sanity_gdev.rs index b460968046efc7330c33e0098d01a0cddda32df9..e0df612c599d09579998176ee9282369c5eb8046 100644 --- a/live-tests/tests/sanity_gdev.rs +++ b/live-tests/tests/sanity_gdev.rs @@ -72,18 +72,17 @@ async fn main() -> anyhow::Result<()> { sanity_tests_at(client, maybe_block_hash).await } -async fn sanity_tests_at(client: Client, maybe_block_hash: Option<H256>) -> anyhow::Result<()> { +async fn sanity_tests_at(client: Client, _maybe_block_hash: Option<H256>) -> anyhow::Result<()> { // ===== Collect storage ===== // // Collect accounts - let mut accounts = HashMap::new(); + let mut accounts: HashMap<AccountId32, AccountInfo> = HashMap::new(); let mut account_iter = client .storage() - .iter( - gdev::storage().system().account_root(), - 100, - maybe_block_hash, - ) + .at_latest() + .await + .unwrap() + .iter(gdev::storage().system().account_root(), 100) .await?; while let Some((key, account_info)) = account_iter.next().await? { let mut account_id_bytes = [0u8; 32]; @@ -93,31 +92,37 @@ async fn sanity_tests_at(client: Client, maybe_block_hash: Option<H256>) -> anyh println!("accounts: {}.", accounts.len()); // Collect identities - let mut identities = HashMap::new(); + let mut identities: HashMap<IdtyIndex, IdtyValue> = HashMap::new(); let mut idty_iter = client .storage() - .iter( - gdev::storage().identity().identities_root(), - 100, - maybe_block_hash, - ) + .at_latest() + .await + .unwrap() + .iter(gdev::storage().identity().identities_root(), 100) .await?; while let Some((key, idty_value)) = idty_iter.next().await? { let mut idty_index_bytes = [0u8; 4]; idty_index_bytes.copy_from_slice(&key.0[40..]); - identities.insert(IdtyIndex::from_le_bytes(idty_index_bytes), idty_value); + let idty_val = IdtyValue { + data: idty_value.data, + next_creatable_identity_on: idty_value.next_creatable_identity_on, + old_owner_key: None, // Not used in the live test, skip the conversion + owner_key: AccountId32::from(idty_value.owner_key.0), + removable_on: idty_value.removable_on, + status: idty_value.status, + }; + identities.insert(IdtyIndex::from_le_bytes(idty_index_bytes), idty_val); } println!("identities: {}.", identities.len()); // Collect identity_index_of - let mut identity_index_of = HashMap::new(); + let mut identity_index_of: HashMap<[u8; 16], IdtyIndex> = HashMap::new(); let mut idty_index_of_iter = client .storage() - .iter( - gdev::storage().identity().identity_index_of_root(), - 100, - maybe_block_hash, - ) + .at_latest() + .await + .unwrap() + .iter(gdev::storage().identity().identity_index_of_root(), 100) .await?; while let Some((key, idty_index)) = idty_index_of_iter.next().await? { let mut blake2_128_bytes = [0u8; 16]; diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs index 6d8b46dc340ee5c9715d659861820a37737f68f0..a7594ac7b8ba312829b2fd86be739df286943a2d 100644 --- a/node/src/chain_spec/gdev.rs +++ b/node/src/chain_spec/gdev.rs @@ -19,16 +19,16 @@ use common_runtime::constants::*; use common_runtime::entities::IdtyData; use common_runtime::*; use gdev_runtime::{ - opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, CertConfig, - GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, ParametersConfig, SessionConfig, - SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, - UniversalDividendConfig, WASM_BINARY, + opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, + BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, + ParametersConfig, SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig, + SystemConfig, TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY, }; use sc_service::ChainType; use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; use sp_consensus_babe::AuthorityId as BabeId; +use sp_consensus_grandpa::AuthorityId as GrandpaId; use sp_core::{blake2_256, sr25519, Encode, H256}; -use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_membership::MembershipData; use std::collections::BTreeMap; @@ -339,14 +339,15 @@ fn gen_genesis_for_local_chain( assert!(initial_smiths_len <= initial_identities_len); assert!(initial_authorities_len <= initial_smiths_len); - let babe_epoch_duration = get_env("DUNITER_BABE_EPOCH_DURATION", 30) as u64; + let babe_epoch_duration = get_env("DUNITER_BABE_EPOCH_DURATION", 30); let cert_validity_period = get_env("DUNITER_CERT_VALIDITY_PERIOD", 1_000); let membership_period = get_env("DUNITER_MEMBERSHIP_PERIOD", 1_000); let smith_cert_validity_period = get_env("DUNITER_SMITH_CERT_VALIDITY_PERIOD", 1_000); let smith_membership_period = get_env("DUNITER_SMITH_MEMBERSHIP_PERIOD", 1_000); - let ud_creation_period = get_env("DUNITER_UD_CREATION_PERIOD", 60_000); - let ud_reeval_period = get_env("DUNITER_UD_REEEVAL_PERIOD", 1_200_000); + let ud_creation_period = get_env("DUNITER_UD_CREATION_PERIOD", 60_000) as u64; + let ud_reeval_period = get_env("DUNITER_UD_REEEVAL_PERIOD", 1_200_000) as u64; let ud = 1_000; + let monetary_mass = initial_identities_len as u64 * ud; let initial_smiths = (0..initial_smiths_len) .map(|i| get_authority_keys_from_seed(NAMES[i])) @@ -415,7 +416,9 @@ fn gen_genesis_for_local_chain( .map(|(i, keys)| (i as u32 + 1, (keys.0.clone(), i < initial_authorities_len))) .collect(), }, - balances: Default::default(), + balances: BalancesConfig { + total_issuance: monetary_mass, + }, babe: BabeConfig { authorities: Vec::with_capacity(0), epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), @@ -484,7 +487,7 @@ fn gen_genesis_for_local_chain( universal_dividend: UniversalDividendConfig { first_reeval: None, first_ud: None, - initial_monetary_mass: initial_identities_len as u64 * ud, + initial_monetary_mass: monetary_mass, ud, }, treasury: Default::default(), @@ -505,14 +508,15 @@ fn gen_genesis_for_benchmark_chain( assert!(initial_smiths_len <= initial_identities_len); assert!(initial_authorities_len <= initial_smiths_len); - let babe_epoch_duration = get_env("DUNITER_BABE_EPOCH_DURATION", 30) as u64; + let babe_epoch_duration = get_env("DUNITER_BABE_EPOCH_DURATION", 30); let cert_validity_period = get_env("DUNITER_CERT_VALIDITY_PERIOD", 1_000); let membership_period = get_env("DUNITER_MEMBERSHIP_PERIOD", 1_000); let smith_cert_validity_period = get_env("DUNITER_SMITH_CERT_VALIDITY_PERIOD", 1_000); let smith_membership_period = get_env("DUNITER_SMITH_MEMBERSHIP_PERIOD", 1_000); - let ud_creation_period = get_env("DUNITER_UD_CREATION_PERIOD", 60_000); - let ud_reeval_period = get_env("DUNITER_UD_REEEVAL_PERIOD", 1_200_000); + let ud_creation_period = get_env("DUNITER_UD_CREATION_PERIOD", 60_000) as u64; + let ud_reeval_period = get_env("DUNITER_UD_REEEVAL_PERIOD", 1_200_000) as u64; let ud = 1_000; + let monetary_mass = initial_identities_len as u64 * ud; let initial_smiths = (0..initial_smiths_len) .map(|i| get_authority_keys_from_seed(NAMES[i])) @@ -581,7 +585,9 @@ fn gen_genesis_for_benchmark_chain( .map(|(i, keys)| (i as u32 + 1, (keys.0.clone(), i < initial_authorities_len))) .collect(), }, - balances: Default::default(), + balances: BalancesConfig { + total_issuance: monetary_mass, + }, babe: BabeConfig { authorities: Vec::with_capacity(0), epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), @@ -714,7 +720,9 @@ fn genesis_data_to_gdev_genesis_conf( authority_members: AuthorityMembersConfig { initial_authorities, }, - balances: Default::default(), + balances: BalancesConfig { + total_issuance: initial_monetary_mass, + }, babe: BabeConfig { authorities: Vec::with_capacity(0), epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs index e1aaf387758552946d27983f34556f627e350c7e..2f742abdc4c327995bd0fbf1294323a9b1a2182d 100644 --- a/node/src/chain_spec/gtest.rs +++ b/node/src/chain_spec/gtest.rs @@ -20,20 +20,20 @@ use common_runtime::entities::IdtyData; use common_runtime::*; use gtest_genesis::{build_genesis, GenesisJson}; use gtest_runtime::{ - opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, CertConfig, - GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, SessionConfig, SmithCertConfig, - SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, - UniversalDividendConfig, WASM_BINARY, + opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, + BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, + SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig, + TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY, }; use jsonrpsee::core::JsonValue; -use sc_network_common::config::MultiaddrWithPeerId; // in the future available in sc_network::config +use sc_consensus_grandpa::AuthorityId as GrandpaId; +use sc_network::config::MultiaddrWithPeerId; use sc_service::ChainType; use sc_telemetry::TelemetryEndpoints; use serde::Deserialize; use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; use sp_consensus_babe::AuthorityId as BabeId; use sp_core::{blake2_256, sr25519, Encode, H256}; -use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_membership::MembershipData; use std::collections::BTreeMap; @@ -272,6 +272,7 @@ fn generate_genesis( assert!(initial_authorities_len <= initial_smiths_len); let ud = 1_000; + let monetary_mass = initial_identities_len as u64 * ud; let initial_smiths = (0..initial_smiths_len) .map(|i| get_authority_keys_from_seed(NAMES[i])) @@ -314,7 +315,10 @@ fn generate_genesis( .map(|(i, keys)| (i as u32 + 1, (keys.0.clone(), true))) .collect(), }, - balances: Default::default(), + // Necessary to initialize TotalIssuence + balances: BalancesConfig { + total_issuance: monetary_mass, + }, babe: BabeConfig { authorities: Vec::with_capacity(0), epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), diff --git a/node/src/chain_spec/gtest_genesis.rs b/node/src/chain_spec/gtest_genesis.rs index c168f0738cc96f5a5a7e126439a8d36b2d406809..a332417cb92f79c9c2770a2750636e6e9821250a 100644 --- a/node/src/chain_spec/gtest_genesis.rs +++ b/node/src/chain_spec/gtest_genesis.rs @@ -457,7 +457,7 @@ pub fn build_genesis( authority_members: AuthorityMembersConfig { initial_authorities, }, - balances: Default::default(), + balances: Default::default(), // FIXME babe: BabeConfig { authorities: Vec::with_capacity(0), epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), diff --git a/node/src/cli.rs b/node/src/cli.rs index 3cfdc73c383a8cf45123662aef8ede9e48f8f873..e1f62481f5ae63ca53e5b5096c29f5e1a6632502 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -75,7 +75,7 @@ pub enum Subcommand { /// Sub-commands concerned with benchmarking. /// The pallet benchmarking moved to the `pallet` sub-command. #[clap(subcommand)] - Benchmark(frame_benchmarking_cli::BenchmarkCmd), + Benchmark(Box<frame_benchmarking_cli::BenchmarkCmd>), /// Try some command against runtime state. #[cfg(feature = "try-runtime")] diff --git a/node/src/command.rs b/node/src/command.rs index 2db980474944db7da823bdaf0fef3749d01da1cf..c29878b74f3965a57131d34a61b9499f3c76cca9 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -244,25 +244,25 @@ pub fn run() -> sc_cli::Result<()> { } Some(Subcommand::CheckBlock(cmd)) => { let runner = cli.create_runner(cmd)?; - runner.async_run(|mut config| { + runner.async_run(|config| { let (client, _, import_queue, task_manager) = - service::new_chain_ops(&mut config, cli.sealing.is_manual_consensus())?; + service::new_chain_ops(&config, cli.sealing.is_manual_consensus())?; Ok((cmd.run(client, import_queue), task_manager)) }) } Some(Subcommand::ExportBlocks(cmd)) => { let runner = cli.create_runner(cmd)?; - runner.async_run(|mut config| { + runner.async_run(|config| { let (client, _, _, task_manager) = - service::new_chain_ops(&mut config, cli.sealing.is_manual_consensus())?; + service::new_chain_ops(&config, cli.sealing.is_manual_consensus())?; Ok((cmd.run(client, config.database), task_manager)) }) } Some(Subcommand::ExportState(cmd)) => { let runner = cli.create_runner(cmd)?; - runner.async_run(|mut config| { + runner.async_run(|config| { let (client, _, _, task_manager) = - service::new_chain_ops(&mut config, cli.sealing.is_manual_consensus())?; + service::new_chain_ops(&config, cli.sealing.is_manual_consensus())?; Ok((cmd.run(client, config.chain_spec), task_manager)) }) } @@ -277,7 +277,7 @@ pub fn run() -> sc_cli::Result<()> { } let (client, _, import_queue, task_manager) = - service::new_chain_ops(&mut config, cli.sealing.is_manual_consensus())?; + service::new_chain_ops(&config, cli.sealing.is_manual_consensus())?; Ok((cmd.run(client, import_queue), task_manager)) }) } @@ -287,9 +287,9 @@ pub fn run() -> sc_cli::Result<()> { } Some(Subcommand::Revert(cmd)) => { let runner = cli.create_runner(cmd)?; - runner.async_run(|mut config| { + runner.async_run(|config| { let (client, backend, _, task_manager) = - service::new_chain_ops(&mut config, cli.sealing.is_manual_consensus())?; + service::new_chain_ops(&config, cli.sealing.is_manual_consensus())?; let aux_revert = Box::new(|client, backend, blocks| { service::revert_backend(client, backend, blocks) }); @@ -312,11 +312,11 @@ pub fn run() -> sc_cli::Result<()> { } #[cfg(feature = "runtime-benchmarks")] Some(Subcommand::Benchmark(cmd)) => { - let runner = cli.create_runner(cmd)?; + let runner = cli.create_runner(&**cmd)?; let chain_spec = &runner.config().chain_spec; ensure_dev(chain_spec)?; - match cmd { + match &**cmd { BenchmarkCmd::Storage(cmd) => runner.sync_run(|mut config| { let (client, backend, _, _) = service::new_chain_ops(&mut config, false)?; let db = backend.expose_db(); diff --git a/node/src/command/key.rs b/node/src/command/key.rs index 655ebc2071e03add5365637b80dc8540c65d0ef5..6aa6ffe01847ea07ec85fd92869a7539f1693dd1 100644 --- a/node/src/command/key.rs +++ b/node/src/command/key.rs @@ -20,7 +20,7 @@ use sc_cli::{ use sc_keystore::LocalKeystore; use sc_service::config::{BasePath, KeystoreConfig}; use sp_core::crypto::{AccountId32, KeyTypeId, SecretString}; -use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr}; +use sp_keystore::{Keystore, KeystorePtr}; use std::sync::Arc; #[derive(Debug, clap::Subcommand)] @@ -82,18 +82,17 @@ impl GenSessionKeysCmd { let mut public_keys_bytes = Vec::with_capacity(128); for (key_type_id, crypto_scheme) in KEY_TYPES { let (keystore, public) = match self.keystore_params.keystore_config(&config_dir)? { - (_, KeystoreConfig::Path { path, password }) => { + KeystoreConfig::Path { path, password } => { let public = with_crypto_scheme!(crypto_scheme, to_vec(&suri, password.clone()))?; - let keystore: SyncCryptoStorePtr = - Arc::new(LocalKeystore::open(path, password)?); + let keystore: KeystorePtr = Arc::new(LocalKeystore::open(path, password)?); (keystore, public) } _ => unreachable!("keystore_config always returns path and password; qed"), }; - SyncCryptoStore::insert_unknown(&*keystore, key_type_id, &suri, &public[..]) - .map_err(|_| Error::KeyStoreOperation)?; + Keystore::insert(&*keystore, key_type_id, &suri, &public[..]) + .map_err(|_| Error::KeystoreOperation)?; public_keys_bytes.extend_from_slice(&public[..]); } diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 36dee008a8e037c36cd0b4430a120189b878fb2d..301d4ce9febc08b08b9f4adfec31b5b1664e4ead 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -26,28 +26,48 @@ pub use sc_rpc_api::DenyUnsafe; use common_runtime::Block; use common_runtime::{AccountId, Balance, Index}; use jsonrpsee::RpcModule; +use sc_consensus_babe::BabeApi; +use sc_consensus_babe::BabeWorkerHandle; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; +use sp_consensus::SelectChain; +use sp_keystore::KeystorePtr; use std::sync::Arc; +/// Extra dependencies for BABE. +#[derive(Clone)] +pub struct BabeDeps { + /// A handle to the BABE worker for issuing requests. + pub babe_worker_handle: BabeWorkerHandle<Block>, + /// The keystore that manages the keys of the node. + pub keystore: KeystorePtr, +} + /// Full client dependencies. -pub struct FullDeps<C, P> { +pub struct FullDeps<C, P, SC> { /// The client instance to use. pub client: Arc<C>, /// Transaction pool instance. pub pool: Arc<P>, + /// The SelectChain Strategy + pub select_chain: SC, + /// A copy of the chain spec. + pub chain_spec: Box<dyn sc_chain_spec::ChainSpec>, /// Whether to deny unsafe calls pub deny_unsafe: DenyUnsafe, /// Manual seal command sink - pub command_sink_opt: - Option<futures::channel::mpsc::Sender<manual_seal::EngineCommand<sp_core::H256>>>, + pub command_sink_opt: Option< + futures::channel::mpsc::Sender<sc_consensus_manual_seal::EngineCommand<sp_core::H256>>, + >, + /// BABE specific dependencies. + pub babe: Option<BabeDeps>, } /// Instantiate all full RPC extensions. -pub fn create_full<C, P>( - deps: FullDeps<C, P>, +pub fn create_full<C, P, SC>( + deps: FullDeps<C, P, SC>, ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>> where C: ProvideRuntimeApi<Block>, @@ -55,24 +75,45 @@ where C: Send + Sync + 'static, C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>, + C::Api: BabeApi<Block>, C::Api: BlockBuilder<Block>, P: TransactionPool + 'static, + SC: SelectChain<Block> + 'static, { - use manual_seal::rpc::{ManualSeal, ManualSealApiServer}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; + use sc_consensus_babe_rpc::{Babe, BabeApiServer}; + use sc_consensus_manual_seal::rpc::{ManualSeal, ManualSealApiServer}; use substrate_frame_rpc_system::{System, SystemApiServer}; let mut module = RpcModule::new(()); let FullDeps { client, pool, + select_chain, + chain_spec: _, deny_unsafe, command_sink_opt, + babe, } = deps; + if let Some(babe) = babe { + let BabeDeps { + babe_worker_handle, + keystore, + } = babe; + module.merge( + Babe::new( + client.clone(), + babe_worker_handle, + keystore, + select_chain, + deny_unsafe, + ) + .into_rpc(), + )?; + } module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; module.merge(TransactionPayment::new(client).into_rpc())?; - if let Some(command_sink) = command_sink_opt { // We provide the rpc handler with the sending end of the channel to allow the rpc // send EngineCommands to the background block authorship task. diff --git a/node/src/service.rs b/node/src/service.rs index 78b432c7be726af93ef884fc47d37f5e7b52c24f..4d63bff982e19f894856c515c56d6b75d718c315 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -22,11 +22,11 @@ use self::client::{Client, ClientHandle, RuntimeApiCollection}; use async_io::Timer; use common_runtime::Block; use futures::{Stream, StreamExt}; -use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams}; -use sc_client_api::BlockBackend; +use sc_client_api::client::BlockBackend; +use sc_consensus_grandpa::SharedVoterState; +use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams}; pub use sc_executor::NativeElseWasmExecutor; -use sc_finality_grandpa::SharedVoterState; -use sc_keystore::LocalKeystore; +use sc_network_common::sync::warp::WarpSyncParams; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryWorker}; use sp_core::H256; @@ -129,7 +129,7 @@ impl IdentifyRuntimeType for Box<dyn sc_chain_spec::ChainSpec> { /// Builds a new object suitable for chain operations. #[allow(clippy::type_complexity)] pub fn new_chain_ops( - config: &mut Configuration, + config: &Configuration, manual_consensus: bool, ) -> Result< ( @@ -193,7 +193,7 @@ pub fn new_chain_ops( } } -type FullGrandpaBlockImport<RuntimeApi, Executor> = sc_finality_grandpa::GrandpaBlockImport< +type FullGrandpaBlockImport<RuntimeApi, Executor> = sc_consensus_grandpa::GrandpaBlockImport< FullBackend, Block, FullClient<RuntimeApi, Executor>, @@ -212,13 +212,18 @@ pub fn new_partial<RuntimeApi, Executor>( sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, Executor>>, sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>, ( - babe::BabeBlockImport< + sc_consensus_babe::BabeBlockImport< Block, FullClient<RuntimeApi, Executor>, FullGrandpaBlockImport<RuntimeApi, Executor>, >, - babe::BabeLink<Block>, - sc_finality_grandpa::LinkHalf<Block, FullClient<RuntimeApi, Executor>, FullSelectChain>, + sc_consensus_babe::BabeLink<Block>, + Option<sc_consensus_babe::BabeWorkerHandle<Block>>, + sc_consensus_grandpa::LinkHalf< + Block, + FullClient<RuntimeApi, Executor>, + FullSelectChain, + >, Option<Telemetry>, ), >, @@ -233,12 +238,6 @@ where RuntimeApiCollection<StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>, Executor: sc_executor::NativeExecutionDispatch + 'static, { - if config.keystore_remote.is_some() { - return Err(ServiceError::Other( - "Remote Keystores are not supported.".to_owned(), - )); - } - let telemetry = config .telemetry_endpoints .clone() @@ -250,12 +249,7 @@ where }) .transpose()?; - let executor = NativeElseWasmExecutor::<Executor>::new( - config.wasm_method, - config.default_heap_pages, - config.max_runtime_instances, - config.runtime_cache_size, - ); + let executor = sc_service::new_native_or_wasm_executor(config); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::<Block, RuntimeApi, _>( @@ -282,28 +276,32 @@ where client.clone(), ); - let (grandpa_block_import, grandpa_link) = sc_finality_grandpa::block_import( + let client_ = client.clone(); + let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import( client.clone(), - &(client.clone() as Arc<_>), + &(client_ as Arc<_>), select_chain.clone(), telemetry.as_ref().map(|x| x.handle()), )?; let justification_import = grandpa_block_import.clone(); - let babe_config = babe::configuration(&*client)?; - let (babe_block_import, babe_link) = - babe::block_import(babe_config, grandpa_block_import, client.clone())?; + let (babe_block_import, babe_link) = sc_consensus_babe::block_import( + sc_consensus_babe::configuration(&*client)?, + grandpa_block_import, + client.clone(), + )?; - let import_queue = if consensus_manual { - manual_seal::import_queue( + let (import_queue, babe_worker_handle) = if consensus_manual { + let import_queue = sc_consensus_manual_seal::import_queue( Box::new(babe_block_import.clone()), &task_manager.spawn_essential_handle(), config.prometheus_registry(), - ) + ); + (import_queue, None) } else { let slot_duration = babe_link.config().slot_duration(); - babe::import_queue( + let (queue, handle) = sc_consensus_babe::import_queue( babe_link.clone(), babe_block_import.clone(), Some(Box::new(justification_import)), @@ -317,13 +315,13 @@ where *timestamp, slot_duration, ); - Ok((slot, timestamp)) }, &task_manager.spawn_essential_handle(), config.prometheus_registry(), telemetry.as_ref().map(|x| x.handle()), - )? + )?; + (queue, Some(handle)) }; Ok(sc_service::PartialComponents { @@ -334,17 +332,16 @@ where keystore_container, select_chain, transaction_pool, - other: (babe_block_import, babe_link, grandpa_link, telemetry), + other: ( + babe_block_import, + babe_link, + babe_worker_handle, + grandpa_link, + telemetry, + ), }) } -fn remote_keystore(_url: &str) -> Result<Arc<LocalKeystore>, &'static str> { - // FIXME: here would the concrete keystore be built, - // must return a concrete type (NOT `LocalKeystore`) that - // implements `CryptoStore` and `SyncCryptoStore` - Err("Remote Keystore not supported.") -} - /// Builds a new service for a full client. pub fn new_full<RuntimeApi, Executor>( mut config: Configuration, @@ -364,25 +361,13 @@ where backend, mut task_manager, import_queue, - mut keystore_container, + keystore_container, select_chain, transaction_pool, - other: (block_import, babe_link, grandpa_link, mut telemetry), + other: (block_import, babe_link, babe_worker_handle, grandpa_link, mut telemetry), } = new_partial::<RuntimeApi, Executor>(&config, sealing.is_manual_consensus())?; - if let Some(url) = &config.keystore_remote { - match remote_keystore(url) { - Ok(k) => keystore_container.set_remote_keystore(k), - Err(e) => { - return Err(ServiceError::Other(format!( - "Error hooking up remote keystore for {}: {}", - url, e - ))) - } - }; - } - - let grandpa_protocol_name = sc_finality_grandpa::protocol_standard_name( + let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name( &client .block_hash(0) .ok() @@ -393,16 +378,16 @@ where config .network .extra_sets - .push(sc_finality_grandpa::grandpa_peers_set_config( + .push(sc_consensus_grandpa::grandpa_peers_set_config( grandpa_protocol_name.clone(), )); - let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new( + let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new( backend.clone(), grandpa_link.shared_authority_set().clone(), Vec::default(), )); - let (network, system_rpc_tx, tx_handler_controller, network_starter) = + let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, client: client.clone(), @@ -410,7 +395,7 @@ where spawn_handle: task_manager.spawn_handle(), import_queue, block_announce_validator_builder: None, - warp_sync: Some(warp_sync), + warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), })?; if config.offchain_worker.enabled { @@ -453,7 +438,7 @@ where telemetry.as_ref().map(|x| x.handle()), ); - let sync_cryptostore_ptr = keystore_container.sync_keystore(); + let keystore_ptr = keystore_container.keystore(); let client = client.clone(); if sealing.is_manual_consensus() { @@ -493,9 +478,9 @@ where }; let babe_consensus_data_provider = - manual_seal::consensus::babe::BabeConsensusDataProvider::new( + sc_consensus_manual_seal::consensus::babe::BabeConsensusDataProvider::new( client.clone(), - keystore_container.sync_keystore(), + keystore_container.keystore(), babe_link.epoch_changes().clone(), vec![( sp_consensus_babe::AuthorityId::from( @@ -515,19 +500,19 @@ where client: client.clone(), pool: transaction_pool.clone(), commands_stream, - select_chain, + select_chain: select_chain.clone(), consensus_data_provider: Some(Box::new(babe_consensus_data_provider)), create_inherent_data_providers: move |parent, _| { let client = client.clone(); let distance_dir = distance_dir.clone(); let babe_owner_keys = - std::sync::Arc::new(sp_keystore::SyncCryptoStore::sr25519_public_keys( - sync_cryptostore_ptr.as_ref(), + std::sync::Arc::new(sp_keystore::Keystore::sr25519_public_keys( + keystore_ptr.as_ref(), sp_runtime::KeyTypeId(*b"babe"), )); async move { let timestamp = - manual_seal::consensus::timestamp::SlotTimestampProvider::new_babe( + sc_consensus_manual_seal::consensus::timestamp::SlotTimestampProvider::new_babe( client.clone(), ) .map_err(|err| format!("{:?}", err))?; @@ -549,37 +534,38 @@ where ); } else { let slot_duration = babe_link.config().slot_duration(); - let babe_config = babe::BabeParams { - keystore: keystore_container.sync_keystore(), + let babe_config = sc_consensus_babe::BabeParams { + keystore: keystore_container.keystore(), client: client.clone(), - select_chain, + select_chain: select_chain.clone(), block_import, env: proposer_factory, - sync_oracle: network.clone(), - justification_sync_link: network.clone(), + sync_oracle: sync_service.clone(), + justification_sync_link: sync_service.clone(), create_inherent_data_providers: move |parent, ()| { // This closure is called during each block generation. let client = client.clone(); let distance_dir = distance_dir.clone(); let babe_owner_keys = - std::sync::Arc::new(sp_keystore::SyncCryptoStore::sr25519_public_keys( - sync_cryptostore_ptr.as_ref(), + std::sync::Arc::new(sp_keystore::Keystore::sr25519_public_keys( + keystore_ptr.as_ref(), sp_runtime::KeyTypeId(*b"babe"), )); async move { - let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider( - &*client, parent, - )?; - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *timestamp, - slot_duration, - ); + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + + let storage_proof = + sp_transaction_storage_proof::registration::new_data_provider( + &*client, &parent, + )?; let distance = dc_distance::create_distance_inherent_data_provider::< Block, @@ -589,22 +575,22 @@ where &*client, parent, distance_dir, &babe_owner_keys.clone() )?; - Ok((slot, timestamp, uncles, distance)) + Ok((slot, timestamp, storage_proof, distance)) } }, force_authoring, backoff_authoring_blocks, babe_link, - block_proposal_slot_portion: babe::SlotProportion::new(2f32 / 3f32), + block_proposal_slot_portion: sc_consensus_babe::SlotProportion::new(2f32 / 3f32), max_block_proposal_slot_portion: None, telemetry: telemetry.as_ref().map(|x| x.handle()), }; - let babe = babe::start_babe(babe_config)?; + let babe = sc_consensus_babe::start_babe(babe_config)?; // the BABE authoring task is considered essential, i.e. if it // fails we take down the service with it. task_manager.spawn_essential_handle().spawn_blocking( - "babe", + "babe-proposer", Some("block-authoring"), babe, ); @@ -613,23 +599,23 @@ where let rpc_extensions_builder = { let client = client.clone(); - //let keystore = keystore_container.sync_keystore(); let pool = transaction_pool.clone(); - //let select_chain = select_chain.clone(); - //let chain_spec = config.chain_spec.cloned_box(); + let select_chain = select_chain; + let chain_spec = config.chain_spec.cloned_box(); + let keystore = keystore_container.keystore().clone(); + let babe_deps = babe_worker_handle.map(|babe_worker_handle| crate::rpc::BabeDeps { + babe_worker_handle, + keystore: keystore.clone(), + }); Box::new(move |deny_unsafe, _| { let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), - //select_chain: select_chain.clone(), - //chain_spec: chain_spec.cloned_box(), + select_chain: select_chain.clone(), + chain_spec: chain_spec.cloned_box(), deny_unsafe, - /*babe: crate::rpc::BabeDeps { - babe_config: babe_config.clone(), - shared_epoch_changes: shared_epoch_changes.clone(), - keystore: keystore.clone(), - },*/ + babe: babe_deps.clone(), command_sink_opt: command_sink_opt.clone(), }; @@ -641,8 +627,9 @@ where config, backend, network: network.clone(), + sync_service: sync_service.clone(), client, - keystore: keystore_container.sync_keystore(), + keystore: keystore_container.keystore(), task_manager: &mut task_manager, transaction_pool, rpc_builder: rpc_extensions_builder, @@ -654,12 +641,12 @@ where // if the node isn't actively participating in consensus then it doesn't // need a keystore, regardless of which protocol we use below. let keystore = if role.is_authority() { - Some(keystore_container.sync_keystore()) + Some(keystore_container.keystore()) } else { None }; - let grandpa_config = sc_finality_grandpa::Config { + let grandpa_config = sc_consensus_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), justification_period: 512, @@ -678,11 +665,12 @@ where // and vote data availability than the observer. The observer has not // been tested extensively yet and having most nodes in a network run it // could lead to finality stalls. - let grandpa_config = sc_finality_grandpa::GrandpaParams { + let grandpa_config = sc_consensus_grandpa::GrandpaParams { config: grandpa_config, link: grandpa_link, + sync: sync_service, network, - voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(), + voting_rule: sc_consensus_grandpa::VotingRulesBuilder::default().build(), prometheus_registry, shared_voter_state: SharedVoterState::empty(), telemetry: telemetry.as_ref().map(|x| x.handle()), @@ -693,7 +681,7 @@ where task_manager.spawn_essential_handle().spawn_blocking( "grandpa-voter", None, - sc_finality_grandpa::run_grandpa_voter(grandpa_config)?, + sc_consensus_grandpa::run_grandpa_voter(grandpa_config)?, ); } @@ -736,8 +724,8 @@ impl client::ExecuteWithClient for RevertConsensus { { // Revert consensus-related components. // The operations are not correlated, thus call order is not relevant. - babe::revert(client.clone(), self.backend, self.blocks)?; - sc_finality_grandpa::revert(client, self.blocks)?; + sc_consensus_babe::revert(client.clone(), self.backend, self.blocks)?; + sc_consensus_grandpa::revert(client, self.blocks)?; Ok(()) } } diff --git a/node/src/service/client.rs b/node/src/service/client.rs index ca2c0da8221321e93053bffa6c790a526ca65c0c..e54efcfc35311c564021c1432d0d1a90b83d861c 100644 --- a/node/src/service/client.rs +++ b/node/src/service/client.rs @@ -15,13 +15,15 @@ // along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. use common_runtime::{AccountId, Balance, Block, BlockNumber, Hash, Header, Index}; -use sc_client_api::{AuxStore, Backend as BackendT, BlockchainEvents, KeyIterator, UsageProvider}; +use sc_client_api::{ + AuxStore, Backend as BackendT, BlockchainEvents, KeysIter, PairsIter, UsageProvider, +}; use sp_api::{CallApiAt, NumberFor, ProvideRuntimeApi}; use sp_blockchain::{HeaderBackend, HeaderMetadata}; use sp_consensus::BlockStatus; use sp_core::{Encode, Pair}; use sp_runtime::{ - generic::{BlockId, SignedBlock}, + generic::SignedBlock, traits::{BlakeTwo256, Block as BlockT}, Justifications, }; @@ -237,28 +239,34 @@ macro_rules! match_client { impl sc_client_api::BlockBackend<Block> for Client { fn block_body( &self, - id: &BlockId<Block>, + hash: <Block as BlockT>::Hash, ) -> sp_blockchain::Result<Option<Vec<<Block as BlockT>::Extrinsic>>> { - match_client!(self, block_body(id)) + match_client!(self, block_body(hash)) } fn block_indexed_body( &self, - id: &BlockId<Block>, + hash: <Block as BlockT>::Hash, ) -> sp_blockchain::Result<Option<Vec<Vec<u8>>>> { - match_client!(self, block_indexed_body(id)) + match_client!(self, block_indexed_body(hash)) } - fn block(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<SignedBlock<Block>>> { - match_client!(self, block(id)) + fn block( + &self, + hash: <Block as BlockT>::Hash, + ) -> sp_blockchain::Result<Option<SignedBlock<Block>>> { + match_client!(self, block(hash)) } - fn block_status(&self, id: &BlockId<Block>) -> sp_blockchain::Result<BlockStatus> { - match_client!(self, block_status(id)) + fn block_status(&self, hash: <Block as BlockT>::Hash) -> sp_blockchain::Result<BlockStatus> { + match_client!(self, block_status(hash)) } - fn justifications(&self, id: &BlockId<Block>) -> sp_blockchain::Result<Option<Justifications>> { - match_client!(self, justifications(id)) + fn justifications( + &self, + hash: <Block as BlockT>::Hash, + ) -> sp_blockchain::Result<Option<Justifications>> { + match_client!(self, justifications(hash)) } fn block_hash( @@ -270,17 +278,17 @@ impl sc_client_api::BlockBackend<Block> for Client { fn indexed_transaction( &self, - hash: &<Block as BlockT>::Hash, + id: <Block as BlockT>::Hash, ) -> sp_blockchain::Result<Option<Vec<u8>>> { - match_client!(self, indexed_transaction(hash)) + match_client!(self, indexed_transaction(id)) } - fn has_indexed_transaction( + /*fn has_indexed_transaction( &self, hash: &<Block as BlockT>::Hash, ) -> sp_blockchain::Result<bool> { match_client!(self, has_indexed_transaction(hash)) - } + }*/ fn requires_full_sync(&self) -> bool { match_client!(self, requires_full_sync()) @@ -393,16 +401,15 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for Client { } impl sp_blockchain::HeaderBackend<Block> for Client { - fn header(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<Header>> { - let id = &id; - match_client!(self, header(id)) + fn header(&self, hash: Hash) -> sp_blockchain::Result<Option<Header>> { + match_client!(self, header(hash)) } fn info(&self) -> sp_blockchain::Info<Block> { match_client!(self, info()) } - fn status(&self, id: BlockId<Block>) -> sp_blockchain::Result<sp_blockchain::BlockStatus> { - match_client!(self, status(id)) + fn status(&self, hash: Hash) -> sp_blockchain::Result<sp_blockchain::BlockStatus> { + match_client!(self, status(hash)) } fn number(&self, hash: Hash) -> sp_blockchain::Result<Option<BlockNumber>> { @@ -417,87 +424,73 @@ impl sp_blockchain::HeaderBackend<Block> for Client { impl sc_client_api::StorageProvider<Block, super::FullBackend> for Client { fn storage( &self, - id: &<Block as BlockT>::Hash, + hash: <Block as BlockT>::Hash, key: &StorageKey, ) -> sp_blockchain::Result<Option<StorageData>> { - match_client!(self, storage(id, key)) + match_client!(self, storage(hash, key)) } fn storage_keys( &self, - id: &<Block as BlockT>::Hash, - key_prefix: &StorageKey, - ) -> sp_blockchain::Result<Vec<StorageKey>> { - match_client!(self, storage_keys(id, key_prefix)) + hash: <Block as BlockT>::Hash, + key_prefix: Option<&StorageKey>, + start_key: Option<&StorageKey>, + ) -> sp_blockchain::Result< + KeysIter<<super::FullBackend as sc_client_api::Backend<Block>>::State, Block>, + > { + match_client!(self, storage_keys(hash, key_prefix, start_key)) } fn storage_hash( &self, - id: &<Block as BlockT>::Hash, + hash: <Block as BlockT>::Hash, key: &StorageKey, ) -> sp_blockchain::Result<Option<<Block as BlockT>::Hash>> { - match_client!(self, storage_hash(id, key)) + match_client!(self, storage_hash(hash, key)) } fn storage_pairs( &self, - id: &<Block as BlockT>::Hash, - key_prefix: &StorageKey, - ) -> sp_blockchain::Result<Vec<(StorageKey, StorageData)>> { - match_client!(self, storage_pairs(id, key_prefix)) - } - - fn storage_keys_iter<'a>( - &self, - id: &<Block as BlockT>::Hash, - prefix: Option<&'a StorageKey>, + hash: <Block as BlockT>::Hash, + key_prefix: Option<&StorageKey>, start_key: Option<&StorageKey>, ) -> sp_blockchain::Result< - KeyIterator<'a, <super::FullBackend as sc_client_api::Backend<Block>>::State, Block>, + PairsIter<<super::FullBackend as sc_client_api::Backend<Block>>::State, Block>, > { - match_client!(self, storage_keys_iter(id, prefix, start_key)) + match_client!(self, storage_pairs(hash, key_prefix, start_key)) } fn child_storage( &self, - id: &<Block as BlockT>::Hash, + hash: <Block as BlockT>::Hash, child_info: &ChildInfo, key: &StorageKey, ) -> sp_blockchain::Result<Option<StorageData>> { - match_client!(self, child_storage(id, child_info, key)) + match_client!(self, child_storage(hash, child_info, key)) } fn child_storage_keys( &self, - id: &<Block as BlockT>::Hash, - child_info: &ChildInfo, - key_prefix: &StorageKey, - ) -> sp_blockchain::Result<Vec<StorageKey>> { - match_client!(self, child_storage_keys(id, child_info, key_prefix)) - } - - fn child_storage_keys_iter<'a>( - &self, - id: &<Block as BlockT>::Hash, + hash: <Block as BlockT>::Hash, child_info: ChildInfo, - prefix: Option<&'a StorageKey>, + key_prefix: Option<&StorageKey>, start_key: Option<&StorageKey>, ) -> sp_blockchain::Result< - KeyIterator<'a, <super::FullBackend as sc_client_api::Backend<Block>>::State, Block>, + KeysIter<<super::FullBackend as sc_client_api::Backend<Block>>::State, Block>, > { match_client!( self, - child_storage_keys_iter(id, child_info, prefix, start_key) + child_storage_keys(hash, child_info, key_prefix, start_key) ) } fn child_storage_hash( &self, - id: &<Block as BlockT>::Hash, + hash: <Block as BlockT>::Hash, child_info: &ChildInfo, key: &StorageKey, ) -> sp_blockchain::Result<Option<<Block as BlockT>::Hash>> { - match_client!(self, child_storage_hash(id, child_info, key)) + match_client!(self, child_storage_hash(hash, child_info, key)) } } @@ -519,7 +512,7 @@ pub fn benchmark_inherent_data( // Assume that all runtimes have the `timestamp` pallet. let d = std::time::Duration::from_millis(0); let timestamp = sp_timestamp::InherentDataProvider::new(d.into()); - timestamp.provide_inherent_data(&mut inherent_data)?; + futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data))?; Ok(inherent_data) } diff --git a/pallets/authority-members/Cargo.toml b/pallets/authority-members/Cargo.toml index 0a972dac8d02020d5b2cce6a93e0e4d5a0e12d3c..8337faccb14bc36f4173d5c7c9b43740e8ece047 100644 --- a/pallets/authority-members/Cargo.toml +++ b/pallets/authority-members/Cargo.toml @@ -50,23 +50,23 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -76,22 +76,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-staking] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### @@ -108,4 +108,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' diff --git a/pallets/authority-members/src/lib.rs b/pallets/authority-members/src/lib.rs index b2387ee4423baf1eb92ec59e24cbf56ef93ad2a2..f5d86823d701a7fe5d26b0d983ace1bc139ae408 100644 --- a/pallets/authority-members/src/lib.rs +++ b/pallets/authority-members/src/lib.rs @@ -56,7 +56,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(_); @@ -225,6 +224,7 @@ pub mod pallet { #[pallet::call] impl<T: Config> Pallet<T> { /// ask to leave the set of validators two sessions after + #[pallet::call_index(0)] #[pallet::weight(<T as pallet::Config>::WeightInfo::go_offline())] pub fn go_offline(origin: OriginFor<T>) -> DispatchResultWithPostInfo { // Verification phase // @@ -252,6 +252,7 @@ pub mod pallet { Ok(().into()) } /// ask to join the set of validators two sessions after + #[pallet::call_index(1)] #[pallet::weight(<T as pallet::Config>::WeightInfo::go_online())] pub fn go_online(origin: OriginFor<T>) -> DispatchResultWithPostInfo { // Verification phase // @@ -292,6 +293,7 @@ pub mod pallet { } /// declare new session keys to replace current ones + #[pallet::call_index(2)] #[pallet::weight(<T as pallet::Config>::WeightInfo::set_session_keys())] pub fn set_session_keys( origin: OriginFor<T>, @@ -311,6 +313,7 @@ pub mod pallet { Ok(().into()) } /// remove an identity from the set of authorities + #[pallet::call_index(3)] #[pallet::weight(<T as pallet::Config>::WeightInfo::remove_member())] pub fn remove_member( origin: OriginFor<T>, @@ -323,6 +326,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(4)] #[pallet::weight(<T as pallet::Config>::WeightInfo::remove_member_from_blacklist())] /// remove an identity from the blacklist pub fn remove_member_from_blacklist( diff --git a/pallets/authority-members/src/weights.rs b/pallets/authority-members/src/weights.rs index 7682a59d41e6a51e0e83331f608717baf9a18812..f4160f078ea244501f2cba30c0a7e04695eee4ca 100644 --- a/pallets/authority-members/src/weights.rs +++ b/pallets/authority-members/src/weights.rs @@ -38,7 +38,7 @@ impl WeightInfo for () { // Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) fn go_offline() -> Weight { // Minimum execution time: 120_876 nanoseconds. - Weight::from_ref_time(122_190_000 as u64) + Weight::from_parts(122_190_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(7 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } @@ -52,7 +52,7 @@ impl WeightInfo for () { // Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) fn go_online() -> Weight { // Minimum execution time: 145_521 nanoseconds. - Weight::from_ref_time(157_428_000 as u64) + Weight::from_parts(157_428_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(8 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } @@ -66,7 +66,7 @@ impl WeightInfo for () { // Storage: AuthorityMembers MustRotateKeysBefore (r:1 w:1) fn set_session_keys() -> Weight { // Minimum execution time: 181_682 nanoseconds. - Weight::from_ref_time(192_995_000 as u64) + Weight::from_parts(192_995_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(11 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } @@ -82,14 +82,14 @@ impl WeightInfo for () { // Storage: Session KeyOwner (r:0 w:4) fn remove_member() -> Weight { // Minimum execution time: 246_592 nanoseconds. - Weight::from_ref_time(256_761_000 as u64) + Weight::from_parts(256_761_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(9 as u64)) .saturating_add(RocksDbWeight::get().writes(13 as u64)) } // Storage: AuthorityMembers BlackList (r:1 w:1) fn remove_member_from_blacklist() -> Weight { // Minimum execution time: 60_023 nanoseconds. - Weight::from_ref_time(60_615_000 as u64) + Weight::from_parts(60_615_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } diff --git a/pallets/certification/Cargo.toml b/pallets/certification/Cargo.toml index 66d048c2c56b9bf3e67892fd3514165d6a6ce5a1..99e36b51296685d8b58b563793d97d7ec54a4d5b 100644 --- a/pallets/certification/Cargo.toml +++ b/pallets/certification/Cargo.toml @@ -39,18 +39,18 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -60,17 +60,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.maplit] version = '1.0.2' @@ -87,4 +87,4 @@ version = '1.0.119' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' diff --git a/pallets/certification/src/lib.rs b/pallets/certification/src/lib.rs index f1bcb550a16eb71cd6acf5a9bc64b448b9324f27..5ac000a38f5be9560834b6e51909d63fb436f002 100644 --- a/pallets/certification/src/lib.rs +++ b/pallets/certification/src/lib.rs @@ -51,7 +51,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T, I = ()>(PhantomData<(T, I)>); @@ -281,6 +280,7 @@ pub mod pallet { /// - `receiver`: the account receiving the certification from the origin /// /// The origin must be allow to certify. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::add_cert())] pub fn add_cert( origin: OriginFor<T>, @@ -325,6 +325,7 @@ pub mod pallet { } /// remove a certification (only root) + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::del_cert())] pub fn del_cert( origin: OriginFor<T>, @@ -337,6 +338,7 @@ pub mod pallet { } /// remove all certifications received by an identity (only root) + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::remove_all_certs_received_by(CertsByReceiver::<T, I>::get(idty_index).len() as u32))] pub fn remove_all_certs_received_by( origin: OriginFor<T>, diff --git a/pallets/certification/src/mock.rs b/pallets/certification/src/mock.rs index b93e515cf5112754d87162cd6a0954efde4153a7..6d730c280161a0caa1cd4ff5cfacd723be9b3a84 100644 --- a/pallets/certification/src/mock.rs +++ b/pallets/certification/src/mock.rs @@ -77,20 +77,6 @@ impl system::Config for Test { type MaxConsumers = frame_support::traits::ConstU32<16>; } -pub struct EnsureRoot; -impl frame_support::traits::EnsureOrigin<(RuntimeOrigin, IdtyIndex, IdtyIndex)> for EnsureRoot { - type Success = (); - - fn try_origin( - o: (RuntimeOrigin, IdtyIndex, IdtyIndex), - ) -> Result<Self::Success, (RuntimeOrigin, IdtyIndex, IdtyIndex)> { - match o.0.clone().into() { - Ok(system::RawOrigin::Root) => Ok(()), - _ => Err(o), - } - } -} - parameter_types! { pub const MaxByIssuer: u32 = 4; pub const MinReceivedCertToBeAbleToIssueCert: u32 = 2; diff --git a/pallets/certification/src/weights.rs b/pallets/certification/src/weights.rs index 2d4ed1c30565b3491f9eae58819f41714654e2dd..c3948a95d194fb67c4340aba00fd042d1f898611 100644 --- a/pallets/certification/src/weights.rs +++ b/pallets/certification/src/weights.rs @@ -20,7 +20,6 @@ use frame_support::weights::{constants::RocksDbWeight, Weight}; /// Weight functions needed for pallet_universal_dividend. pub trait WeightInfo { - fn do_add_cert_checked() -> Weight; fn add_cert() -> Weight; fn del_cert() -> Weight; fn remove_all_certs_received_by(i: u32) -> Weight; @@ -28,16 +27,6 @@ pub trait WeightInfo { // Insecure weights implementation, use it for tests only! impl WeightInfo for () { - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Cert StorageCertsRemovableOn (r:1 w:1) - // Storage: Cert CertsByReceiver (r:1 w:1) - fn do_add_cert_checked() -> Weight { - // Minimum execution time: 221_467 nanoseconds. - Weight::from_ref_time(227_833_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) - } // Storage: Identity Identities (r:2 w:0) // Storage: Cert StorageIdtyCertMeta (r:2 w:2) // Storage: Parameters ParametersStorage (r:1 w:0) @@ -45,7 +34,7 @@ impl WeightInfo for () { // Storage: Cert CertsByReceiver (r:1 w:1) fn add_cert() -> Weight { // Minimum execution time: 259_247 nanoseconds. - Weight::from_ref_time(269_348_000 as u64) + Weight::from_parts(269_348_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(7 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } @@ -55,7 +44,7 @@ impl WeightInfo for () { // Storage: Membership Membership (r:1 w:0) fn del_cert() -> Weight { // Minimum execution time: 216_762 nanoseconds. - Weight::from_ref_time(222_570_000 as u64) + Weight::from_parts(222_570_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(3 as u64)) } @@ -66,9 +55,9 @@ impl WeightInfo for () { /// The range of component `i` is `[2, 1000]`. fn remove_all_certs_received_by(i: u32) -> Weight { // Minimum execution time: 223_292 nanoseconds. - Weight::from_ref_time(233_586_000 as u64) + Weight::from_parts(233_586_000 as u64, 0) // Standard Error: 598_929 - .saturating_add(Weight::from_ref_time(53_659_501 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(53_659_501 as u64, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(3 as u64)) .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(i as u64))) .saturating_add(RocksDbWeight::get().writes(1 as u64)) diff --git a/pallets/distance/Cargo.toml b/pallets/distance/Cargo.toml index 56226bf77eb34459f716c51e18332001838d5352..1a08c2f2fd428782d39aee506f315629a47494d2 100644 --- a/pallets/distance/Cargo.toml +++ b/pallets/distance/Cargo.toml @@ -46,42 +46,42 @@ version = '3.1.5' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-authorship] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-session] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-inherents] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs index 45ee644be46120edc2ea2c1dac8c5dc8864a09f8..3ed6ab2902d6424d0963a1f844f5a1ed51d37729 100644 --- a/pallets/distance/src/lib.rs +++ b/pallets/distance/src/lib.rs @@ -19,10 +19,12 @@ mod median; mod traits; mod types; +mod weights; pub use pallet::*; pub use traits::*; pub use types::*; +// pub use weights::WeightInfo; use frame_support::traits::StorageVersion; use pallet_authority_members::SessionIndex; @@ -37,7 +39,7 @@ pub const MAX_EVALUATIONS_PER_SESSION: u32 = 600; /// Maximum number of evaluators in a session pub const MAX_EVALUATORS_PER_SESSION: u32 = 100; -#[frame_support::pallet] +#[frame_support::pallet(dev_mode)] // dev mode while waiting for benchmarks pub mod pallet { use super::*; use frame_support::{pallet_prelude::*, traits::ReservableCurrency}; @@ -48,7 +50,7 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] + // #[pallet::generate_store(pub(super) trait Store)] // deprecated #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(PhantomData<T>); @@ -69,6 +71,8 @@ pub mod pallet { type MinAccessibleReferees: Get<Perbill>; /// Number of session to keep a positive evaluation result type ResultExpiration: Get<u32>; + // /// Type representing the weight of this pallet + // type WeightInfo: WeightInfo; } // STORAGE // @@ -190,7 +194,9 @@ pub mod pallet { #[pallet::call] impl<T: Config> Pallet<T> { /// Request an identity to be evaluated - #[pallet::weight(1_000_000_000)] + #[pallet::call_index(0)] + #[pallet::weight(0)] + // #[pallet::weight(T::WeightInfo::request_distance_evaluation())] pub fn request_distance_evaluation(origin: OriginFor<T>) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -207,7 +213,9 @@ pub mod pallet { } /// (Inherent) Push an evaluation result to the pool - #[pallet::weight(1_000_000_000)] + #[pallet::call_index(1)] + #[pallet::weight(0)] + // #[pallet::weight(T::WeightInfo::update_evaluation())] pub fn update_evaluation( origin: OriginFor<T>, computation_result: ComputationResult, @@ -226,7 +234,9 @@ pub mod pallet { } /// Push an evaluation result to the pool - #[pallet::weight(1_000_000_000)] + #[pallet::call_index(2)] + #[pallet::weight(0)] + // #[pallet::weight(T::WeightInfo::force_update_evaluation())] pub fn force_update_evaluation( origin: OriginFor<T>, evaluator: <T as frame_system::Config>::AccountId, @@ -244,7 +254,9 @@ pub mod pallet { /// * `status.0` is the account for whom the price will be unreserved or slashed /// when the evaluation completes. /// * `status.1` is the status of the evaluation. - #[pallet::weight(1_000_000)] + #[pallet::call_index(3)] + #[pallet::weight(0)] + // #[pallet::weight(T::WeightInfo::force_set_distance_status())] pub fn force_set_distance_status( origin: OriginFor<T>, identity: <T as pallet_identity::Config>::IdtyIndex, diff --git a/pallets/distance/src/weights.rs b/pallets/distance/src/weights.rs new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/pallets/distance/src/weights.rs @@ -0,0 +1 @@ + diff --git a/pallets/duniter-account/Cargo.toml b/pallets/duniter-account/Cargo.toml index 6a6c89920c89419a85aea9d3bde5c8b12f8fba15..f55acb242d4a3f6652686e121146af6dc3ecd1b5 100644 --- a/pallets/duniter-account/Cargo.toml +++ b/pallets/duniter-account/Cargo.toml @@ -44,27 +44,27 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-balances] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-treasury] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -74,22 +74,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### @@ -100,7 +100,7 @@ targets = ['x86_64-unknown-linux-gnu'] [dev-dependencies.pallet-balances] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.maplit] version = '1.0.2' @@ -110,4 +110,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' \ No newline at end of file +branch = 'duniter-substrate-v0.9.42' \ No newline at end of file diff --git a/pallets/duniter-account/src/lib.rs b/pallets/duniter-account/src/lib.rs index 391efe709663df8b5ad979cc2f05a8d71f30b111..9f972a0330ae5bc84b0bff42243aceb18e583e50 100644 --- a/pallets/duniter-account/src/lib.rs +++ b/pallets/duniter-account/src/lib.rs @@ -31,7 +31,7 @@ use frame_support::traits::{OnUnbalanced, StoredMap}; use frame_system::pallet_prelude::*; use pallet_provide_randomness::RequestId; use sp_core::H256; -use sp_runtime::traits::{Convert, Saturating, Zero}; +use sp_runtime::traits::{Convert, Saturating}; #[frame_support::pallet] pub mod pallet { @@ -42,7 +42,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(_); @@ -105,9 +104,22 @@ pub mod pallet { |account| { account.data.random_id = None; account.data.free = T::ExistentialDeposit::get(); - account.providers = 1; + account.sufficients = 1; // the treasury will always be self-sufficient }, ); + + // ensure no duplicate + let endowed_accounts = self + .accounts + .keys() + .cloned() + .collect::<std::collections::BTreeSet<_>>(); + + assert!( + endowed_accounts.len() == self.accounts.len(), + "duplicate balances in genesis." + ); + // Classic accounts for ( account_id, @@ -118,16 +130,23 @@ pub mod pallet { }, ) in &self.accounts { - assert!(!balance.is_zero() || *is_identity); + // if the balance is below existential deposit, the account must be an identity + assert!(balance >= &T::ExistentialDeposit::get() || *is_identity); + // mutate account frame_system::Account::<T>::mutate(account_id, |account| { account.data.random_id = Some(*random_id); - if !balance.is_zero() { - account.data.free = *balance; - account.providers = 1; - } + account.data.free = *balance; if *is_identity { + // if the account is an identity, his identity is sufficient for the account existance account.sufficients = 1; } + if balance >= &T::ExistentialDeposit::get() { + // accounts above existential deposit self-provide + account.providers = 1; + } + // WARN (disabled) all genesis accounts provide for themselves whether they have existential deposit or not + // this is needed to migrate Ğ1 data where identities with zero Ğ1 can exist + // account.providers = 1; }); } } @@ -289,7 +308,7 @@ where f: impl FnOnce(&mut Option<pallet_balances::AccountData<Balance>>) -> Result<R, E>, ) -> Result<R, E> { let account = frame_system::Account::<T>::get(account_id); - let was_providing = account.data.was_providing(); + let was_providing = account.data != T::AccountData::default(); let mut some_data = if was_providing { Some(account.data.into()) } else { @@ -297,19 +316,31 @@ where }; let result = f(&mut some_data)?; let is_providing = some_data.is_some(); - if !was_providing && is_providing { - frame_system::Pallet::<T>::inc_providers(account_id); - PendingNewAccounts::<T>::insert(account_id, ()); - } else if was_providing && !is_providing { - match frame_system::Pallet::<T>::dec_providers(account_id)? { - frame_system::DecRefStatus::Reaped => return Ok(result), - frame_system::DecRefStatus::Exists => { - // Update value as normal... + match (was_providing, is_providing) { + // the account has just been created, increment its provider and request a random_id + (false, true) => { + frame_system::Pallet::<T>::inc_providers(account_id); + PendingNewAccounts::<T>::insert(account_id, ()); + } + // the account was existing but is not anymore, decrement the provider + (true, false) => { + match frame_system::Pallet::<T>::dec_providers(account_id)? { + frame_system::DecRefStatus::Reaped => return Ok(result), + frame_system::DecRefStatus::Exists => { + // Update value as normal + } } } - } else if !was_providing && !is_providing { - return Ok(result); + // mutation on unprovided account + (false, false) => { + return Ok(result); + } + // mutation on provided account + (true, true) => { + // Update value as normal + } } + // do mutate the account by setting the balances frame_system::Account::<T>::mutate(account_id, |a| { a.data.set_balances(some_data.unwrap_or_default()) }); diff --git a/pallets/duniter-account/src/types.rs b/pallets/duniter-account/src/types.rs index 91a23e30877d81afe2f2bd06ca8cffeeefac7592..09d9b795b8ea28988a690de60931d8bd624adc4e 100644 --- a/pallets/duniter-account/src/types.rs +++ b/pallets/duniter-account/src/types.rs @@ -38,20 +38,19 @@ impl<Balance: Zero> AccountData<Balance> { pub fn set_balances(&mut self, new_balances: pallet_balances::AccountData<Balance>) { self.free = new_balances.free; self.reserved = new_balances.reserved; - self.fee_frozen = new_balances.fee_frozen; - } - pub fn was_providing(&self) -> bool { - !self.free.is_zero() || !self.reserved.is_zero() + self.fee_frozen = new_balances.frozen; } } +// convert Duniter AccountData to Balances AccountData +// needed for trait implementation impl<Balance: Zero> From<AccountData<Balance>> for pallet_balances::AccountData<Balance> { fn from(account_data: AccountData<Balance>) -> Self { Self { free: account_data.free, reserved: account_data.reserved, - misc_frozen: Zero::zero(), - fee_frozen: account_data.fee_frozen, + frozen: account_data.fee_frozen, + flags: Default::default(), // default flags since not used } } } diff --git a/pallets/duniter-account/src/weights.rs b/pallets/duniter-account/src/weights.rs index 54386244f04a81aab286c6a166087b0ef7c52119..cfdd6844699beae7274e34f6dfddac2ff2dcd89b 100644 --- a/pallets/duniter-account/src/weights.rs +++ b/pallets/duniter-account/src/weights.rs @@ -40,9 +40,9 @@ impl WeightInfo for () { /// The range of component `i` is `[0, 1]`. fn on_initialize_sufficient(i: u32) -> Weight { // Minimum execution time: 12_958 nanoseconds. - Weight::from_ref_time(14_907_902 as u64) + Weight::from_parts(14_907_902 as u64, 0) // Standard Error: 550_025 - .saturating_add(Weight::from_ref_time(79_482_297 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(79_482_297 as u64, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().reads((6 as u64).saturating_mul(i as u64))) .saturating_add(RocksDbWeight::get().writes((6 as u64).saturating_mul(i as u64))) @@ -58,9 +58,9 @@ impl WeightInfo for () { /// The range of component `i` is `[0, 1]`. fn on_initialize_with_balance(i: u32) -> Weight { // Minimum execution time: 12_965 nanoseconds. - Weight::from_ref_time(16_754_718 as u64) + Weight::from_parts(16_754_718 as u64, 0) // Standard Error: 1_790_537 - .saturating_add(Weight::from_ref_time(164_043_481 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(164_043_481 as u64, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().reads((6 as u64).saturating_mul(i as u64))) .saturating_add(RocksDbWeight::get().writes((6 as u64).saturating_mul(i as u64))) @@ -69,23 +69,23 @@ impl WeightInfo for () { /// The range of component `i` is `[0, 1]`. fn on_initialize_no_balance(i: u32) -> Weight { // Minimum execution time: 12_912 nanoseconds. - Weight::from_ref_time(13_846_469 as u64) + Weight::from_parts(13_846_469 as u64, 0) // Standard Error: 115_598 - .saturating_add(Weight::from_ref_time(67_524_530 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(67_524_530 as u64, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Account PendingRandomIdAssignments (r:1 w:1) fn on_filled_randomness_pending() -> Weight { // Minimum execution time: 66_963 nanoseconds. - Weight::from_ref_time(69_757_000 as u64) + Weight::from_parts(69_757_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } // Storage: Account PendingRandomIdAssignments (r:1 w:0) fn on_filled_randomness_no_pending() -> Weight { // Minimum execution time: 16_088 nanoseconds. - Weight::from_ref_time(27_963_000 as u64) + Weight::from_parts(27_963_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) } } diff --git a/pallets/duniter-test-parameters/Cargo.toml b/pallets/duniter-test-parameters/Cargo.toml index 7fef56df4e1fac59126aa986c2fb22ad921d4d75..1fe4019fda511e58e8eb16b61e5e1450f0d770b4 100644 --- a/pallets/duniter-test-parameters/Cargo.toml +++ b/pallets/duniter-test-parameters/Cargo.toml @@ -39,32 +39,32 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/pallets/duniter-test-parameters/src/lib.rs b/pallets/duniter-test-parameters/src/lib.rs index cd688fd913b98d5d1ea6623aa37fbc768b05de4b..0f75c3296a6272358c75333984b7f7bae308c24f 100644 --- a/pallets/duniter-test-parameters/src/lib.rs +++ b/pallets/duniter-test-parameters/src/lib.rs @@ -71,7 +71,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(_); diff --git a/pallets/duniter-wot/Cargo.toml b/pallets/duniter-wot/Cargo.toml index 07b3f0ddeb847a01bfdaeea76810da3eeb242ae9..e86400ac175260a38fc6aaba1908d7b1376cd3b6 100644 --- a/pallets/duniter-wot/Cargo.toml +++ b/pallets/duniter-wot/Cargo.toml @@ -52,17 +52,17 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -72,22 +72,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### @@ -100,4 +100,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs index 832f99678139d1a5d3b6d828316730ce6921e2ad..bcd64dafafc59d15314af3ced929c5e2d3fdea98 100644 --- a/pallets/duniter-wot/src/lib.rs +++ b/pallets/duniter-wot/src/lib.rs @@ -53,7 +53,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T, I = ()>(_); diff --git a/pallets/identity/Cargo.toml b/pallets/identity/Cargo.toml index fc5e036c7b85d5f6dcd0ec511766ae2e003eee25..a34f6f5c8f7cfb65e331b9ea3b5d967ec441cecd 100644 --- a/pallets/identity/Cargo.toml +++ b/pallets/identity/Cargo.toml @@ -41,39 +41,39 @@ serde = { version = "1.0.101", features = ["derive"], optional = true } default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies] serde = '1.0.119' -sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-keystore = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42' } +sp-keystore = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42' } diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs index d461db17198511eb79b190b6f53a42747f99824d..25733edb5dcf702b504fed68b751405a2856be64 100644 --- a/pallets/identity/src/lib.rs +++ b/pallets/identity/src/lib.rs @@ -55,7 +55,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(_); @@ -272,6 +271,7 @@ pub mod pallet { /// - `owner_key`: the public key corresponding to the identity to be created /// /// The origin must be allowed to create an identity. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::create_identity())] pub fn create_identity( origin: OriginFor<T>, @@ -336,6 +336,7 @@ pub mod pallet { /// - `idty_name`: the name uniquely associated to this identity. Must match the validation rules defined by the runtime. /// /// The identity must have been created using `create_identity` before it can be confirmed. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::confirm_identity())] pub fn confirm_identity( origin: OriginFor<T>, @@ -375,6 +376,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::validate_identity())] /// validate the owned identity (must meet the main wot requirements) // automatically claim membership if not done @@ -414,6 +416,7 @@ pub mod pallet { /// Must be signed by `new_key`. /// /// The origin should be the old identity owner key. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::change_owner_key())] pub fn change_owner_key( origin: OriginFor<T>, @@ -497,6 +500,7 @@ pub mod pallet { /// Must be signed by `revocation_key`. /// /// Any signed origin can execute this call. + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::revoke_identity())] pub fn revoke_identity( origin: OriginFor<T>, @@ -542,6 +546,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(5)] #[pallet::weight(T::WeightInfo::remove_identity())] /// remove an identity from storage pub fn remove_identity( @@ -560,6 +565,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(6)] #[pallet::weight(T::WeightInfo::prune_item_identities_names(names.len() as u32))] /// remove identity names from storage pub fn prune_item_identities_names( @@ -575,6 +581,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(7)] #[pallet::weight(T::WeightInfo::fix_sufficients())] /// change sufficient ref count for given key pub fn fix_sufficients( diff --git a/pallets/identity/src/mock.rs b/pallets/identity/src/mock.rs index 9d00c669bc8b45e6bc0cb48f2e0eaa9440063567..ce6032d08c8059ab0935ce54a21d2b68961b0229 100644 --- a/pallets/identity/src/mock.rs +++ b/pallets/identity/src/mock.rs @@ -22,7 +22,7 @@ use frame_support::{ }; use frame_system as system; use sp_core::{Pair, H256}; -use sp_keystore::{testing::KeyStore, KeystoreExt}; +use sp_keystore::{testing::MemoryKeystore, KeystoreExt}; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, @@ -134,7 +134,7 @@ pub fn new_test_ext(gen_conf: pallet_identity::GenesisConfig<Test>) -> sp_io::Te frame_system::Pallet::<Test>::inc_providers(&account(3)); }); - let keystore = KeyStore::new(); + let keystore = MemoryKeystore::new(); let mut ext = sp_io::TestExternalities::new(t); ext.register_extension(KeystoreExt(Arc::new(keystore))); ext.execute_with(|| System::set_block_number(1)); diff --git a/pallets/identity/src/tests.rs b/pallets/identity/src/tests.rs index 7facdaa60930624b9a81901f50cd6cebf2dfafa6..c8e116999820b9c5929704f42ac1cba17efa7993 100644 --- a/pallets/identity/src/tests.rs +++ b/pallets/identity/src/tests.rs @@ -383,8 +383,8 @@ fn test_idty_revocation_with_old_key() { (NEW_OWNER_KEY_PAYLOAD_PREFIX, new_key_payload).encode() ) )); - assert!(Identity::identity(&1).is_some()); - let idty_val = Identity::identity(&1).unwrap(); + assert!(Identity::identity(1).is_some()); + let idty_val = Identity::identity(1).unwrap(); assert_eq!(idty_val.owner_key, account(10).id); assert_eq!(idty_val.old_owner_key, Some((account(1).id, 1))); @@ -433,8 +433,8 @@ fn test_idty_revocation_with_old_key_after_old_key_expiration() { (NEW_OWNER_KEY_PAYLOAD_PREFIX, new_key_payload).encode() ) )); - assert!(Identity::identity(&1).is_some()); - let idty_val = Identity::identity(&1).unwrap(); + assert!(Identity::identity(1).is_some()); + let idty_val = Identity::identity(1).unwrap(); assert_eq!(idty_val.owner_key, account(10).id); assert_eq!(idty_val.old_owner_key, Some((account(1).id, 1))); diff --git a/pallets/identity/src/types.rs b/pallets/identity/src/types.rs index e7c98f307a7ce33a2c48c2548c7e589632b83be7..786aae6ab1be8794f0cf65c847304821f003b86c 100644 --- a/pallets/identity/src/types.rs +++ b/pallets/identity/src/types.rs @@ -85,9 +85,10 @@ impl<'de> serde::Deserialize<'de> for IdtyName { /// used for temporary period before validation /// also used for buffer when losing membership before being deleted #[cfg_attr(feature = "std", derive(Deserialize, Serialize))] -#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)] +#[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)] pub enum IdtyStatus { /// created through a first certification + #[default] Created, /// confirmed by owner with a name published ConfirmedByOwner, @@ -96,11 +97,6 @@ pub enum IdtyStatus { // disabled by the main web of trust, deletion planned // Disabled, } -impl Default for IdtyStatus { - fn default() -> Self { - IdtyStatus::Created - } -} /// identity value (as in key/value) #[cfg_attr(feature = "std", derive(Debug, Deserialize, Serialize))] diff --git a/pallets/identity/src/weights.rs b/pallets/identity/src/weights.rs index 14ef8a951d324b093ad8ae31f9460b60bb063b2d..0f1246f69e98b0ebdc0cb24c3a72434eb9b17e9a 100644 --- a/pallets/identity/src/weights.rs +++ b/pallets/identity/src/weights.rs @@ -44,7 +44,7 @@ impl WeightInfo for () { // Storage: Cert CertsByReceiver (r:1 w:1) fn create_identity() -> Weight { // Minimum execution time: 440_987 nanoseconds. - Weight::from_ref_time(462_747_000 as u64) + Weight::from_parts(462_747_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(13 as u64)) .saturating_add(RocksDbWeight::get().writes(11 as u64)) } @@ -57,7 +57,7 @@ impl WeightInfo for () { // Storage: Membership PendingMembershipsExpireOn (r:1 w:1) fn confirm_identity() -> Weight { // Minimum execution time: 186_617 nanoseconds. - Weight::from_ref_time(309_527_000 as u64) + Weight::from_parts(309_527_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(7 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } @@ -71,7 +71,7 @@ impl WeightInfo for () { // Storage: UniversalDividend CurrentUdIndex (r:1 w:0) fn validate_identity() -> Weight { // Minimum execution time: 299_920 nanoseconds. - Weight::from_ref_time(320_025_000 as u64) + Weight::from_parts(320_025_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(8 as u64)) .saturating_add(RocksDbWeight::get().writes(5 as u64)) } @@ -83,7 +83,7 @@ impl WeightInfo for () { // Storage: AuthorityMembers Members (r:1 w:0) fn change_owner_key() -> Weight { // Minimum execution time: 442_260 nanoseconds. - Weight::from_ref_time(728_714_000 as u64) + Weight::from_parts(728_714_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(7 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } @@ -99,7 +99,7 @@ impl WeightInfo for () { // Storage: Identity IdentityIndexOf (r:0 w:1) fn revoke_identity() -> Weight { // Minimum execution time: 494_407 nanoseconds. - Weight::from_ref_time(800_824_000 as u64) + Weight::from_parts(800_824_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(10 as u64)) .saturating_add(RocksDbWeight::get().writes(8 as u64)) } @@ -115,7 +115,7 @@ impl WeightInfo for () { // Storage: Identity IdentitiesNames (r:0 w:1) fn remove_identity() -> Weight { // Minimum execution time: 302_574 nanoseconds. - Weight::from_ref_time(504_132_000 as u64) + Weight::from_parts(504_132_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(9 as u64)) .saturating_add(RocksDbWeight::get().writes(9 as u64)) } @@ -123,15 +123,15 @@ impl WeightInfo for () { /// The range of component `i` is `[1, 1000]`. fn prune_item_identities_names(i: u32) -> Weight { // Minimum execution time: 22_533 nanoseconds. - Weight::from_ref_time(282_674_421 as u64) + Weight::from_parts(282_674_421 as u64, 0) // Standard Error: 170_391 - .saturating_add(Weight::from_ref_time(5_660_460 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(5_660_460 as u64, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: System Account (r:1 w:1) fn fix_sufficients() -> Weight { // Minimum execution time: 112_793 nanoseconds. - Weight::from_ref_time(122_192_000 as u64) + Weight::from_parts(122_192_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(1 as u64)) .saturating_add(RocksDbWeight::get().writes(1 as u64)) } diff --git a/pallets/membership/Cargo.toml b/pallets/membership/Cargo.toml index 337ef40710b28be1a1f6e3087efbe0120ed1a39c..44216709603cb209103cc72440208b8131ddfa82 100644 --- a/pallets/membership/Cargo.toml +++ b/pallets/membership/Cargo.toml @@ -43,17 +43,17 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -63,17 +63,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### @@ -91,4 +91,4 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs index b998ce5b5b35f4eb57910ad69b09dd88fce6ebf3..8fec34f89f39d6656565a09d01d07b348ad4acf1 100644 --- a/pallets/membership/src/lib.rs +++ b/pallets/membership/src/lib.rs @@ -53,7 +53,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T, I = ()>(_); @@ -203,6 +202,7 @@ pub mod pallet { impl<T: Config<I>, I: 'static> Pallet<T, I> { /// submit a membership request (must have a declared identity) /// (only available for sub wot, automatic for main wot) + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::request_membership())] pub fn request_membership( origin: OriginFor<T>, @@ -222,6 +222,7 @@ pub mod pallet { /// claim pending membership to become actual memberhip /// the requested membership must fullfill requirements // for main wot claim_membership is called automatically when validating identity + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::claim_membership())] pub fn claim_membership(origin: OriginFor<T>) -> DispatchResultWithPostInfo { // get identity @@ -233,6 +234,7 @@ pub mod pallet { } /// extend the validity period of an active membership + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::renew_membership())] pub fn renew_membership(origin: OriginFor<T>) -> DispatchResultWithPostInfo { // Verify phase @@ -253,6 +255,7 @@ pub mod pallet { /// revoke an active membership /// (only available for sub wot, automatic for main wot) + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::revoke_membership())] pub fn revoke_membership(origin: OriginFor<T>) -> DispatchResultWithPostInfo { // Verify phase diff --git a/pallets/membership/src/weights.rs b/pallets/membership/src/weights.rs index efd18e4571e2f150bc9f3c676a0c250b77664cad..4012544a7df34b2e460e1ff05917efe697d68ae1 100644 --- a/pallets/membership/src/weights.rs +++ b/pallets/membership/src/weights.rs @@ -20,7 +20,6 @@ use frame_support::weights::{constants::RocksDbWeight, Weight}; /// Weight functions needed for pallet_universal_dividend. pub trait WeightInfo { - fn force_request_membership() -> Weight; fn request_membership() -> Weight; fn claim_membership() -> Weight; fn renew_membership() -> Weight; @@ -29,21 +28,11 @@ pub trait WeightInfo { // Insecure weights implementation, use it for tests only! impl WeightInfo for () { - // Storage: Membership PendingMembership (r:1 w:1) - // Storage: Membership Membership (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership PendingMembershipsExpireOn (r:1 w:1) - fn force_request_membership() -> Weight { - // Minimum execution time: 89_725 nanoseconds. - Weight::from_ref_time(98_333_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) - } // Storage: Identity IdentityIndexOf (r:1 w:0) // Storage: Identity Identities (r:1 w:0) fn request_membership() -> Weight { // Minimum execution time: 48_477 nanoseconds. - Weight::from_ref_time(50_689_000 as u64) + Weight::from_parts(50_689_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(2 as u64)) } // Storage: Identity IdentityIndexOf (r:1 w:0) @@ -55,7 +44,7 @@ impl WeightInfo for () { // Storage: Membership MembershipsExpireOn (r:1 w:1) fn claim_membership() -> Weight { // Minimum execution time: 144_079 nanoseconds. - Weight::from_ref_time(146_565_000 as u64) + Weight::from_parts(146_565_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(7 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } @@ -66,7 +55,7 @@ impl WeightInfo for () { // Storage: Membership MembershipsExpireOn (r:1 w:1) fn renew_membership() -> Weight { // Minimum execution time: 120_859 nanoseconds. - Weight::from_ref_time(124_222_000 as u64) + Weight::from_parts(124_222_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } @@ -77,7 +66,7 @@ impl WeightInfo for () { // Storage: UniversalDividend CurrentUdIndex (r:1 w:0) fn revoke_membership() -> Weight { // Minimum execution time: 109_486 nanoseconds. - Weight::from_ref_time(113_303_000 as u64) + Weight::from_parts(113_303_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(5 as u64)) .saturating_add(RocksDbWeight::get().writes(2 as u64)) } diff --git a/pallets/offences/Cargo.toml b/pallets/offences/Cargo.toml index 3abdb818ef340dcdbe673dc5123ab9b4b63f5237..e3214bab5c2970dbe70dcce52c909402d24c49d8 100644 --- a/pallets/offences/Cargo.toml +++ b/pallets/offences/Cargo.toml @@ -17,16 +17,16 @@ codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", default-features = false, optional = true } -frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } [dev-dependencies] -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42' } [features] default = ["std"] diff --git a/pallets/offences/src/mock.rs b/pallets/offences/src/mock.rs index 1229f75591881beefe3606ac98d515fd2497c6b6..57f8e73990729b2822f1b515b9f4059fe94d44de 100644 --- a/pallets/offences/src/mock.rs +++ b/pallets/offences/src/mock.rs @@ -114,7 +114,7 @@ pub const KIND: [u8; 16] = *b"test_report_1234"; /// Returns all offence details for the specific `kind` happened at the specific time slot. pub fn offence_reports(kind: Kind, time_slot: u128) -> Vec<OffenceDetails<u64, u64>> { - <crate::ConcurrentReportsIndex<Runtime>>::get(kind, &time_slot.encode()) + <crate::ConcurrentReportsIndex<Runtime>>::get(kind, time_slot.encode()) .into_iter() .map(|report_id| { <crate::Reports<Runtime>>::get(report_id) diff --git a/pallets/oneshot-account/Cargo.toml b/pallets/oneshot-account/Cargo.toml index 361a7345f29351da6c260297e708d3c39319f8ed..fc39c81a38c85552c976c863ca81423ac3d36dd3 100644 --- a/pallets/oneshot-account/Cargo.toml +++ b/pallets/oneshot-account/Cargo.toml @@ -34,49 +34,49 @@ log = { version = "0.4.14", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # benchmarks -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', optional = true, default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', optional = true, default-features = false } # substrate [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### @@ -87,8 +87,8 @@ targets = ['x86_64-unknown-linux-gnu'] [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.pallet-balances] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' diff --git a/pallets/oneshot-account/src/lib.rs b/pallets/oneshot-account/src/lib.rs index 91d782b56aaa4a91b2855938e7456423c8f301bc..5cd932d7d25ca7e74aaec9ff485d86c98cc24a10 100644 --- a/pallets/oneshot-account/src/lib.rs +++ b/pallets/oneshot-account/src/lib.rs @@ -40,14 +40,8 @@ use sp_std::convert::TryInto; #[frame_support::pallet] pub mod pallet { use super::*; - use frame_support::traits::StorageVersion; - - /// The current storage version. - const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] - #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(_); @@ -131,6 +125,7 @@ pub mod pallet { /// - `balance`: The balance to be transfered to this oneshot account. /// /// Origin account is kept alive. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::create_oneshot_account())] pub fn create_oneshot_account( origin: OriginFor<T>, @@ -169,6 +164,7 @@ pub mod pallet { /// - `block_height`: Must be a recent block number. The limit is `BlockHashCount` in the past. (this is to prevent replay attacks) /// - `dest`: The destination account. /// - `dest_is_oneshot`: If set to `true`, then a oneshot account is created at `dest`. Else, `dest` has to be an existing account. + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::consume_oneshot_account())] pub fn consume_oneshot_account( origin: OriginFor<T>, @@ -227,6 +223,7 @@ pub mod pallet { /// - `dest2`: The second destination account. /// - `dest2_is_oneshot`: If set to `true`, then a oneshot account is created at `dest2`. Else, `dest2` has to be an existing account. /// - `balance1`: The amount transfered to `dest`, the leftover being transfered to `dest2`. + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::consume_oneshot_account_with_remaining())] pub fn consume_oneshot_account_with_remaining( origin: OriginFor<T>, diff --git a/pallets/oneshot-account/src/mock.rs b/pallets/oneshot-account/src/mock.rs index 2de61147981ddad8996323d54579d393b42835b0..4353000adf02643d8493bc9f51b9e7d2995cdda7 100644 --- a/pallets/oneshot-account/src/mock.rs +++ b/pallets/oneshot-account/src/mock.rs @@ -18,7 +18,7 @@ use crate::{self as pallet_oneshot_account}; use frame_support::{parameter_types, traits::Everything, weights::IdentityFee}; use frame_system as system; use pallet_transaction_payment::CurrencyAdapter; -use sp_core::H256; +use sp_core::{ConstU32, H256}; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, @@ -91,6 +91,10 @@ impl pallet_balances::Config for Test { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } impl pallet_transaction_payment::Config for Test { type RuntimeEvent = RuntimeEvent; @@ -118,7 +122,7 @@ impl frame_support::traits::OnUnbalanced<NegativeImbalance> for HandleFees { pub fn new_test_ext() -> sp_io::TestExternalities { GenesisConfig { system: SystemConfig::default(), - balances: BalancesConfig::default(), + balances: BalancesConfig::default(), // FIXME (explicit absence of oneshot account in genesis) } .build_storage() .unwrap() diff --git a/pallets/oneshot-account/src/weights.rs b/pallets/oneshot-account/src/weights.rs index 4fe386ab942d4798fb7e03bd4ac911d6fd867df0..5308ff1d06526f0cdea54719c84ff08d1dc2cd9c 100644 --- a/pallets/oneshot-account/src/weights.rs +++ b/pallets/oneshot-account/src/weights.rs @@ -29,7 +29,7 @@ pub trait WeightInfo { impl WeightInfo for () { // Storage: OneshotAccount OneshotAccounts (r:1 w:1) fn create_oneshot_account() -> Weight { - (Weight::from_ref_time(45_690_000)) + (Weight::from_parts(45_690_000, 0)) .saturating_add(RocksDbWeight::get().reads(1)) .saturating_add(RocksDbWeight::get().writes(1)) } @@ -37,7 +37,7 @@ impl WeightInfo for () { // Storage: System BlockHash (r:1 w:0) // Storage: System Account (r:1 w:1) fn consume_oneshot_account() -> Weight { - (Weight::from_ref_time(50_060_000)) + (Weight::from_parts(50_060_000, 0)) .saturating_add(RocksDbWeight::get().reads(3)) .saturating_add(RocksDbWeight::get().writes(2)) } @@ -45,7 +45,7 @@ impl WeightInfo for () { // Storage: System BlockHash (r:1 w:0) // Storage: System Account (r:2 w:2) fn consume_oneshot_account_with_remaining() -> Weight { - (Weight::from_ref_time(69_346_000)) + (Weight::from_parts(69_346_000, 0)) .saturating_add(RocksDbWeight::get().reads(4)) .saturating_add(RocksDbWeight::get().writes(3)) } diff --git a/pallets/provide-randomness/Cargo.toml b/pallets/provide-randomness/Cargo.toml index 5b05596a6257812b4bf532063e9fdc29dc6c024b..b5d6f5b286de75281c3ecc5d929c4e40c9a3bad9 100644 --- a/pallets/provide-randomness/Cargo.toml +++ b/pallets/provide-randomness/Cargo.toml @@ -31,7 +31,7 @@ try-runtime = ['frame-support/try-runtime'] scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # benchmarks -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', optional = true, default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', optional = true, default-features = false } [dependencies.codec] default-features = false @@ -43,37 +43,37 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/pallets/provide-randomness/src/lib.rs b/pallets/provide-randomness/src/lib.rs index bf851ebf11cf46062ccdc787ed066a323657d5ef..8abba63a029b6deca2ca98db31522092acfafafe 100644 --- a/pallets/provide-randomness/src/lib.rs +++ b/pallets/provide-randomness/src/lib.rs @@ -62,7 +62,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet<T>(_); @@ -147,6 +146,7 @@ pub mod pallet { #[pallet::call] impl<T: Config> Pallet<T> { /// Request a randomness + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::request())] pub fn request( origin: OriginFor<T>, diff --git a/pallets/provide-randomness/src/weights.rs b/pallets/provide-randomness/src/weights.rs index 7c2e0831860606114665a06e559b5da19f889800..cc3edaf1708323fdfa11e159ef212c15038b97c7 100644 --- a/pallets/provide-randomness/src/weights.rs +++ b/pallets/provide-randomness/src/weights.rs @@ -34,7 +34,7 @@ impl WeightInfo for () { // Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) fn request() -> Weight { // Minimum execution time: 321_822 nanoseconds. - Weight::from_ref_time(338_919_000 as u64) + Weight::from_parts(338_919_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(6 as u64)) .saturating_add(RocksDbWeight::get().writes(4 as u64)) } @@ -47,9 +47,9 @@ impl WeightInfo for () { /// The range of component `i` is `[1, 100]`. fn on_initialize(i: u32) -> Weight { // Minimum execution time: 175_645 nanoseconds. - Weight::from_ref_time(461_442_906 as u64) + Weight::from_parts(461_442_906 as u64, 0) // Standard Error: 1_523_561 - .saturating_add(Weight::from_ref_time(43_315_015 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_parts(43_315_015 as u64, 0).saturating_mul(i as u64)) .saturating_add(RocksDbWeight::get().reads(4 as u64)) .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(i as u64))) .saturating_add(RocksDbWeight::get().writes(3 as u64)) diff --git a/pallets/session-benchmarking/Cargo.toml b/pallets/session-benchmarking/Cargo.toml index e561e345ba11bea12b52394d255cf96a28d2ee9f..1ef5f28922f6a0cadb23e9f7e93c8854bba39804 100644 --- a/pallets/session-benchmarking/Cargo.toml +++ b/pallets/session-benchmarking/Cargo.toml @@ -21,37 +21,37 @@ pallet-authority-members = { path = "../authority-members", default-features = f default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-session] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-session] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.parity-scale-codec] default-features = false @@ -62,22 +62,22 @@ version = "3.1.5" [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.pallet-timestamp] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [features] default = ["std"] diff --git a/pallets/universal-dividend/Cargo.toml b/pallets/universal-dividend/Cargo.toml index d350b9cd13a232c70c183e4e2a7c0d51fe392f93..53172924b44edf88270fbfdb614b337f30040239 100644 --- a/pallets/universal-dividend/Cargo.toml +++ b/pallets/universal-dividend/Cargo.toml @@ -34,43 +34,43 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" serde = { version = "1.0.101", features = ["derive"], optional = true } # substrate bencharks -frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', optional = true, default-features = false } -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', optional = true, default-features = false } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', optional = true, default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', optional = true, default-features = false } [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### @@ -85,16 +85,16 @@ serde = { version = "1.0.101", features = ["derive"] } [dev-dependencies.pallet-balances] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.sp-core] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dev-dependencies.sp-runtime] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' diff --git a/pallets/universal-dividend/src/benchmarking.rs b/pallets/universal-dividend/src/benchmarking.rs index 4edfc2356afd5060e4e25378d6fbc6b4403439dc..5d2c636323be4f94535e8ed3c36f0cfd749058b7 100644 --- a/pallets/universal-dividend/src/benchmarking.rs +++ b/pallets/universal-dividend/src/benchmarking.rs @@ -18,9 +18,9 @@ use super::*; -use frame_benchmarking::{account, benchmarks, whitelist_account, whitelisted_caller}; -use frame_support::pallet_prelude::{BoundedVec, IsType}; -use frame_support::traits::{Get, OnInitialize}; +use frame_benchmarking::{account, benchmarks, whitelisted_caller}; +use frame_support::pallet_prelude::IsType; +use frame_support::traits::Get; // OnTimestampSet use frame_system::RawOrigin; use pallet_balances::Pallet as Balances; use sp_runtime::traits::Bounded; @@ -31,76 +31,8 @@ const ED_MULTIPLIER: u32 = 10; const SEED: u32 = 0; benchmarks! { - where_clause { - where - T: pallet_balances::Config, T::Balance: From<u64>, - <T::Currency as Currency<T::AccountId>>::Balance: IsType<T::Balance> - } - on_initialize { - let total_money_created = Pallet::<T>::total_money_created(); - }: { Pallet::<T>::on_initialize(1_u32.into()); } - verify { - assert_eq!(Pallet::<T>::total_money_created(), total_money_created); - } - where_clause { - where - T: pallet_balances::Config, T::Balance: From<u64>, - <T::Currency as Currency<T::AccountId>>::Balance: IsType<T::Balance> - } - on_initialize_ud_created { - let block_number = T::UdCreationPeriod::get(); - let block_number_plus_one: T::BlockNumber = block_number + One::one(); - NextReeval::<T>::put(block_number_plus_one); - }: { Pallet::<T>::on_initialize(block_number); } - verify { - } - where_clause { - where - T: pallet_balances::Config, T::Balance: From<u64>, - <T::Currency as Currency<T::AccountId>>::Balance: IsType<T::Balance> - } - on_initialize_ud_reevalued { - let block_number = T::UdCreationPeriod::get(); - let block_number_plus_one: T::BlockNumber = block_number + One::one(); - NextReeval::<T>::put(block_number_plus_one); - Pallet::<T>::on_initialize(block_number); - NextReeval::<T>::put(block_number); - }: { Pallet::<T>::on_initialize(block_number); } - verify { - } - // Benchmark `claim_uds` extrinsic with the worst possible conditions: - // * UDs have never been claimed - // * The maximum number of revaluations has taken place since - where_clause { - where - T: pallet_balances::Config, T::Balance: From<u64>, - <T::Currency as Currency<T::AccountId>>::Balance: IsType<T::Balance> - } - claim_uds { - let n in 1 .. T::MaxPastReeval::get(); - - // Caller should be a member - let caller: T::AccountId = T::MembersStorageIter::from(None) - .next() - .expect("we need at least one member") - .0; - - // Simulate n reevals - let mut past_reevals = BoundedVec::default(); - for i in 0..n { - past_reevals - .try_push((((3 * i) + 1) as u16, (1_000 + (100 * i)).into())) - .expect("unreachable claim"); - } - PastReevals::<T>::put(past_reevals); - // Simulate 3n+2 UDs - CurrentUdIndex::<T>::put(((3 * n) + 2) as u16); - - whitelist_account!(caller); - }: claim_uds(RawOrigin::Signed(caller)) - verify { - } + // TODO write benchmarks for new UD creation hook (on_timestamp_set) // Benchmark `transfer_ud` extrinsic with the worst possible conditions: // * Transfer will kill the sender account. diff --git a/pallets/universal-dividend/src/lib.rs b/pallets/universal-dividend/src/lib.rs index 6617bf0acbeb929a71f0c11a6ed41eefe6756296..4b669a86220388e91013ba926a7345a46fc881b6 100644 --- a/pallets/universal-dividend/src/lib.rs +++ b/pallets/universal-dividend/src/lib.rs @@ -52,7 +52,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] //#[pallet::without_storage_info] pub struct Pallet<T>(_); @@ -192,10 +191,11 @@ pub mod pallet { { fn build(&self) { assert!(!self.ud.is_zero()); - assert!(self.initial_monetary_mass >= T::Currency::total_issuance()); <CurrentUd<T>>::put(self.ud); + // totalissuance should be updated to the same amount <MonetaryMass<T>>::put(self.initial_monetary_mass); + NextReeval::<T>::set(self.first_reeval); NextUd::<T>::set(self.first_ud); let mut past_reevals = BoundedVec::default(); @@ -394,12 +394,14 @@ pub mod pallet { #[pallet::call] impl<T: Config> Pallet<T> { /// Claim Universal Dividends + #[pallet::call_index(0)] #[pallet::weight(<T as pallet::Config>::WeightInfo::claim_uds(T::MaxPastReeval::get()))] pub fn claim_uds(origin: OriginFor<T>) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; Self::do_claim_uds(&who) } /// Transfer some liquid free balance to another account, in milliUD. + #[pallet::call_index(1)] #[pallet::weight(<T as pallet::Config>::WeightInfo::transfer_ud())] pub fn transfer_ud( origin: OriginFor<T>, @@ -410,6 +412,7 @@ pub mod pallet { } /// Transfer some liquid free balance to another account, in milliUD. + #[pallet::call_index(2)] #[pallet::weight(<T as pallet::Config>::WeightInfo::transfer_ud_keep_alive())] pub fn transfer_ud_keep_alive( origin: OriginFor<T>, diff --git a/pallets/universal-dividend/src/mock.rs b/pallets/universal-dividend/src/mock.rs index 54284cedfbf04d299463fb4ab9df411124cf350a..525be6992b8967cd91d2747ebc9e4b19f6e5a795 100644 --- a/pallets/universal-dividend/src/mock.rs +++ b/pallets/universal-dividend/src/mock.rs @@ -21,7 +21,7 @@ use frame_support::{ traits::{Everything, OnFinalize, OnInitialize}, }; use frame_system as system; -use sp_core::H256; +use sp_core::{ConstU32, H256}; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, @@ -106,6 +106,10 @@ impl pallet_balances::Config for Test { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type RuntimeEvent = RuntimeEvent; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { @@ -171,7 +175,9 @@ pub fn new_test_ext( ) -> sp_io::TestExternalities { GenesisConfig { system: SystemConfig::default(), - balances: BalancesConfig::default(), + balances: BalancesConfig { + total_issuance: gen_conf.initial_monetary_mass, + }, universal_dividend: gen_conf, } .build_storage() diff --git a/pallets/universal-dividend/src/weights.rs b/pallets/universal-dividend/src/weights.rs index 3fb577113d496b1dfe059d6f2e7ef80d4a958b89..b65169854eb41f0ce0257c86882b381daffae222 100644 --- a/pallets/universal-dividend/src/weights.rs +++ b/pallets/universal-dividend/src/weights.rs @@ -32,7 +32,7 @@ pub trait WeightInfo { impl WeightInfo for () { // Storage: (r:0 w:0) fn on_initialize() -> Weight { - Weight::from_ref_time(2_260_000) + Weight::from_parts(2_260_000, 0) } // Storage: Membership CounterForMembership (r:1 w:0) // Storage: UniversalDividend NextReeval (r:1 w:0) @@ -40,7 +40,7 @@ impl WeightInfo for () { // Storage: UniversalDividend MonetaryMass (r:1 w:1) // Storage: UniversalDividend CurrentUdIndex (r:1 w:1) fn on_initialize_ud_created() -> Weight { - Weight::from_ref_time(20_160_000) + Weight::from_parts(20_160_000, 0) .saturating_add(RocksDbWeight::get().reads(5)) .saturating_add(RocksDbWeight::get().writes(2)) } @@ -51,7 +51,7 @@ impl WeightInfo for () { // Storage: UniversalDividend PastReevals (r:1 w:1) // Storage: UniversalDividend CurrentUdIndex (r:1 w:1) fn on_initialize_ud_reevalued() -> Weight { - Weight::from_ref_time(32_770_000) + Weight::from_parts(32_770_000, 0) .saturating_add(RocksDbWeight::get().reads(6)) .saturating_add(RocksDbWeight::get().writes(5)) } @@ -60,9 +60,9 @@ impl WeightInfo for () { // Storage: UniversalDividend CurrentUdIndex (r:1 w:0) // Storage: UniversalDividend PastReevals (r:1 w:0) fn claim_uds(n: u32) -> Weight { - Weight::from_ref_time(32_514_000) + Weight::from_parts(32_514_000, 0) // Standard Error: 32_000 - .saturating_add(Weight::from_ref_time(8_000).saturating_mul(n as u64)) + .saturating_add(Weight::from_parts(8_000, 0).saturating_mul(n as u64)) .saturating_add(RocksDbWeight::get().reads(4)) .saturating_add(RocksDbWeight::get().writes(1)) } @@ -70,7 +70,7 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: Account PendingNewAccounts (r:0 w:1) fn transfer_ud() -> Weight { - Weight::from_ref_time(53_401_000) + Weight::from_parts(53_401_000, 0) .saturating_add(RocksDbWeight::get().reads(2)) .saturating_add(RocksDbWeight::get().writes(2)) } @@ -78,7 +78,7 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: Account PendingNewAccounts (r:0 w:1) fn transfer_ud_keep_alive() -> Weight { - Weight::from_ref_time(33_420_000) + Weight::from_parts(33_420_000, 0) .saturating_add(RocksDbWeight::get().reads(2)) .saturating_add(RocksDbWeight::get().writes(2)) } diff --git a/pallets/upgrade-origin/Cargo.toml b/pallets/upgrade-origin/Cargo.toml index f275c0998b3fe75f16f298ee67ae16b130a3bce2..54c322852c62f59cca3cac379a1e64af60268525 100644 --- a/pallets/upgrade-origin/Cargo.toml +++ b/pallets/upgrade-origin/Cargo.toml @@ -36,32 +36,32 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/pallets/upgrade-origin/src/lib.rs b/pallets/upgrade-origin/src/lib.rs index beb90209aa0afa50e26cfeb996abd5c83fb5552c..00bdfd2550086ce282b4c5491d3f5b1d000632ca 100644 --- a/pallets/upgrade-origin/src/lib.rs +++ b/pallets/upgrade-origin/src/lib.rs @@ -38,7 +38,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet<T>(_); /// Configuration trait. @@ -83,6 +82,7 @@ pub mod pallet { /// Dispatches a function call from root origin. /// /// The weight of this call is defined by the caller. + #[pallet::call_index(0)] #[pallet::weight({ let dispatch_info = call.get_dispatch_info(); ( @@ -109,6 +109,7 @@ pub mod pallet { /// caller to specify the weight of the call. /// /// The weight of this call is defined by the caller. + #[pallet::call_index(1)] #[pallet::weight((*_weight, call.get_dispatch_info().class))] pub fn dispatch_as_root_unchecked_weight( origin: OriginFor<T>, diff --git a/pallets/upgrade-origin/src/weights.rs b/pallets/upgrade-origin/src/weights.rs index 7ed4eab532954d85106f86016f49de0817ee7ca9..922bb3fded1e8ed22344eb57495d82ba1c4a1a87 100644 --- a/pallets/upgrade-origin/src/weights.rs +++ b/pallets/upgrade-origin/src/weights.rs @@ -26,6 +26,6 @@ pub trait WeightInfo { // Insecure weights implementation, use it for tests only! impl WeightInfo for () { fn dispatch_as_root() -> Weight { - Weight::from_ref_time(8_000) + Weight::from_parts(8_000, 0) } } diff --git a/primitives/distance/Cargo.toml b/primitives/distance/Cargo.toml index 6ee9db25137aa63893a43fbea10b8746c40c319f..fce822d7c04b1126e21ff75ee9bf18345236554e 100644 --- a/primitives/distance/Cargo.toml +++ b/primitives/distance/Cargo.toml @@ -24,7 +24,7 @@ std = [ try-runtime = ['frame-support/try-runtime'] [dependencies] -async-trait = { version = "0.1.50", optional = true } +async-trait = { version = "0.1", optional = true } thiserror = { version = "1.0.30", optional = true } # substrate @@ -39,7 +39,7 @@ version = "3.1.5" [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -49,17 +49,17 @@ features = ["derive"] [dependencies.sp-inherents] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/primitives/distance/src/lib.rs b/primitives/distance/src/lib.rs index 9972241810489256926e309c3b3a220d991c66bd..f2e89334509081769c3f20043a0990fec4986234 100644 --- a/primitives/distance/src/lib.rs +++ b/primitives/distance/src/lib.rs @@ -84,7 +84,7 @@ impl<IdtyIndex: Decode + Encode + PartialEq + TypeInfo> InherentDataProvider<Idt impl<IdtyIndex: Decode + Encode + PartialEq + TypeInfo + Send + Sync> sp_inherents::InherentDataProvider for InherentDataProvider<IdtyIndex> { - fn provide_inherent_data( + async fn provide_inherent_data( &self, inherent_data: &mut InherentData, ) -> Result<(), sp_inherents::Error> { diff --git a/primitives/duniter/Cargo.toml b/primitives/duniter/Cargo.toml index aca6a99010de8515b6540d0cb16cbc5cf52dcc90..12c7c92753ec0f8be3c32abef572933606a5eb69 100644 --- a/primitives/duniter/Cargo.toml +++ b/primitives/duniter/Cargo.toml @@ -33,17 +33,17 @@ version = "3.1.5" [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/primitives/membership/Cargo.toml b/primitives/membership/Cargo.toml index cfaf056ea2654d715275aea2ccf55777901b3033..f1142e3df36282345eed48f28e5ea8f38a89db47 100644 --- a/primitives/membership/Cargo.toml +++ b/primitives/membership/Cargo.toml @@ -34,7 +34,7 @@ version = "3.1.5" [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.serde] version = "1.0.101" @@ -44,12 +44,12 @@ features = ["derive"] [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' ### DOC ### diff --git a/resources/metadata.scale b/resources/metadata.scale index 11d3bc5da37cff7bbbecf45c200e1d612b5caff4..020753e3ea6dca891b0ab28b349451ce5f6ee8fc 100644 Binary files a/resources/metadata.scale and b/resources/metadata.scale differ diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index bb74d5ea4d71688209b85da26743f615f6311027..daf069abe05154ac965a162a1537662445b1a9ac 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -87,44 +87,41 @@ sp-distance = { path = '../../primitives/distance', default-features = false } sp-membership = { path = '../../primitives/membership', default-features = false } # Crates.io -codec = { package = "parity-scale-codec", version = "3.1.5", features = [ - "derive", -], default-features = false } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.1.1", default-features = false, features = [ - "derive", -] } -serde = { version = "1.0.101", default-features = false } -serde_derive = { version = "1.0.101", optional = true } -smallvec = "1.6.1" +codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive"], default-features = false } +log = { version = "0.4.17", default-features = false } +scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.139", default-features = false } +serde_derive = { version = "1.0.117", optional = true, default-features = false } +smallvec = { version = "1.8.0", default-features = false } # Substrate -frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-weights = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-consensus-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-weights = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } # substrate benchmarks -frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } -frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } # TODO: there is a bad coupling in substrate that force to add this dependency -sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } +sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } diff --git a/runtime/common/src/apis.rs b/runtime/common/src/apis.rs index e31d84d6aaa773ab9792425c06d2f5f8707516b6..acea484d81fcca848a4633db1f9ac553eb380574 100644 --- a/runtime/common/src/apis.rs +++ b/runtime/common/src/apis.rs @@ -98,6 +98,12 @@ macro_rules! runtime_apis { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> { + Runtime::metadata_at_version(version) + } + fn metadata_versions() -> sp_std::vec::Vec<u32> { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder<Block> for Runtime { @@ -207,6 +213,12 @@ macro_rules! runtime_apis { ) -> pallet_transaction_payment::FeeDetails<Balance> { TransactionPayment::query_fee_details(uxt, len) } + fn query_weight_to_fee(weight: Weight) -> Balance { + TransactionPayment::weight_to_fee(weight) + } + fn query_length_to_fee(length: u32) -> Balance { + TransactionPayment::length_to_fee(length) + } } #[cfg(feature = "try-runtime")] diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs index 74093f6b791a008d9b0939b3654a2cb048f4d4f5..665bd81935479198b11c3ef011f0b9ec0c20fd82 100644 --- a/runtime/common/src/pallets_config.rs +++ b/runtime/common/src/pallets_config.rs @@ -119,20 +119,13 @@ macro_rules! pallets_config { type DisabledValidators = Session; - type KeyOwnerProofSystem = Historical; - - type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<( + type KeyOwnerProof = <Historical as KeyOwnerProofSystem<( KeyTypeId, pallet_babe::AuthorityId, )>>::Proof; - type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<( - KeyTypeId, - pallet_babe::AuthorityId, - )>>::IdentificationTuple; - - type HandleEquivocation = - pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, Offences, ReportLongevity>; + type EquivocationReportSystem = + pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>; type WeightInfo = common_runtime::weights::pallet_babe::WeightInfo<Runtime>; @@ -154,14 +147,30 @@ macro_rules! pallets_config { type ReserveIdentifier = [u8; 8]; /// The type for recording an account's balance. type Balance = Balance; - type DustRemoval = Treasury; + type DustRemoval = HandleDust; type ExistentialDeposit = ExistentialDeposit; type AccountStore = Account; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = frame_support::pallet_prelude::ConstU32<0>; + type MaxFreezes = frame_support::pallet_prelude::ConstU32<0>; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; type WeightInfo = common_runtime::weights::pallet_balances::WeightInfo<Runtime>; } + // Take Dust from Balances and put it in the Treasury pot + pub struct HandleDust; + type CreditOf = frame_support::traits::tokens::fungible::Credit<AccountId, Balances>; + impl frame_support::traits::OnUnbalanced<CreditOf> for HandleDust { + fn on_nonzero_unbalanced(amount: CreditOf) { + use frame_support::traits::Currency as _; + use frame_support::traits::Imbalance as _; + let imbalance = NegativeImbalance::new(amount.peek()); + Balances::resolve_creating(&Treasury::account_id(), imbalance); + } + } + pub struct HandleFees; type NegativeImbalance = <Balances as frame_support::traits::Currency<AccountId>>::NegativeImbalance; impl frame_support::traits::OnUnbalanced<NegativeImbalance> for HandleFees { @@ -211,8 +220,6 @@ macro_rules! pallets_config { } impl pallet_authorship::Config for Runtime { type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>; - type UncleGenerations = UncleGenerations; - type FilterUncle = (); type EventHandler = ImOnline; } impl pallet_im_online::Config for Runtime { @@ -253,26 +260,20 @@ macro_rules! pallets_config { impl pallet_grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type KeyOwnerProofSystem = Historical; - type KeyOwnerProof = - <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof; - - type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<( - KeyTypeId, - GrandpaId, - )>>::IdentificationTuple; + <Historical as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof; - type HandleEquivocation = pallet_grandpa::EquivocationHandler< - Self::KeyOwnerIdentification, - Offences, - ReportLongevity, - >; + type EquivocationReportSystem = + pallet_grandpa::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>; type WeightInfo = common_runtime::weights::pallet_grandpa::WeightInfo<Runtime>; type MaxAuthorities = MaxAuthorities; - } + type MaxSetIdSessionEntries = MaxSetIdSessionEntries; + } +parameter_types! { + pub const MaxSetIdSessionEntries: u32 = 1000;//BondingDuration::get() * SessionsPerEra::get(); +} // ONCHAIN GOVERNANCE // @@ -542,6 +543,7 @@ macro_rules! pallets_config { } parameter_types! { pub const TechnicalCommitteeMotionDuration: BlockNumber = 7 * DAYS; +pub MaxProposalWeight: Weight = Perbill::from_percent(50) * BlockWeights::get().max_block; } impl pallet_collective::Config<Instance2> for Runtime { type RuntimeOrigin = RuntimeOrigin; @@ -551,6 +553,8 @@ macro_rules! pallets_config { type MaxProposals = frame_support::pallet_prelude::ConstU32<20>; type MaxMembers = frame_support::pallet_prelude::ConstU32<100>; type WeightInfo = common_runtime::weights::pallet_collective::WeightInfo<Runtime>; +type SetMembersOrigin = EnsureRoot<AccountId>; +type MaxProposalWeight = MaxProposalWeight; #[cfg(not(feature = "runtime-benchmarks"))] type DefaultVote = TechnicalCommitteeDefaultVote; #[cfg(feature = "runtime-benchmarks")] diff --git a/runtime/common/src/weights/block_weights.rs b/runtime/common/src/weights/block_weights.rs index b94d3347b7bcb661440b5f58c490db835635b32c..f6d1a031415dee95bbb472d23693f46c2890a7e1 100644 --- a/runtime/common/src/weights/block_weights.rs +++ b/runtime/common/src/weights/block_weights.rs @@ -1,11 +1,26 @@ +// Copyright 2021-2022 Axiom-Team +// +// This file is part of Duniter-v2S. +// +// Duniter-v2S is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// Duniter-v2S is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-19 (Y/M/D) +//! DATE: 2023-06-08 (Y/M/D) //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! //! SHORT-NAME: `block`, LONG-NAME: `BlockExecution`, RUNTIME: `Development` //! WARMUPS: `10`, REPEAT: `100` -//! WEIGHT-PATH: `runtime/common/src/weights/` +//! WEIGHT-PATH: `./runtime/common/src/weights/` //! WEIGHT-METRIC: `Average`, WEIGHT-MUL: `1.0`, WEIGHT-ADD: `0` // Executed Command: @@ -15,27 +30,30 @@ // --chain=gdev-benchmark // --execution=wasm // --wasm-execution=compiled -// --weight-path=runtime/common/src/weights/ +// --weight-path=./runtime/common/src/weights/ // --warmup=10 +// --repeat=100 +// --header=./file_header.txt use sp_core::parameter_types; -use sp_weights::{constants::WEIGHT_PER_NANOS, Weight}; +use sp_weights::{constants::WEIGHT_REF_TIME_PER_NANOS, Weight}; parameter_types! { /// Time to execute an empty block. /// Calculated by multiplying the *Average* with `1.0` and adding `0`. /// /// Stats nanoseconds: - /// Min, Max: 698_202, 838_988 - /// Average: 709_232 - /// Median: 704_251 - /// Std-Dev: 15664.54 + /// Min, Max: 623_420, 1_116_421 + /// Average: 690_884 + /// Median: 634_164 + /// Std-Dev: 114940.42 /// /// Percentiles nanoseconds: - /// 99th: 738_574 - /// 95th: 729_596 - /// 75th: 709_823 - pub const BlockExecutionWeight: Weight = WEIGHT_PER_NANOS.saturating_mul(709_232); + /// 99th: 1_050_988 + /// 95th: 973_973 + /// 75th: 680_020 + pub const BlockExecutionWeight: Weight = + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(690_884), 0); } #[cfg(test)] @@ -51,12 +69,12 @@ mod test_weights { // At least 100 µs. assert!( - w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 100u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 100 µs." ); // At most 50 ms. assert!( - w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= 50u64 * constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 50 ms." ); } diff --git a/runtime/common/src/weights/extrinsic_weights.rs b/runtime/common/src/weights/extrinsic_weights.rs index de39f7a43019778c932c81b4e6acf7c30aa4f4ac..ae6220f62303a6c8872abe011f95fd49fcae24fb 100644 --- a/runtime/common/src/weights/extrinsic_weights.rs +++ b/runtime/common/src/weights/extrinsic_weights.rs @@ -1,11 +1,26 @@ +// Copyright 2021-2022 Axiom-Team +// +// This file is part of Duniter-v2S. +// +// Duniter-v2S is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// Duniter-v2S is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-19 (Y/M/D) +//! DATE: 2023-06-08 (Y/M/D) //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! //! SHORT-NAME: `extrinsic`, LONG-NAME: `ExtrinsicBase`, RUNTIME: `Development` //! WARMUPS: `10`, REPEAT: `100` -//! WEIGHT-PATH: `runtime/common/src/weights/` +//! WEIGHT-PATH: `./runtime/common/src/weights/` //! WEIGHT-METRIC: `Average`, WEIGHT-MUL: `1.0`, WEIGHT-ADD: `0` // Executed Command: @@ -15,27 +30,30 @@ // --chain=gdev-benchmark // --execution=wasm // --wasm-execution=compiled -// --weight-path=runtime/common/src/weights/ +// --weight-path=./runtime/common/src/weights/ // --warmup=10 +// --repeat=100 +// --header=./file_header.txt use sp_core::parameter_types; -use sp_weights::{constants::WEIGHT_PER_NANOS, Weight}; +use sp_weights::{constants::WEIGHT_REF_TIME_PER_NANOS, Weight}; parameter_types! { /// Time to execute a NO-OP extrinsic, for example `System::remark`. /// Calculated by multiplying the *Average* with `1.0` and adding `0`. /// /// Stats nanoseconds: - /// Min, Max: 203_855, 206_882 - /// Average: 204_580 - /// Median: 204_521 - /// Std-Dev: 405.03 + /// Min, Max: 220_365, 326_359 + /// Average: 226_482 + /// Median: 222_794 + /// Std-Dev: 14284.13 /// /// Percentiles nanoseconds: - /// 99th: 205_581 - /// 95th: 205_130 - /// 75th: 204_772 - pub const ExtrinsicBaseWeight: Weight = WEIGHT_PER_NANOS.saturating_mul(204_580); + /// 99th: 286_577 + /// 95th: 253_512 + /// 75th: 224_166 + pub const ExtrinsicBaseWeight: Weight = + Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(226_482), 0); } #[cfg(test)] @@ -51,12 +69,12 @@ mod test_weights { // At least 10 µs. assert!( - w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(), + w.ref_time() >= 10u64 * constants::WEIGHT_REF_TIME_PER_MICROS, "Weight should be at least 10 µs." ); // At most 1 ms. assert!( - w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + w.ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Weight should be at most 1 ms." ); } diff --git a/runtime/common/src/weights/frame_benchmarking_baseline.rs b/runtime/common/src/weights/frame_benchmarking_baseline.rs index 4230a38cd15b7d883e1be09f736a3fa822f33564..2c0a5150dede0cfc50226f5a8ef23662a3ebc544 100644 --- a/runtime/common/src/weights/frame_benchmarking_baseline.rs +++ b/runtime/common/src/weights/frame_benchmarking_baseline.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `frame_benchmarking::baseline` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,63 +40,67 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `frame_benchmarking::baseline`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> frame_benchmarking::baseline::WeightInfo for WeightInfo<T> { /// The range of component `i` is `[0, 1000000]`. fn addition(_i: u32, ) -> Weight { - // Minimum execution time: 617 nanoseconds. - Weight::from_ref_time(1_461_024 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 743_000 picoseconds. + Weight::from_parts(980_100, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// The range of component `i` is `[0, 1000000]`. fn subtraction(_i: u32, ) -> Weight { - // Minimum execution time: 596 nanoseconds. - Weight::from_ref_time(1_309_419 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 758_000 picoseconds. + Weight::from_parts(931_100, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// The range of component `i` is `[0, 1000000]`. fn multiplication(_i: u32, ) -> Weight { - // Minimum execution time: 615 nanoseconds. - Weight::from_ref_time(1_302_257 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 736_000 picoseconds. + Weight::from_parts(1_411_800, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// The range of component `i` is `[0, 1000000]`. fn division(_i: u32, ) -> Weight { - // Minimum execution time: 603 nanoseconds. - Weight::from_ref_time(1_519_320 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 715_000 picoseconds. + Weight::from_parts(919_500, 0) + .saturating_add(Weight::from_parts(0, 0)) } - /// The range of component `i` is `[0, 100]`. - fn hashing(i: u32, ) -> Weight { - // Minimum execution time: 70_557_507 nanoseconds. - Weight::from_ref_time(79_338_326_220 as u64) - // Standard Error: 9_989_171 - .saturating_add(Weight::from_ref_time(27_875_256 as u64).saturating_mul(i as u64)) + fn hashing() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 58_253_251_000 picoseconds. + Weight::from_parts(58_298_115_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// The range of component `i` is `[0, 100]`. fn sr25519_verification(i: u32, ) -> Weight { - // Minimum execution time: 855 nanoseconds. - Weight::from_ref_time(952_000 as u64) - // Standard Error: 278_536 - .saturating_add(Weight::from_ref_time(129_780_692 as u64).saturating_mul(i as u64)) - } - // Storage: Skipped Metadata (r:0 w:0) - /// The range of component `i` is `[0, 1000]`. - fn storage_read(i: u32, ) -> Weight { - // Minimum execution time: 1_840 nanoseconds. - Weight::from_ref_time(73_727_738 as u64) - // Standard Error: 88_358 - .saturating_add(Weight::from_ref_time(6_980_883 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(i as u64))) - } - // Storage: Skipped Metadata (r:0 w:0) - /// The range of component `i` is `[0, 1000]`. - fn storage_write(i: u32, ) -> Weight { - // Minimum execution time: 673 nanoseconds. - Weight::from_ref_time(6_595_911 as u64) - // Standard Error: 26_492 - .saturating_add(Weight::from_ref_time(1_490_316 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 1_002_000 picoseconds. + Weight::from_parts(14_276_600, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 402_829 + .saturating_add(Weight::from_parts(121_474_218, 0).saturating_mul(i.into())) } } diff --git a/runtime/common/src/weights/frame_system.rs b/runtime/common/src/weights/frame_system.rs index 23d786979453e60fdea3dda1745dd9302e7d9573..ee97474b218308818f9bd36e025484a22d33412f 100644 --- a/runtime/common/src/weights/frame_system.rs +++ b/runtime/common/src/weights/frame_system.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `frame_system` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,60 +40,92 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `frame_system`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - // Minimum execution time: 15_795 nanoseconds. - Weight::from_ref_time(8_375_907 as u64) - // Standard Error: 18 - .saturating_add(Weight::from_ref_time(1_138 as u64).saturating_mul(b as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_389_000 picoseconds. + Weight::from_parts(42_731_500, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 28 + .saturating_add(Weight::from_parts(955, 0).saturating_mul(b.into())) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - // Minimum execution time: 48_575 nanoseconds. - Weight::from_ref_time(49_236_000 as u64) - // Standard Error: 25 - .saturating_add(Weight::from_ref_time(4_046 as u64).saturating_mul(b as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 27_738_000 picoseconds. + Weight::from_parts(82_083_800, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 53 + .saturating_add(Weight::from_parts(2_828, 0).saturating_mul(b.into())) } - // Storage: System Digest (r:1 w:1) - // Storage: unknown [0x3a686561707061676573] (r:0 w:1) + /// Storage: System Digest (r:1 w:1) + /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: unknown `0x3a686561707061676573` (r:0 w:1) + /// Proof Skipped: unknown `0x3a686561707061676573` (r:0 w:1) fn set_heap_pages() -> Weight { - // Minimum execution time: 32_652 nanoseconds. - Weight::from_ref_time(34_862_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `1485` + // Minimum execution time: 17_763_000 picoseconds. + Weight::from_parts(23_048_000, 0) + .saturating_add(Weight::from_parts(0, 1485)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Skipped Metadata (r:0 w:0) + /// Storage: Skipped Metadata (r:0 w:0) + /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[0, 1000]`. fn set_storage(i: u32, ) -> Weight { - // Minimum execution time: 25_483 nanoseconds. - Weight::from_ref_time(27_277_000 as u64) - // Standard Error: 25_817 - .saturating_add(Weight::from_ref_time(2_385_375 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 9_227_000 picoseconds. + Weight::from_parts(147_793_100, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 182_875 + .saturating_add(Weight::from_parts(2_073_824, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } - // Storage: Skipped Metadata (r:0 w:0) + /// Storage: Skipped Metadata (r:0 w:0) + /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[0, 1000]`. fn kill_storage(i: u32, ) -> Weight { - // Minimum execution time: 24_787 nanoseconds. - Weight::from_ref_time(22_434_497 as u64) - // Standard Error: 24_799 - .saturating_add(Weight::from_ref_time(1_819_274 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_324_000 picoseconds. + Weight::from_parts(62_646_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 83_795 + .saturating_add(Weight::from_parts(1_575_050, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } - // Storage: Skipped Metadata (r:0 w:0) + /// Storage: Skipped Metadata (r:0 w:0) + /// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured) /// The range of component `p` is `[0, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - // Minimum execution time: 31_094 nanoseconds. - Weight::from_ref_time(49_585_059 as u64) - // Standard Error: 51_650 - .saturating_add(Weight::from_ref_time(3_437_858 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + // Proof Size summary in bytes: + // Measured: `96 + p * (69 ±0)` + // Estimated: `69 + p * (70 ±0)` + // Minimum execution time: 17_140_000 picoseconds. + Weight::from_parts(4_697_000, 0) + .saturating_add(Weight::from_parts(0, 69)) + // Standard Error: 42_524 + .saturating_add(Weight::from_parts(2_979_195, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) + .saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into())) } } diff --git a/runtime/common/src/weights/pallet_authority_members.rs b/runtime/common/src/weights/pallet_authority_members.rs index 679df91838cfa91e6b402d1636b5325fe716ed0e..ca306d849007dc8df735783571b42982f7bb1bdf 100644 --- a/runtime/common/src/weights/pallet_authority_members.rs +++ b/runtime/common/src/weights/pallet_authority_members.rs @@ -17,103 +17,157 @@ //! Autogenerated weights for `pallet_authority_members` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet -// --chain -// gdev-benchmark +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=pallet-authority-members +// --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --pallet -// pallet-authority-members -// --extrinsic -// * -// --steps -// 50 -// --repeat -// 20 -// --output=runtime/common/src/weights/ -// --header -// file_header.txt +// --heap-pages=4096 +// --header=./file_header.txt +// --output=./runtime/common/src/weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_authority_members`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_authority_members::WeightInfo for WeightInfo<T> { - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: AuthorityMembers Members (r:1 w:0) - // Storage: AuthorityMembers OutgoingAuthorities (r:1 w:1) - // Storage: AuthorityMembers IncomingAuthorities (r:1 w:0) - // Storage: AuthorityMembers OnlineAuthorities (r:1 w:0) - // Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers Members (r:1 w:0) + /// Proof Skipped: AuthorityMembers Members (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers OutgoingAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers OutgoingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers IncomingAuthorities (r:1 w:0) + /// Proof Skipped: AuthorityMembers IncomingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers OnlineAuthorities (r:1 w:0) + /// Proof Skipped: AuthorityMembers OnlineAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) + /// Proof Skipped: AuthorityMembers AuthoritiesCounter (max_values: Some(1), max_size: None, mode: Measured) fn go_offline() -> Weight { - // Minimum execution time: 106_597 nanoseconds. - Weight::from_ref_time(109_880_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `632` + // Estimated: `4097` + // Minimum execution time: 99_427_000 picoseconds. + Weight::from_parts(105_315_000, 0) + .saturating_add(Weight::from_parts(0, 4097)) + .saturating_add(T::DbWeight::get().reads(7)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: AuthorityMembers BlackList (r:1 w:0) - // Storage: AuthorityMembers Members (r:1 w:0) - // Storage: Session NextKeys (r:1 w:0) - // Storage: AuthorityMembers IncomingAuthorities (r:1 w:1) - // Storage: AuthorityMembers OutgoingAuthorities (r:1 w:0) - // Storage: AuthorityMembers OnlineAuthorities (r:1 w:0) - // Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers BlackList (r:1 w:0) + /// Proof Skipped: AuthorityMembers BlackList (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers Members (r:1 w:0) + /// Proof Skipped: AuthorityMembers Members (max_values: None, max_size: None, mode: Measured) + /// Storage: Session NextKeys (r:1 w:0) + /// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers IncomingAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers IncomingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers OutgoingAuthorities (r:1 w:0) + /// Proof Skipped: AuthorityMembers OutgoingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers OnlineAuthorities (r:1 w:0) + /// Proof Skipped: AuthorityMembers OnlineAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) + /// Proof Skipped: AuthorityMembers AuthoritiesCounter (max_values: Some(1), max_size: None, mode: Measured) fn go_online() -> Weight { - // Minimum execution time: 132_009 nanoseconds. - Weight::from_ref_time(204_473_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `1022` + // Estimated: `4487` + // Minimum execution time: 120_665_000 picoseconds. + Weight::from_parts(130_931_000, 0) + .saturating_add(Weight::from_parts(0, 4487)) + .saturating_add(T::DbWeight::get().reads(9)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: System Account (r:1 w:0) - // Storage: Session NextKeys (r:1 w:1) - // Storage: Session KeyOwner (r:4 w:0) - // Storage: Session CurrentIndex (r:1 w:0) - // Storage: AuthorityMembers Members (r:1 w:1) - // Storage: AuthorityMembers MustRotateKeysBefore (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: System Account (r:1 w:0) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Session NextKeys (r:1 w:1) + /// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured) + /// Storage: Session KeyOwner (r:4 w:0) + /// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured) + /// Storage: Session CurrentIndex (r:1 w:0) + /// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers Members (r:1 w:1) + /// Proof Skipped: AuthorityMembers Members (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers MustRotateKeysBefore (r:1 w:1) + /// Proof Skipped: AuthorityMembers MustRotateKeysBefore (max_values: None, max_size: None, mode: Measured) fn set_session_keys() -> Weight { - // Minimum execution time: 161_156 nanoseconds. - Weight::from_ref_time(182_210_000 as u64) - .saturating_add(T::DbWeight::get().reads(11 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + // Proof Size summary in bytes: + // Measured: `1750` + // Estimated: `12640` + // Minimum execution time: 166_507_000 picoseconds. + Weight::from_parts(181_777_000, 0) + .saturating_add(Weight::from_parts(0, 12640)) + .saturating_add(T::DbWeight::get().reads(11)) + .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: AuthorityMembers Members (r:1 w:1) - // Storage: AuthorityMembers OnlineAuthorities (r:1 w:1) - // Storage: AuthorityMembers OutgoingAuthorities (r:1 w:1) - // Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) - // Storage: AuthorityMembers IncomingAuthorities (r:1 w:1) - // Storage: Session NextKeys (r:1 w:1) - // Storage: System Account (r:1 w:1) - // Storage: SmithMembership Membership (r:1 w:1) - // Storage: SmithMembership CounterForMembership (r:1 w:1) - // Storage: Session KeyOwner (r:0 w:4) + /// Storage: AuthorityMembers Members (r:1 w:1) + /// Proof Skipped: AuthorityMembers Members (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers OnlineAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers OnlineAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers OutgoingAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers OutgoingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) + /// Proof Skipped: AuthorityMembers AuthoritiesCounter (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers IncomingAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers IncomingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Session NextKeys (r:1 w:1) + /// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: SmithMembership Membership (r:1 w:1) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership CounterForMembership (r:1 w:1) + /// Proof: SmithMembership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: SmithMembership MembershipsExpireOn (r:1 w:1) + /// Proof Skipped: SmithMembership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Session KeyOwner (r:0 w:4) + /// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured) fn remove_member() -> Weight { - // Minimum execution time: 225_027 nanoseconds. - Weight::from_ref_time(243_550_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(13 as u64)) + // Proof Size summary in bytes: + // Measured: `975` + // Estimated: `4440` + // Minimum execution time: 222_719_000 picoseconds. + Weight::from_parts(240_189_000, 0) + .saturating_add(Weight::from_parts(0, 4440)) + .saturating_add(T::DbWeight::get().reads(10)) + .saturating_add(T::DbWeight::get().writes(14)) } - // Storage: AuthorityMembers BlackList (r:1 w:1) + /// Storage: AuthorityMembers BlackList (r:1 w:1) + /// Proof Skipped: AuthorityMembers BlackList (max_values: Some(1), max_size: None, mode: Measured) fn remove_member_from_blacklist() -> Weight { - // Minimum execution time: 60_023 nanoseconds. - Weight::from_ref_time(60_615_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `218` + // Estimated: `1703` + // Minimum execution time: 41_963_000 picoseconds. + Weight::from_parts(47_577_000, 0) + .saturating_add(Weight::from_parts(0, 1703)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_babe.rs b/runtime/common/src/weights/pallet_babe.rs index 2ba18b260d7037e509a82ef491136d6507a05dd1..ea526bb2e3ddb47ed35b6e771d460320999ce78a 100644 --- a/runtime/common/src/weights/pallet_babe.rs +++ b/runtime/common/src/weights/pallet_babe.rs @@ -20,7 +20,7 @@ use frame_support::{ traits::Get, weights::{ - constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS}, + constants::{WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_NANOS}, Weight, }, }; @@ -39,13 +39,16 @@ impl<T: frame_system::Config> pallet_babe::WeightInfo for WeightInfo<T> { let validator_count = validator_count.max(100) as u64; // checking membership proof - (WEIGHT_PER_MICROS * 35) - .saturating_add((WEIGHT_PER_NANOS * 175).saturating_mul(validator_count)) + (Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 35) + .saturating_add( + (Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS, 0) * 175) + .saturating_mul(validator_count), + ) .saturating_add(T::DbWeight::get().reads(5)) // check equivocation proof - .saturating_add(WEIGHT_PER_MICROS * 110) + .saturating_add(Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 110) // report offence - .saturating_add(WEIGHT_PER_MICROS * 110) + .saturating_add(Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 110) .saturating_add(T::DbWeight::get().writes(3)) } } diff --git a/runtime/common/src/weights/pallet_balances.rs b/runtime/common/src/weights/pallet_balances.rs index 3f904a743aaa5e194d77b8f7ccb562b5b6fc9bc9..bc3f18ed72d407ea70d5e08d2dc8d80fbfdfd9c4 100644 --- a/runtime/common/src/weights/pallet_balances.rs +++ b/runtime/common/src/weights/pallet_balances.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_balances` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,64 +40,120 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_balances`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> { - // Storage: System Account (r:1 w:1) - // Storage: Account PendingNewAccounts (r:0 w:1) - fn transfer() -> Weight { - // Minimum execution time: 184_939 nanoseconds. - Weight::from_ref_time(188_127_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) + fn transfer_allow_death() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `3626` + // Minimum execution time: 181_103_000 picoseconds. + Weight::from_parts(181_638_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: System Account (r:1 w:1) - // Storage: Account PendingNewAccounts (r:0 w:1) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) fn transfer_keep_alive() -> Weight { - // Minimum execution time: 125_034 nanoseconds. - Weight::from_ref_time(126_793_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `3626` + // Minimum execution time: 141_436_000 picoseconds. + Weight::from_parts(165_715_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: System Account (r:1 w:1) - fn set_balance_creating() -> Weight { - // Minimum execution time: 86_856 nanoseconds. - Weight::from_ref_time(90_900_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + fn force_set_balance_creating() -> Weight { + // Proof Size summary in bytes: + // Measured: `141` + // Estimated: `3626` + // Minimum execution time: 55_483_000 picoseconds. + Weight::from_parts(67_246_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: System Account (r:1 w:1) - fn set_balance_killing() -> Weight { - // Minimum execution time: 99_577 nanoseconds. - Weight::from_ref_time(129_088_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + fn force_set_balance_killing() -> Weight { + // Proof Size summary in bytes: + // Measured: `141` + // Estimated: `3626` + // Minimum execution time: 79_891_000 picoseconds. + Weight::from_parts(112_730_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: System Account (r:2 w:2) - // Storage: Account PendingNewAccounts (r:0 w:1) + /// Storage: System Account (r:2 w:2) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) fn force_transfer() -> Weight { - // Minimum execution time: 185_595 nanoseconds. - Weight::from_ref_time(273_715_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + // Proof Size summary in bytes: + // Measured: `104` + // Estimated: `6262` + // Minimum execution time: 175_293_000 picoseconds. + Weight::from_parts(182_650_000, 0) + .saturating_add(Weight::from_parts(0, 6262)) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: System Account (r:1 w:1) - // Storage: Account PendingNewAccounts (r:0 w:1) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) fn transfer_all() -> Weight { - // Minimum execution time: 143_575 nanoseconds. - Weight::from_ref_time(148_080_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `3626` + // Minimum execution time: 201_646_000 picoseconds. + Weight::from_parts(299_472_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: System Account (r:1 w:1) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) fn force_unreserve() -> Weight { - // Minimum execution time: 78_235 nanoseconds. - Weight::from_ref_time(111_974_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `141` + // Estimated: `3626` + // Minimum execution time: 64_089_000 picoseconds. + Weight::from_parts(71_539_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } + /// Storage: System Account (r:1000 w:1000) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// The range of component `u` is `[1, 1000]`. + fn upgrade_accounts(u: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `0 + u * (136 ±0)` + // Estimated: `990 + u * (2636 ±0)` + // Minimum execution time: 58_364_000 picoseconds. + Weight::from_parts(884_796_987, 0) + .saturating_add(Weight::from_parts(0, 990)) + // Standard Error: 1_784_601 + .saturating_add(Weight::from_parts(39_174_707, 0).saturating_mul(u.into())) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into()))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into()))) + .saturating_add(Weight::from_parts(0, 2636).saturating_mul(u.into())) } } diff --git a/runtime/common/src/weights/pallet_certification_cert.rs b/runtime/common/src/weights/pallet_certification_cert.rs index acd4cd7aa9018d5a6e04a77e83e191f25ab6187c..07eb753258596fa2f20eb5b244963641aa7c2bde 100644 --- a/runtime/common/src/weights/pallet_certification_cert.rs +++ b/runtime/common/src/weights/pallet_certification_cert.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_certification` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `Hugo`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet // --chain=gdev-benchmark -// --steps=50 -// --repeat=20 -// --pallet=pallet-certification +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,58 +40,75 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_certification`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_certification::WeightInfo for WeightInfo<T> { - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Cert StorageCertsRemovableOn (r:1 w:1) - // Storage: Cert CertsByReceiver (r:1 w:1) - fn do_add_cert_checked() -> Weight { - // Minimum execution time: 48_363 nanoseconds. - Weight::from_ref_time(59_125_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - } - // Storage: Identity Identities (r:2 w:0) - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Cert StorageCertsRemovableOn (r:1 w:1) - // Storage: Cert CertsByReceiver (r:1 w:1) + /// Storage: Identity Identities (r:2 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Cert StorageCertsRemovableOn (r:1 w:1) + /// Proof Skipped: Cert StorageCertsRemovableOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert CertsByReceiver (r:1 w:1) + /// Proof Skipped: Cert CertsByReceiver (max_values: None, max_size: None, mode: Measured) fn add_cert() -> Weight { - // Minimum execution time: 57_408 nanoseconds. - Weight::from_ref_time(69_281_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + // Proof Size summary in bytes: + // Measured: `831` + // Estimated: `6771` + // Minimum execution time: 125_750_000 picoseconds. + Weight::from_parts(144_960_000, 0) + .saturating_add(Weight::from_parts(0, 6771)) + .saturating_add(T::DbWeight::get().reads(7)) + .saturating_add(T::DbWeight::get().writes(4)) } - // Storage: Cert CertsByReceiver (r:1 w:1) - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership Membership (r:1 w:0) + /// Storage: Cert CertsByReceiver (r:1 w:1) + /// Proof Skipped: Cert CertsByReceiver (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:0) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) fn del_cert() -> Weight { - // Minimum execution time: 49_562 nanoseconds. - Weight::from_ref_time(61_695_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + // Proof Size summary in bytes: + // Measured: `695` + // Estimated: `6635` + // Minimum execution time: 97_607_000 picoseconds. + Weight::from_parts(111_284_000, 0) + .saturating_add(Weight::from_parts(0, 6635)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: Cert CertsByReceiver (r:1 w:1) - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership Membership (r:1 w:0) + /// Storage: Cert CertsByReceiver (r:1 w:1) + /// Proof Skipped: Cert CertsByReceiver (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:1000 w:1000) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:0) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[2, 1000]`. /// The range of component `i` is `[2, 1000]`. fn remove_all_certs_received_by(i: u32, ) -> Weight { - // Minimum execution time: 49_307 nanoseconds. - Weight::from_ref_time(49_926_000 as u64) - // Standard Error: 61_521 - .saturating_add(Weight::from_ref_time(15_865_456 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(i as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `623 + i * (35 ±0)` + // Estimated: `4098 + i * (2511 ±0)` + // Minimum execution time: 101_183_000 picoseconds. + Weight::from_parts(101_610_000, 0) + .saturating_add(Weight::from_parts(0, 4098)) + // Standard Error: 551_959 + .saturating_add(Weight::from_parts(36_743_850, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into()))) + .saturating_add(T::DbWeight::get().writes(1)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) + .saturating_add(Weight::from_parts(0, 2511).saturating_mul(i.into())) } } diff --git a/runtime/common/src/weights/pallet_certification_smith_cert.rs b/runtime/common/src/weights/pallet_certification_smith_cert.rs index 6f735ab2bc1e8746e9869b468028be48cde89864..878ae100fb4a355bcfe92da4d52d4e5c21d5ba13 100644 --- a/runtime/common/src/weights/pallet_certification_smith_cert.rs +++ b/runtime/common/src/weights/pallet_certification_smith_cert.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_certification` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `Hugo`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet // --chain=gdev-benchmark -// --steps=50 -// --repeat=20 -// --pallet=pallet-certification +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,58 +40,75 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_certification`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_certification::WeightInfo for WeightInfo<T> { - // Storage: SmithCert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithCert StorageCertsRemovableOn (r:1 w:1) - // Storage: SmithCert CertsByReceiver (r:1 w:1) - fn do_add_cert_checked() -> Weight { - // Minimum execution time: 57_241 nanoseconds. - Weight::from_ref_time(69_631_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - } - // Storage: Identity Identities (r:2 w:0) - // Storage: SmithCert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithCert StorageCertsRemovableOn (r:1 w:1) - // Storage: SmithCert CertsByReceiver (r:1 w:1) + /// Storage: Identity Identities (r:2 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithCert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: SmithCert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: SmithCert StorageCertsRemovableOn (r:1 w:1) + /// Proof Skipped: SmithCert StorageCertsRemovableOn (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithCert CertsByReceiver (r:1 w:1) + /// Proof Skipped: SmithCert CertsByReceiver (max_values: None, max_size: None, mode: Measured) fn add_cert() -> Weight { - // Minimum execution time: 65_925 nanoseconds. - Weight::from_ref_time(79_971_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + // Proof Size summary in bytes: + // Measured: `761` + // Estimated: `6701` + // Minimum execution time: 135_356_000 picoseconds. + Weight::from_parts(137_673_000, 0) + .saturating_add(Weight::from_parts(0, 6701)) + .saturating_add(T::DbWeight::get().reads(7)) + .saturating_add(T::DbWeight::get().writes(4)) } - // Storage: SmithCert CertsByReceiver (r:1 w:1) - // Storage: SmithCert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:0) + /// Storage: SmithCert CertsByReceiver (r:1 w:1) + /// Proof Skipped: SmithCert CertsByReceiver (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithCert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: SmithCert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) fn del_cert() -> Weight { - // Minimum execution time: 50_260 nanoseconds. - Weight::from_ref_time(62_319_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + // Proof Size summary in bytes: + // Measured: `630` + // Estimated: `6570` + // Minimum execution time: 98_544_000 picoseconds. + Weight::from_parts(111_976_000, 0) + .saturating_add(Weight::from_parts(0, 6570)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: SmithCert CertsByReceiver (r:1 w:1) - // Storage: SmithCert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:0) + /// Storage: SmithCert CertsByReceiver (r:1 w:1) + /// Proof Skipped: SmithCert CertsByReceiver (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithCert StorageIdtyCertMeta (r:1000 w:1000) + /// Proof Skipped: SmithCert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[2, 1000]`. /// The range of component `i` is `[2, 1000]`. fn remove_all_certs_received_by(i: u32, ) -> Weight { - // Minimum execution time: 50_222 nanoseconds. - Weight::from_ref_time(50_794_000 as u64) - // Standard Error: 48_765 - .saturating_add(Weight::from_ref_time(15_587_131 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(i as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `558 + i * (35 ±0)` + // Estimated: `4043 + i * (2511 ±0)` + // Minimum execution time: 101_214_000 picoseconds. + Weight::from_parts(102_668_000, 0) + .saturating_add(Weight::from_parts(0, 4043)) + // Standard Error: 545_354 + .saturating_add(Weight::from_parts(36_672_449, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i.into()))) + .saturating_add(T::DbWeight::get().writes(1)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) + .saturating_add(Weight::from_parts(0, 2511).saturating_mul(i.into())) } } diff --git a/runtime/common/src/weights/pallet_collective.rs b/runtime/common/src/weights/pallet_collective.rs index 06b8d3a8f7763395fb75f34e4449adbbb1c25f1c..7120582e34f1a0f5a631d28beb9f18406a61714b 100644 --- a/runtime/common/src/weights/pallet_collective.rs +++ b/runtime/common/src/weights/pallet_collective.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_collective` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-29, STEPS: `5`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev +// --chain=gdev-benchmark // --steps=5 // --repeat=2 -// --pallet=pallet_collective +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,158 +40,256 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_collective`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> { - // Storage: TechnicalCommittee Members (r:1 w:1) - // Storage: TechnicalCommittee Proposals (r:1 w:0) - // Storage: TechnicalCommittee Prime (r:0 w:1) - // Storage: TechnicalCommittee Voting (r:20 w:20) + /// Storage: TechnicalCommittee Members (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Proposals (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Voting (r:20 w:20) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Prime (r:0 w:1) + /// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured) /// The range of component `m` is `[0, 100]`. /// The range of component `n` is `[0, 100]`. /// The range of component `p` is `[0, 20]`. fn set_members(m: u32, _n: u32, p: u32, ) -> Weight { - // Minimum execution time: 117_409 nanoseconds. - Weight::from_ref_time(117_409_000 as u64) - // Standard Error: 967_384 - .saturating_add(Weight::from_ref_time(5_314_373 as u64).saturating_mul(m as u64)) - // Standard Error: 4_836_923 - .saturating_add(Weight::from_ref_time(25_325_026 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + // Proof Size summary in bytes: + // Measured: `0 + m * (672 ±0) + p * (3191 ±0)` + // Estimated: `32727 + m * (417 ±39) + p * (3588 ±197)` + // Minimum execution time: 56_260_000 picoseconds. + Weight::from_parts(56_260_000, 0) + .saturating_add(Weight::from_parts(0, 32727)) + // Standard Error: 405_486 + .saturating_add(Weight::from_parts(3_480_197, 0).saturating_mul(m.into())) + // Standard Error: 2_027_433 + .saturating_add(Weight::from_parts(20_059_518, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) + .saturating_add(T::DbWeight::get().writes(2)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) + .saturating_add(Weight::from_parts(0, 417).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 3588).saturating_mul(p.into())) } - // Storage: TechnicalCommittee Members (r:1 w:0) - /// The range of component `b` is `[1, 1024]`. + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - // Minimum execution time: 83_565 nanoseconds. - Weight::from_ref_time(95_367_623 as u64) - // Standard Error: 23_211 - .saturating_add(Weight::from_ref_time(51_015 as u64).saturating_mul(b as u64)) - // Standard Error: 239_004 - .saturating_add(Weight::from_ref_time(90_067 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + // Proof Size summary in bytes: + // Measured: `68 + m * (32 ±0)` + // Estimated: `1554 + m * (32 ±0)` + // Minimum execution time: 57_014_000 picoseconds. + Weight::from_parts(55_678_201, 0) + .saturating_add(Weight::from_parts(0, 1554)) + // Standard Error: 3_733 + .saturating_add(Weight::from_parts(4_393, 0).saturating_mul(b.into())) + // Standard Error: 38_397 + .saturating_add(Weight::from_parts(63_384, 0).saturating_mul(m.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee ProposalOf (r:1 w:0) - /// The range of component `b` is `[1, 1024]`. + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:1 w:0) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) + /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - // Minimum execution time: 92_863 nanoseconds. - Weight::from_ref_time(103_223_869 as u64) - // Standard Error: 31_713 - .saturating_add(Weight::from_ref_time(33_486 as u64).saturating_mul(b as u64)) - // Standard Error: 326_544 - .saturating_add(Weight::from_ref_time(526_966 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + // Proof Size summary in bytes: + // Measured: `68 + m * (32 ±0)` + // Estimated: `3534 + m * (32 ±0)` + // Minimum execution time: 69_549_000 picoseconds. + Weight::from_parts(103_797_406, 0) + .saturating_add(Weight::from_parts(0, 3534)) + // Standard Error: 16_093 + .saturating_add(Weight::from_parts(2_010, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee ProposalOf (r:1 w:1) - // Storage: TechnicalCommittee Proposals (r:1 w:1) - // Storage: TechnicalCommittee ProposalCount (r:1 w:1) - // Storage: TechnicalCommittee Voting (r:0 w:1) - /// The range of component `b` is `[1, 1024]`. + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:1 w:1) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Proposals (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalCount (r:1 w:1) + /// Proof Skipped: TechnicalCommittee ProposalCount (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Voting (r:0 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 20]`. - fn propose_proposed(b: u32, m: u32, _p: u32, ) -> Weight { - // Minimum execution time: 128_970 nanoseconds. - Weight::from_ref_time(139_202_954 as u64) - // Standard Error: 40_122 - .saturating_add(Weight::from_ref_time(54_685 as u64).saturating_mul(b as u64)) - // Standard Error: 418_110 - .saturating_add(Weight::from_ref_time(301_028 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + fn propose_proposed(_b: u32, m: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `137 + m * (32 ±0) + p * (52 ±0)` + // Estimated: `3457 + m * (33 ±0) + p * (57 ±2)` + // Minimum execution time: 87_906_000 picoseconds. + Weight::from_parts(110_298_400, 0) + .saturating_add(Weight::from_parts(0, 3457)) + // Standard Error: 133_938 + .saturating_add(Weight::from_parts(47_496, 0).saturating_mul(m.into())) + // Standard Error: 677_502 + .saturating_add(Weight::from_parts(1_176_985, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().writes(4)) + .saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 57).saturating_mul(p.into())) } - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee Voting (r:1 w:1) + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Voting (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - // Minimum execution time: 115_665 nanoseconds. - Weight::from_ref_time(208_489_321 as u64) - // Standard Error: 784_058 - .saturating_add(Weight::from_ref_time(84_836 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `609 + m * (64 ±0)` + // Estimated: `4074 + m * (64 ±0)` + // Minimum execution time: 67_518_000 picoseconds. + Weight::from_parts(71_567_851, 0) + .saturating_add(Weight::from_parts(0, 4074)) + // Standard Error: 188_027 + .saturating_add(Weight::from_parts(317_265, 0).saturating_mul(m.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } - // Storage: TechnicalCommittee Voting (r:1 w:1) - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee Proposals (r:1 w:1) - // Storage: TechnicalCommittee ProposalOf (r:0 w:1) + /// Storage: TechnicalCommittee Voting (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Proposals (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:0 w:1) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 20]`. - fn close_early_disapproved(_m: u32, p: u32, ) -> Weight { - // Minimum execution time: 120_835 nanoseconds. - Weight::from_ref_time(158_562_516 as u64) - // Standard Error: 2_851_904 - .saturating_add(Weight::from_ref_time(6_278_723 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + fn close_early_disapproved(m: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `164 + m * (64 ±0) + p * (55 ±0)` + // Estimated: `3631 + m * (64 ±0) + p * (55 ±0)` + // Minimum execution time: 91_989_000 picoseconds. + Weight::from_parts(91_383_296, 0) + .saturating_add(Weight::from_parts(0, 3631)) + // Standard Error: 201_199 + .saturating_add(Weight::from_parts(59_852, 0).saturating_mul(m.into())) + // Standard Error: 995_728 + .saturating_add(Weight::from_parts(927_741, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 55).saturating_mul(p.into())) } - // Storage: TechnicalCommittee Voting (r:1 w:1) - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee ProposalOf (r:1 w:1) - // Storage: TechnicalCommittee Proposals (r:1 w:1) - /// The range of component `b` is `[1, 1024]`. + /// Storage: TechnicalCommittee Voting (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:1 w:1) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Proposals (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 20]`. - fn close_early_approved(_b: u32, _m: u32, p: u32, ) -> Weight { - // Minimum execution time: 185_843 nanoseconds. - Weight::from_ref_time(313_702_045 as u64) - // Standard Error: 2_202_892 - .saturating_add(Weight::from_ref_time(937_341 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `0 + b * (1 ±0) + m * (64 ±0) + p * (78 ±0)` + // Estimated: `3572 + b * (1 ±0) + m * (64 ±0) + p * (76 ±1)` + // Minimum execution time: 125_950_000 picoseconds. + Weight::from_parts(111_377_580, 0) + .saturating_add(Weight::from_parts(0, 3572)) + // Standard Error: 193_970 + .saturating_add(Weight::from_parts(222_241, 0).saturating_mul(m.into())) + // Standard Error: 959_108 + .saturating_add(Weight::from_parts(1_837_613, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 76).saturating_mul(p.into())) } - // Storage: TechnicalCommittee Voting (r:1 w:1) - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee Prime (r:1 w:0) - // Storage: TechnicalCommittee Proposals (r:1 w:1) - // Storage: TechnicalCommittee ProposalOf (r:0 w:1) + /// Storage: TechnicalCommittee Voting (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Prime (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Proposals (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:0 w:1) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 20]`. - fn close_disapproved(_m: u32, p: u32, ) -> Weight { - // Minimum execution time: 139_843 nanoseconds. - Weight::from_ref_time(205_739_344 as u64) - // Standard Error: 2_524_168 - .saturating_add(Weight::from_ref_time(578_197 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + fn close_disapproved(m: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `184 + m * (64 ±0) + p * (55 ±0)` + // Estimated: `3651 + m * (64 ±0) + p * (55 ±0)` + // Minimum execution time: 101_451_000 picoseconds. + Weight::from_parts(89_079_451, 0) + .saturating_add(Weight::from_parts(0, 3651)) + // Standard Error: 83_198 + .saturating_add(Weight::from_parts(108_327, 0).saturating_mul(m.into())) + // Standard Error: 411_748 + .saturating_add(Weight::from_parts(1_170_157, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 55).saturating_mul(p.into())) } - // Storage: TechnicalCommittee Voting (r:1 w:1) - // Storage: TechnicalCommittee Members (r:1 w:0) - // Storage: TechnicalCommittee Prime (r:1 w:0) - // Storage: TechnicalCommittee ProposalOf (r:1 w:1) - // Storage: TechnicalCommittee Proposals (r:1 w:1) - /// The range of component `b` is `[1, 1024]`. + /// Storage: TechnicalCommittee Voting (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Members (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Prime (r:1 w:0) + /// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:1 w:1) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Proposals (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 20]`. - fn close_approved(_b: u32, m: u32, p: u32, ) -> Weight { - // Minimum execution time: 185_344 nanoseconds. - Weight::from_ref_time(149_598_371 as u64) - // Standard Error: 537_639 - .saturating_add(Weight::from_ref_time(542_924 as u64).saturating_mul(m as u64)) - // Standard Error: 2_658_416 - .saturating_add(Weight::from_ref_time(3_783_404 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `0 + b * (1 ±0) + m * (64 ±0) + p * (78 ±0)` + // Estimated: `3592 + b * (1 ±0) + m * (64 ±0) + p * (76 ±1)` + // Minimum execution time: 132_690_000 picoseconds. + Weight::from_parts(172_539_570, 0) + .saturating_add(Weight::from_parts(0, 3592)) + // Standard Error: 245_516 + .saturating_add(Weight::from_parts(88_525, 0).saturating_mul(m.into())) + // Standard Error: 1_213_981 + .saturating_add(Weight::from_parts(1_656_093, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 76).saturating_mul(p.into())) } - // Storage: TechnicalCommittee Proposals (r:1 w:1) - // Storage: TechnicalCommittee Voting (r:0 w:1) - // Storage: TechnicalCommittee ProposalOf (r:0 w:1) + /// Storage: TechnicalCommittee Proposals (r:1 w:1) + /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: TechnicalCommittee Voting (r:0 w:1) + /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) + /// Storage: TechnicalCommittee ProposalOf (r:0 w:1) + /// Proof Skipped: TechnicalCommittee ProposalOf (max_values: None, max_size: None, mode: Measured) /// The range of component `p` is `[1, 20]`. fn disapprove_proposal(p: u32, ) -> Weight { - // Minimum execution time: 79_294 nanoseconds. - Weight::from_ref_time(105_208_697 as u64) - // Standard Error: 1_319_396 - .saturating_add(Weight::from_ref_time(641_804 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + // Proof Size summary in bytes: + // Measured: `226 + p * (32 ±0)` + // Estimated: `1710 + p * (32 ±0)` + // Minimum execution time: 55_571_000 picoseconds. + Weight::from_parts(55_867_483, 0) + .saturating_add(Weight::from_parts(0, 1710)) + // Standard Error: 358_559 + .saturating_add(Weight::from_parts(1_217_099, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into())) } } diff --git a/runtime/common/src/weights/pallet_duniter_account.rs b/runtime/common/src/weights/pallet_duniter_account.rs index cd0019f228281e0c71df9241d9eab71a63469360..62e4d4e49edd381d1e360ac98f11b030be87c451 100644 --- a/runtime/common/src/weights/pallet_duniter_account.rs +++ b/runtime/common/src/weights/pallet_duniter_account.rs @@ -1,21 +1,3 @@ - - - - - - - - - -// NEED TO BE REPLACED BY FILE GENERATED WITH REFERENCE MACHINE - - - - - - - - // Copyright 2021-2022 Axiom-Team // // This file is part of Duniter-v2S. @@ -32,95 +14,139 @@ // You should have received a copy of the GNU Affero General Public License // along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. -//! Autogenerated weights for `common_runtime::duniter_account` +//! Autogenerated weights for `pallet_duniter_account` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-03-24, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 -// --pallet=common_runtime::duniter_account +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 // --header=./file_header.txt -// --output=./runtime/common/src/weights/pallet_duniter_account.rs +// --output=./runtime/common/src/weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; -/// Weight functions for `common_runtime::duniter_account`. +/// Weight functions for `pallet_duniter_account`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_duniter_account::WeightInfo for WeightInfo<T> { - // Storage: Account PendingNewAccounts (r:1 w:0) - // Storage: ProvideRandomness RequestIdProvider (r:1 w:1) - // Storage: ProvideRandomness RequestsIds (r:1 w:1) - // Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) - // Storage: Babe EpochIndex (r:1 w:0) - // Storage: ProvideRandomness NexEpochHookIn (r:1 w:0) - // Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) - // Storage: Account PendingRandomIdAssignments (r:0 w:1) + /// Storage: Account PendingNewAccounts (r:1 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestIdProvider (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestIdProvider (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestsIds (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsIds (max_values: None, max_size: None, mode: Measured) + /// Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) + /// Proof: ProvideRandomness CounterForRequestsIds (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Babe EpochIndex (r:1 w:0) + /// Proof: Babe EpochIndex (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: ProvideRandomness NexEpochHookIn (r:1 w:0) + /// Proof Skipped: ProvideRandomness NexEpochHookIn (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsReadyAtEpoch (max_values: None, max_size: None, mode: Measured) + /// Storage: Account PendingRandomIdAssignments (r:0 w:1) + /// Proof Skipped: Account PendingRandomIdAssignments (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[0, 1]`. fn on_initialize_sufficient(i: u32, ) -> Weight { - // Minimum execution time: 12_958 nanoseconds. - Weight::from_ref_time(14_907_902 as u64) - // Standard Error: 550_025 - .saturating_add(Weight::from_ref_time(79_482_297 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((6 as u64).saturating_mul(i as u64))) - .saturating_add(T::DbWeight::get().writes((6 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `42 + i * (309 ±0)` + // Estimated: `3816 + i * (309 ±0)` + // Minimum execution time: 13_976_000 picoseconds. + Weight::from_parts(20_107_000, 0) + .saturating_add(Weight::from_parts(0, 3816)) + // Standard Error: 5_235_621 + .saturating_add(Weight::from_parts(66_222_000, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(i.into()))) + .saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(i.into()))) + .saturating_add(Weight::from_parts(0, 309).saturating_mul(i.into())) } - // Storage: Account PendingNewAccounts (r:1 w:0) - // Storage: ProvideRandomness RequestIdProvider (r:1 w:1) - // Storage: ProvideRandomness RequestsIds (r:1 w:1) - // Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) - // Storage: Babe EpochIndex (r:1 w:0) - // Storage: ProvideRandomness NexEpochHookIn (r:1 w:0) - // Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) - // Storage: Account PendingRandomIdAssignments (r:0 w:1) + /// Storage: Account PendingNewAccounts (r:1 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestIdProvider (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestIdProvider (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestsIds (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsIds (max_values: None, max_size: None, mode: Measured) + /// Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) + /// Proof: ProvideRandomness CounterForRequestsIds (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Babe EpochIndex (r:1 w:0) + /// Proof: Babe EpochIndex (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: ProvideRandomness NexEpochHookIn (r:1 w:0) + /// Proof Skipped: ProvideRandomness NexEpochHookIn (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsReadyAtEpoch (max_values: None, max_size: None, mode: Measured) + /// Storage: Account PendingRandomIdAssignments (r:0 w:1) + /// Proof Skipped: Account PendingRandomIdAssignments (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[0, 1]`. fn on_initialize_with_balance(i: u32, ) -> Weight { - // Minimum execution time: 12_965 nanoseconds. - Weight::from_ref_time(16_754_718 as u64) - // Standard Error: 1_790_537 - .saturating_add(Weight::from_ref_time(164_043_481 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((6 as u64).saturating_mul(i as u64))) - .saturating_add(T::DbWeight::get().writes((6 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `42 + i * (309 ±0)` + // Estimated: `3816 + i * (309 ±0)` + // Minimum execution time: 13_885_000 picoseconds. + Weight::from_parts(18_835_500, 0) + .saturating_add(Weight::from_parts(0, 3816)) + // Standard Error: 5_218_700 + .saturating_add(Weight::from_parts(145_659_000, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(i.into()))) + .saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(i.into()))) + .saturating_add(Weight::from_parts(0, 309).saturating_mul(i.into())) } - // Storage: Account PendingNewAccounts (r:1 w:0) + /// Storage: Account PendingNewAccounts (r:1 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[0, 1]`. fn on_initialize_no_balance(i: u32, ) -> Weight { - // Minimum execution time: 12_912 nanoseconds. - Weight::from_ref_time(13_846_469 as u64) - // Standard Error: 115_598 - .saturating_add(Weight::from_ref_time(67_524_530 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `42 + i * (74 ±0)` + // Estimated: `3507 + i * (74 ±0)` + // Minimum execution time: 14_090_000 picoseconds. + Weight::from_parts(19_033_000, 0) + .saturating_add(Weight::from_parts(0, 3507)) + // Standard Error: 5_117_938 + .saturating_add(Weight::from_parts(34_767_000, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) + .saturating_add(Weight::from_parts(0, 74).saturating_mul(i.into())) } - // Storage: Account PendingRandomIdAssignments (r:1 w:1) + /// Storage: Account PendingRandomIdAssignments (r:1 w:1) + /// Proof Skipped: Account PendingRandomIdAssignments (max_values: None, max_size: None, mode: Measured) fn on_filled_randomness_pending() -> Weight { - // Minimum execution time: 66_963 nanoseconds. - Weight::from_ref_time(69_757_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `116` + // Estimated: `3581` + // Minimum execution time: 55_833_000 picoseconds. + Weight::from_parts(64_334_000, 0) + .saturating_add(Weight::from_parts(0, 3581)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Account PendingRandomIdAssignments (r:1 w:0) + /// Storage: Account PendingRandomIdAssignments (r:1 w:0) + /// Proof Skipped: Account PendingRandomIdAssignments (max_values: None, max_size: None, mode: Measured) fn on_filled_randomness_no_pending() -> Weight { - // Minimum execution time: 16_088 nanoseconds. - Weight::from_ref_time(27_963_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + // Proof Size summary in bytes: + // Measured: `42` + // Estimated: `3507` + // Minimum execution time: 11_103_000 picoseconds. + Weight::from_parts(18_273_000, 0) + .saturating_add(Weight::from_parts(0, 3507)) + .saturating_add(T::DbWeight::get().reads(1)) } } diff --git a/runtime/common/src/weights/pallet_grandpa.rs b/runtime/common/src/weights/pallet_grandpa.rs index 06039084ad2a4b2a80912465d8f97c43128ab445..c30daf2614ff976b19499ea659e98a994037c6b0 100644 --- a/runtime/common/src/weights/pallet_grandpa.rs +++ b/runtime/common/src/weights/pallet_grandpa.rs @@ -20,7 +20,7 @@ use frame_support::{ traits::Get, weights::{ - constants::{WEIGHT_PER_MICROS, WEIGHT_PER_NANOS}, + constants::{WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_NANOS}, Weight, }, }; @@ -35,19 +35,21 @@ impl<T: frame_system::Config> pallet_grandpa::WeightInfo for WeightInfo<T> { let validator_count = validator_count.max(100) as u64; // checking membership proof - (WEIGHT_PER_MICROS * 35) - .saturating_add((WEIGHT_PER_NANOS * 175).saturating_mul(validator_count)) + (Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 35) + .saturating_add(Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS, 0) * 175) + .saturating_mul(validator_count) .saturating_add(T::DbWeight::get().reads(5)) // check equivocation proof - .saturating_add(WEIGHT_PER_MICROS * 95) + .saturating_add(Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 95) // report offence - .saturating_add(WEIGHT_PER_MICROS * 110) + .saturating_add(Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 110) .saturating_add(T::DbWeight::get().writes(3)) // fetching set id -> session index mappings .saturating_add(T::DbWeight::get().reads(2)) } fn note_stalled() -> Weight { - (WEIGHT_PER_MICROS * 3).saturating_add(T::DbWeight::get().writes(1)) + (Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS, 0) * 3) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_identity.rs b/runtime/common/src/weights/pallet_identity.rs index f438c79f70232d494bf5c9e8239ee27be2136293..2d2e0eb35baaedb4237b9223f50b1249d27f9008 100644 --- a/runtime/common/src/weights/pallet_identity.rs +++ b/runtime/common/src/weights/pallet_identity.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_identity` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `Hugo`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet // --chain=gdev-benchmark -// --steps=50 -// --repeat=20 -// --pallet=pallet-identity +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,114 +40,200 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_identity`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> { - // Storage: Identity IdentityIndexOf (r:2 w:1) - // Storage: Identity Identities (r:2 w:2) - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: System Account (r:1 w:1) - // Storage: Identity NextIdtyIndex (r:1 w:1) - // Storage: Identity CounterForIdentities (r:1 w:1) - // Storage: Identity IdentitiesRemovableOn (r:1 w:1) - // Storage: Cert StorageCertsRemovableOn (r:1 w:1) - // Storage: Cert CertsByReceiver (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:2 w:1) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:2 w:2) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Identity NextIdtyIndex (r:1 w:1) + /// Proof Skipped: Identity NextIdtyIndex (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Identity CounterForIdentities (r:1 w:1) + /// Proof: Identity CounterForIdentities (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Identity IdentitiesRemovableOn (r:1 w:1) + /// Proof Skipped: Identity IdentitiesRemovableOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageCertsRemovableOn (r:1 w:1) + /// Proof Skipped: Cert StorageCertsRemovableOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert CertsByReceiver (r:1 w:1) + /// Proof Skipped: Cert CertsByReceiver (max_values: None, max_size: None, mode: Measured) fn create_identity() -> Weight { - // Minimum execution time: 121_934 nanoseconds. - Weight::from_ref_time(138_522_000 as u64) - .saturating_add(T::DbWeight::get().reads(13 as u64)) - .saturating_add(T::DbWeight::get().writes(11 as u64)) + // Proof Size summary in bytes: + // Measured: `910` + // Estimated: `6850` + // Minimum execution time: 229_558_000 picoseconds. + Weight::from_parts(261_641_000, 0) + .saturating_add(Weight::from_parts(0, 6850)) + .saturating_add(T::DbWeight::get().reads(13)) + .saturating_add(T::DbWeight::get().writes(11)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Identity Identities (r:1 w:1) - // Storage: Identity IdentitiesNames (r:1 w:1) - // Storage: Membership PendingMembership (r:1 w:1) - // Storage: Membership Membership (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership PendingMembershipsExpireOn (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity IdentitiesNames (r:1 w:1) + /// Proof Skipped: Identity IdentitiesNames (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership PendingMembership (r:1 w:1) + /// Proof Skipped: Membership PendingMembership (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:0) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership PendingMembershipsExpireOn (r:1 w:1) + /// Proof Skipped: Membership PendingMembershipsExpireOn (max_values: None, max_size: None, mode: Measured) fn confirm_identity() -> Weight { - // Minimum execution time: 86_584 nanoseconds. - Weight::from_ref_time(98_246_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + // Proof Size summary in bytes: + // Measured: `815` + // Estimated: `4280` + // Minimum execution time: 143_659_000 picoseconds. + Weight::from_parts(158_354_000, 0) + .saturating_add(Weight::from_parts(0, 4280)) + .saturating_add(T::DbWeight::get().reads(7)) + .saturating_add(T::DbWeight::get().writes(4)) } - // Storage: Identity Identities (r:1 w:1) - // Storage: Membership Membership (r:1 w:1) - // Storage: Cert StorageIdtyCertMeta (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership PendingMembership (r:1 w:1) - // Storage: Membership CounterForMembership (r:1 w:1) - // Storage: Membership MembershipsExpireOn (r:1 w:1) - // Storage: UniversalDividend CurrentUdIndex (r:1 w:0) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership PendingMembership (r:1 w:1) + /// Proof Skipped: Membership PendingMembership (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:1 w:0) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:1) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership CounterForMembership (r:1 w:1) + /// Proof: Membership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Membership MembershipsExpireOn (r:1 w:1) + /// Proof Skipped: Membership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: UniversalDividend CurrentUdIndex (r:1 w:0) + /// Proof: UniversalDividend CurrentUdIndex (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) fn validate_identity() -> Weight { - // Minimum execution time: 91_201 nanoseconds. - Weight::from_ref_time(94_836_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + // Proof Size summary in bytes: + // Measured: `955` + // Estimated: `4420` + // Minimum execution time: 171_418_000 picoseconds. + Weight::from_parts(190_580_000, 0) + .saturating_add(Weight::from_parts(0, 4420)) + .saturating_add(T::DbWeight::get().reads(8)) + .saturating_add(T::DbWeight::get().writes(5)) } - // Storage: Identity IdentityIndexOf (r:2 w:2) - // Storage: Identity Identities (r:1 w:1) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: System BlockHash (r:1 w:0) - // Storage: System Account (r:2 w:2) - // Storage: AuthorityMembers Members (r:1 w:0) + /// Storage: Identity IdentityIndexOf (r:2 w:2) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: System BlockHash (r:1 w:0) + /// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) + /// Storage: System Account (r:2 w:2) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: AuthorityMembers Members (r:1 w:0) + /// Proof Skipped: AuthorityMembers Members (max_values: None, max_size: None, mode: Measured) fn change_owner_key() -> Weight { - // Minimum execution time: 213_666 nanoseconds. - Weight::from_ref_time(247_995_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + // Proof Size summary in bytes: + // Measured: `1077` + // Estimated: `7017` + // Minimum execution time: 406_461_000 picoseconds. + Weight::from_parts(636_569_000, 0) + .saturating_add(Weight::from_parts(0, 7017)) + .saturating_add(T::DbWeight::get().reads(8)) + .saturating_add(T::DbWeight::get().writes(5)) } - // Storage: Identity Identities (r:1 w:1) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: System BlockHash (r:1 w:0) - // Storage: Membership Membership (r:1 w:1) - // Storage: Identity CounterForIdentities (r:1 w:1) - // Storage: System Account (r:2 w:2) - // Storage: Cert CertsByReceiver (r:1 w:1) - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Identity IdentityIndexOf (r:0 w:1) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: System BlockHash (r:1 w:0) + /// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) + /// Storage: Membership Membership (r:1 w:1) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity CounterForIdentities (r:1 w:1) + /// Proof: Identity CounterForIdentities (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: System Account (r:2 w:2) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Cert CertsByReceiver (r:1 w:1) + /// Proof Skipped: Cert CertsByReceiver (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Identity IdentityIndexOf (r:0 w:1) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) fn revoke_identity() -> Weight { - // Minimum execution time: 227_151 nanoseconds. - Weight::from_ref_time(284_771_000 as u64) - .saturating_add(T::DbWeight::get().reads(11 as u64)) - .saturating_add(T::DbWeight::get().writes(9 as u64)) + // Proof Size summary in bytes: + // Measured: `1547` + // Estimated: `7487` + // Minimum execution time: 404_569_000 picoseconds. + Weight::from_parts(420_040_000, 0) + .saturating_add(Weight::from_parts(0, 7487)) + .saturating_add(T::DbWeight::get().reads(11)) + .saturating_add(T::DbWeight::get().writes(9)) } - // Storage: Identity Identities (r:1 w:1) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: Membership Membership (r:1 w:1) - // Storage: Identity CounterForIdentities (r:1 w:1) - // Storage: System Account (r:1 w:1) - // Storage: Cert CertsByReceiver (r:1 w:1) - // Storage: Cert StorageIdtyCertMeta (r:2 w:2) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Identity IdentityIndexOf (r:0 w:1) - // Storage: Identity IdentitiesNames (r:0 w:1) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:0) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:1) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity CounterForIdentities (r:1 w:1) + /// Proof: Identity CounterForIdentities (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Cert CertsByReceiver (r:1 w:1) + /// Proof Skipped: Cert CertsByReceiver (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:2 w:2) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Identity IdentityIndexOf (r:0 w:1) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity IdentitiesNames (r:0 w:1) + /// Proof Skipped: Identity IdentitiesNames (max_values: None, max_size: None, mode: Measured) fn remove_identity() -> Weight { - // Minimum execution time: 110_561 nanoseconds. - Weight::from_ref_time(119_198_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(9 as u64)) + // Proof Size summary in bytes: + // Measured: `1352` + // Estimated: `7292` + // Minimum execution time: 221_063_000 picoseconds. + Weight::from_parts(261_413_000, 0) + .saturating_add(Weight::from_parts(0, 7292)) + .saturating_add(T::DbWeight::get().reads(9)) + .saturating_add(T::DbWeight::get().writes(9)) } - // Storage: Identity IdentitiesNames (r:0 w:20) + /// Storage: Identity IdentitiesNames (r:0 w:999) + /// Proof Skipped: Identity IdentitiesNames (max_values: None, max_size: None, mode: Measured) /// The range of component `i` is `[1, 1000]`. fn prune_item_identities_names(i: u32, ) -> Weight { - // Minimum execution time: 10_675 nanoseconds. - Weight::from_ref_time(10_809_000 as u64) - // Standard Error: 3_281 - .saturating_add(Weight::from_ref_time(1_492_089 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 11_247_000 picoseconds. + Weight::from_parts(11_247_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 20_366 + .saturating_add(Weight::from_parts(3_802_802, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } - // Storage: System Account (r:1 w:1) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) fn fix_sufficients() -> Weight { - // Minimum execution time: 23_639 nanoseconds. - Weight::from_ref_time(29_075_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `103` + // Estimated: `3626` + // Minimum execution time: 30_488_000 picoseconds. + Weight::from_parts(32_424_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_im_online.rs b/runtime/common/src/weights/pallet_im_online.rs index 8b40edc36fc28460d7a2553c313d68ee9a26ea9e..f987114b878fecce9e16a80e4ee180e966c71b6a 100644 --- a/runtime/common/src/weights/pallet_im_online.rs +++ b/runtime/common/src/weights/pallet_im_online.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_im_online` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-28, STEPS: `5`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev +// --chain=gdev-benchmark // --steps=5 // --repeat=2 -// --pallet=pallet_im_online +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,29 +40,41 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_im_online`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_im_online::WeightInfo for WeightInfo<T> { - // Storage: Session Validators (r:1 w:0) - // Storage: Session CurrentIndex (r:1 w:0) - // Storage: ImOnline ReceivedHeartbeats (r:1 w:1) - // Storage: ImOnline AuthoredBlocks (r:1 w:0) - // Storage: ImOnline Keys (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) + /// Storage: Session Validators (r:1 w:0) + /// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Session CurrentIndex (r:1 w:0) + /// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ImOnline Keys (r:1 w:0) + /// Proof: ImOnline Keys (max_values: Some(1), max_size: Some(32002), added: 32497, mode: MaxEncodedLen) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ImOnline ReceivedHeartbeats (r:1 w:1) + /// Proof: ImOnline ReceivedHeartbeats (max_values: None, max_size: Some(10021032), added: 10023507, mode: MaxEncodedLen) + /// Storage: ImOnline AuthoredBlocks (r:1 w:0) + /// Proof: ImOnline AuthoredBlocks (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen) /// The range of component `k` is `[1, 1000]`. /// The range of component `e` is `[1, 100]`. fn validate_unsigned_and_then_heartbeat(k: u32, e: u32, ) -> Weight { - // Minimum execution time: 377_945 nanoseconds. - Weight::from_ref_time(432_387_870 as u64) - // Standard Error: 78_386 - .saturating_add(Weight::from_ref_time(31_657 as u64).saturating_mul(k as u64)) - // Standard Error: 788_194 - .saturating_add(Weight::from_ref_time(2_116_845 as u64).saturating_mul(e as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `614 + k * (32 ±0)` + // Estimated: `10024497 + k * (32 ±0)` + // Minimum execution time: 299_316_000 picoseconds. + Weight::from_parts(266_801_207, 0) + .saturating_add(Weight::from_parts(0, 10024497)) + // Standard Error: 12_875 + .saturating_add(Weight::from_parts(39_836, 0).saturating_mul(k.into())) + // Standard Error: 129_462 + .saturating_add(Weight::from_parts(1_233_773, 0).saturating_mul(e.into())) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(1)) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(k.into())) } } diff --git a/runtime/common/src/weights/pallet_membership_membership.rs b/runtime/common/src/weights/pallet_membership_membership.rs index ddbc76f57a19b1cc2edc4948e39522101838c418..93478265a6bcf2841cb9dbe2c154eb7be5b76f5c 100644 --- a/runtime/common/src/weights/pallet_membership_membership.rs +++ b/runtime/common/src/weights/pallet_membership_membership.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_membership` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `Hugo`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet // --chain=gdev-benchmark -// --steps=50 -// --repeat=20 -// --pallet=pallet-membership +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,63 +40,95 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_membership`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> { - // Storage: Membership PendingMembership (r:1 w:1) - // Storage: Membership Membership (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership PendingMembershipsExpireOn (r:1 w:1) - fn force_request_membership() -> Weight { - // Minimum execution time: 42_024 nanoseconds. - Weight::from_ref_time(55_713_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Identity Identities (r:1 w:0) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) fn request_membership() -> Weight { - // Minimum execution time: 19_511 nanoseconds. - Weight::from_ref_time(37_123_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + // Proof Size summary in bytes: + // Measured: `365` + // Estimated: `3830` + // Minimum execution time: 39_742_000 picoseconds. + Weight::from_parts(51_466_000, 0) + .saturating_add(Weight::from_parts(0, 3830)) + .saturating_add(T::DbWeight::get().reads(2)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Membership Membership (r:1 w:1) - // Storage: Cert StorageIdtyCertMeta (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership PendingMembership (r:1 w:1) - // Storage: Membership CounterForMembership (r:1 w:1) - // Storage: Membership MembershipsExpireOn (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership PendingMembership (r:1 w:1) + /// Proof Skipped: Membership PendingMembership (max_values: None, max_size: None, mode: Measured) + /// Storage: Cert StorageIdtyCertMeta (r:1 w:0) + /// Proof Skipped: Cert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:1) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership CounterForMembership (r:1 w:1) + /// Proof: Membership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Membership MembershipsExpireOn (r:1 w:1) + /// Proof Skipped: Membership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: UniversalDividend CurrentUdIndex (r:1 w:0) + /// Proof: UniversalDividend CurrentUdIndex (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) fn claim_membership() -> Weight { - // Minimum execution time: 80_875 nanoseconds. - Weight::from_ref_time(117_287_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + // Proof Size summary in bytes: + // Measured: `982` + // Estimated: `4447` + // Minimum execution time: 156_273_000 picoseconds. + Weight::from_parts(169_724_000, 0) + .saturating_add(Weight::from_parts(0, 4447)) + .saturating_add(T::DbWeight::get().reads(9)) + .saturating_add(T::DbWeight::get().writes(5)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Membership Membership (r:1 w:1) - // Storage: Identity Identities (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: Membership MembershipsExpireOn (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:1) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership MembershipsExpireOn (r:2 w:2) + /// Proof Skipped: Membership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) fn renew_membership() -> Weight { - // Minimum execution time: 69_195 nanoseconds. - Weight::from_ref_time(91_620_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `646` + // Estimated: `6586` + // Minimum execution time: 110_180_000 picoseconds. + Weight::from_parts(126_218_000, 0) + .saturating_add(Weight::from_parts(0, 6586)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Membership Membership (r:1 w:1) - // Storage: Membership CounterForMembership (r:1 w:1) - // Storage: Identity Identities (r:1 w:0) - // Storage: UniversalDividend CurrentUdIndex (r:1 w:0) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership Membership (r:1 w:1) + /// Proof Skipped: Membership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Membership CounterForMembership (r:1 w:1) + /// Proof: Membership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Membership MembershipsExpireOn (r:1 w:1) + /// Proof Skipped: Membership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: UniversalDividend CurrentUdIndex (r:1 w:0) + /// Proof: UniversalDividend CurrentUdIndex (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) fn revoke_membership() -> Weight { - // Minimum execution time: 64_419 nanoseconds. - Weight::from_ref_time(103_812_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `639` + // Estimated: `4104` + // Minimum execution time: 102_688_000 picoseconds. + Weight::from_parts(129_033_000, 0) + .saturating_add(Weight::from_parts(0, 4104)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(3)) } } diff --git a/runtime/common/src/weights/pallet_membership_smith_membership.rs b/runtime/common/src/weights/pallet_membership_smith_membership.rs index cdc459c197885d84fe14505ef96a0c13d25f72c8..3d842ee7ae84d714d61a648bee3e2abcb851e31c 100644 --- a/runtime/common/src/weights/pallet_membership_smith_membership.rs +++ b/runtime/common/src/weights/pallet_membership_smith_membership.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_membership` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `Hugo`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet // --chain=gdev-benchmark -// --steps=50 -// --repeat=20 -// --pallet=pallet-membership +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,68 +40,101 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_membership`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> { - // Storage: SmithMembership PendingMembership (r:1 w:1) - // Storage: SmithMembership Membership (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithMembership PendingMembershipsExpireOn (r:1 w:1) - fn force_request_membership() -> Weight { - // Minimum execution time: 42_163 nanoseconds. - Weight::from_ref_time(49_619_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Identity Identities (r:1 w:0) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) fn request_membership() -> Weight { - // Minimum execution time: 20_399 nanoseconds. - Weight::from_ref_time(24_906_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + // Proof Size summary in bytes: + // Measured: `365` + // Estimated: `3830` + // Minimum execution time: 40_411_000 picoseconds. + Weight::from_parts(42_517_000, 0) + .saturating_add(Weight::from_parts(0, 3830)) + .saturating_add(T::DbWeight::get().reads(2)) } - // Storage: Identity IdentityIndexOf (r:2 w:0) - // Storage: SmithMembership Membership (r:2 w:1) - // Storage: SmithCert StorageIdtyCertMeta (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithMembership PendingMembership (r:1 w:1) - // Storage: SmithMembership CounterForMembership (r:1 w:1) - // Storage: SmithMembership MembershipsExpireOn (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:2 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership PendingMembership (r:1 w:1) + /// Proof Skipped: SmithMembership PendingMembership (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithCert StorageIdtyCertMeta (r:1 w:0) + /// Proof Skipped: SmithCert StorageIdtyCertMeta (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:2 w:1) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership CounterForMembership (r:1 w:1) + /// Proof: SmithMembership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: SmithMembership MembershipsExpireOn (r:1 w:1) + /// Proof Skipped: SmithMembership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) fn claim_membership() -> Weight { - // Minimum execution time: 95_541 nanoseconds. - Weight::from_ref_time(157_882_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + // Proof Size summary in bytes: + // Measured: `827` + // Estimated: `6767` + // Minimum execution time: 142_215_000 picoseconds. + Weight::from_parts(152_753_000, 0) + .saturating_add(Weight::from_parts(0, 6767)) + .saturating_add(T::DbWeight::get().reads(9)) + .saturating_add(T::DbWeight::get().writes(4)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:1) - // Storage: Identity Identities (r:1 w:0) - // Storage: Parameters ParametersStorage (r:1 w:0) - // Storage: SmithMembership MembershipsExpireOn (r:1 w:1) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:1) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:0) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership MembershipsExpireOn (r:2 w:2) + /// Proof Skipped: SmithMembership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) fn renew_membership() -> Weight { - // Minimum execution time: 70_298 nanoseconds. - Weight::from_ref_time(109_069_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `645` + // Estimated: `6585` + // Minimum execution time: 110_054_000 picoseconds. + Weight::from_parts(112_760_000, 0) + .saturating_add(Weight::from_parts(0, 6585)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: SmithMembership Membership (r:1 w:1) - // Storage: SmithMembership CounterForMembership (r:1 w:1) - // Storage: AuthorityMembers Members (r:1 w:1) - // Storage: AuthorityMembers OnlineAuthorities (r:1 w:1) - // Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) - // Storage: AuthorityMembers IncomingAuthorities (r:1 w:1) - // Storage: Session NextKeys (r:1 w:1) - // Storage: System Account (r:1 w:1) - // Storage: Session KeyOwner (r:0 w:4) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership Membership (r:1 w:1) + /// Proof Skipped: SmithMembership Membership (max_values: None, max_size: None, mode: Measured) + /// Storage: SmithMembership CounterForMembership (r:1 w:1) + /// Proof: SmithMembership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: SmithMembership MembershipsExpireOn (r:1 w:1) + /// Proof Skipped: SmithMembership MembershipsExpireOn (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers Members (r:1 w:1) + /// Proof Skipped: AuthorityMembers Members (max_values: None, max_size: None, mode: Measured) + /// Storage: AuthorityMembers OnlineAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers OnlineAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers AuthoritiesCounter (r:1 w:1) + /// Proof Skipped: AuthorityMembers AuthoritiesCounter (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: AuthorityMembers IncomingAuthorities (r:1 w:1) + /// Proof Skipped: AuthorityMembers IncomingAuthorities (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Session NextKeys (r:1 w:1) + /// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Session KeyOwner (r:0 w:4) + /// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured) fn revoke_membership() -> Weight { - // Minimum execution time: 138_537 nanoseconds. - Weight::from_ref_time(179_540_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(12 as u64)) + // Proof Size summary in bytes: + // Measured: `1164` + // Estimated: `4629` + // Minimum execution time: 224_136_000 picoseconds. + Weight::from_parts(238_140_000, 0) + .saturating_add(Weight::from_parts(0, 4629)) + .saturating_add(T::DbWeight::get().reads(10)) + .saturating_add(T::DbWeight::get().writes(13)) } } diff --git a/runtime/common/src/weights/pallet_multisig.rs b/runtime/common/src/weights/pallet_multisig.rs index e241b4a6edec79452f815e66a4d53cb604e51e28..df2deee546d1bec42e17e7a3981b360d33410be1 100644 --- a/runtime/common/src/weights/pallet_multisig.rs +++ b/runtime/common/src/weights/pallet_multisig.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_multisig` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,84 +40,120 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_multisig`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> { /// The range of component `z` is `[0, 10000]`. fn as_multi_threshold_1(z: u32, ) -> Weight { - // Minimum execution time: 39_623 nanoseconds. - Weight::from_ref_time(64_353_128 as u64) - // Standard Error: 236 - .saturating_add(Weight::from_ref_time(430 as u64).saturating_mul(z as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 23_579_000 picoseconds. + Weight::from_parts(26_428_100, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 601 + .saturating_add(Weight::from_parts(1_858, 0).saturating_mul(z.into())) } - // Storage: Multisig Multisigs (r:1 w:1) - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) + /// Storage: Multisig Multisigs (r:1 w:1) + /// Proof: Multisig Multisigs (max_values: None, max_size: Some(457), added: 2932, mode: MaxEncodedLen) /// The range of component `s` is `[2, 10]`. /// The range of component `z` is `[0, 10000]`. - fn as_multi_create(_s: u32, z: u32, ) -> Weight { - // Minimum execution time: 133_923 nanoseconds. - Weight::from_ref_time(191_030_237 as u64) - // Standard Error: 457 - .saturating_add(Weight::from_ref_time(3_713 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn as_multi_create(s: u32, z: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `174 + s * (4 ±0)` + // Estimated: `3922` + // Minimum execution time: 118_427_000 picoseconds. + Weight::from_parts(123_956_792, 0) + .saturating_add(Weight::from_parts(0, 3922)) + // Standard Error: 1_009_038 + .saturating_add(Weight::from_parts(1_014_396, 0).saturating_mul(s.into())) + // Standard Error: 807 + .saturating_add(Weight::from_parts(1_494, 0).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Multisig Multisigs (r:1 w:1) + /// Storage: Multisig Multisigs (r:1 w:1) + /// Proof: Multisig Multisigs (max_values: None, max_size: Some(457), added: 2932, mode: MaxEncodedLen) /// The range of component `s` is `[3, 10]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve(s: u32, z: u32, ) -> Weight { - // Minimum execution time: 106_365 nanoseconds. - Weight::from_ref_time(135_022_602 as u64) - // Standard Error: 581_042 - .saturating_add(Weight::from_ref_time(2_156_442 as u64).saturating_mul(s as u64)) - // Standard Error: 435 - .saturating_add(Weight::from_ref_time(1_109 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `240` + // Estimated: `3922` + // Minimum execution time: 73_115_000 picoseconds. + Weight::from_parts(75_846_342, 0) + .saturating_add(Weight::from_parts(0, 3922)) + // Standard Error: 1_803_422 + .saturating_add(Weight::from_parts(2_178_989, 0).saturating_mul(s.into())) + // Standard Error: 1_337 + .saturating_add(Weight::from_parts(1_473, 0).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Multisig Multisigs (r:1 w:1) - // Storage: System Account (r:1 w:1) + /// Storage: Multisig Multisigs (r:1 w:1) + /// Proof: Multisig Multisigs (max_values: None, max_size: Some(457), added: 2932, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) /// The range of component `s` is `[2, 10]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_complete(_s: u32, z: u32, ) -> Weight { - // Minimum execution time: 138_825 nanoseconds. - Weight::from_ref_time(180_075_916 as u64) - // Standard Error: 659 - .saturating_add(Weight::from_ref_time(4_967 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `308 + s * (36 ±0)` + // Estimated: `3922` + // Minimum execution time: 119_094_000 picoseconds. + Weight::from_parts(110_581_521, 0) + .saturating_add(Weight::from_parts(0, 3922)) + // Standard Error: 4_969 + .saturating_add(Weight::from_parts(12_145, 0).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Multisig Multisigs (r:1 w:1) - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) + /// Storage: Multisig Multisigs (r:1 w:1) + /// Proof: Multisig Multisigs (max_values: None, max_size: Some(457), added: 2932, mode: MaxEncodedLen) /// The range of component `s` is `[2, 10]`. - fn approve_as_multi_create(_s: u32, ) -> Weight { - // Minimum execution time: 120_530 nanoseconds. - Weight::from_ref_time(196_259_883 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn approve_as_multi_create(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `171 + s * (5 ±0)` + // Estimated: `3922` + // Minimum execution time: 101_653_000 picoseconds. + Weight::from_parts(105_756_350, 0) + .saturating_add(Weight::from_parts(0, 3922)) + // Standard Error: 530_883 + .saturating_add(Weight::from_parts(257_575, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Multisig Multisigs (r:1 w:1) + /// Storage: Multisig Multisigs (r:1 w:1) + /// Proof: Multisig Multisigs (max_values: None, max_size: Some(457), added: 2932, mode: MaxEncodedLen) /// The range of component `s` is `[2, 10]`. fn approve_as_multi_approve(s: u32, ) -> Weight { - // Minimum execution time: 87_452 nanoseconds. - Weight::from_ref_time(107_209_180 as u64) - // Standard Error: 385_360 - .saturating_add(Weight::from_ref_time(214 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `240` + // Estimated: `3922` + // Minimum execution time: 64_210_000 picoseconds. + Weight::from_parts(54_945_550, 0) + .saturating_add(Weight::from_parts(0, 3922)) + // Standard Error: 1_658_456 + .saturating_add(Weight::from_parts(3_219_925, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Multisig Multisigs (r:1 w:1) + /// Storage: Multisig Multisigs (r:1 w:1) + /// Proof: Multisig Multisigs (max_values: None, max_size: Some(457), added: 2932, mode: MaxEncodedLen) /// The range of component `s` is `[2, 10]`. - fn cancel_as_multi(s: u32, ) -> Weight { - // Minimum execution time: 120_030 nanoseconds. - Weight::from_ref_time(100_274_839 as u64) - // Standard Error: 548_135 - .saturating_add(Weight::from_ref_time(9_304_206 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn cancel_as_multi(_s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `369 + s * (5 ±0)` + // Estimated: `3922` + // Minimum execution time: 105_930_000 picoseconds. + Weight::from_parts(166_384_900, 0) + .saturating_add(Weight::from_parts(0, 3922)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_oneshot_account.rs b/runtime/common/src/weights/pallet_oneshot_account.rs index a6a423bd79438c92a04ee51053bb92d117f329f2..7c1d991f36adcd8968a38f65e7c33bbb518405c8 100644 --- a/runtime/common/src/weights/pallet_oneshot_account.rs +++ b/runtime/common/src/weights/pallet_oneshot_account.rs @@ -17,54 +17,78 @@ //! Autogenerated weights for `pallet_oneshot_account` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Interpreted, CHAIN: Some("dev"), DB CACHE: 1024 +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./duniter +// target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_oneshot_account +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm -// --wasm-execution=interpreted-i-know-what-i-do +// --wasm-execution=compiled // --heap-pages=4096 // --header=./file_header.txt -// --output=. +// --output=./runtime/common/src/weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_oneshot_account`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_oneshot_account::WeightInfo for WeightInfo<T> { - // Storage: OneshotAccount OneshotAccounts (r:1 w:1) + /// Storage: OneshotAccount OneshotAccounts (r:1 w:1) + /// Proof Skipped: OneshotAccount OneshotAccounts (max_values: None, max_size: None, mode: Measured) fn create_oneshot_account() -> Weight { - (Weight::from_ref_time(941_602_000)) + // Proof Size summary in bytes: + // Measured: `42` + // Estimated: `3507` + // Minimum execution time: 83_862_000 picoseconds. + Weight::from_parts(90_784_000, 0) + .saturating_add(Weight::from_parts(0, 3507)) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: OneshotAccount OneshotAccounts (r:1 w:1) - // Storage: System BlockHash (r:1 w:0) - // Storage: System Account (r:1 w:1) + /// Storage: OneshotAccount OneshotAccounts (r:1 w:1) + /// Proof Skipped: OneshotAccount OneshotAccounts (max_values: None, max_size: None, mode: Measured) + /// Storage: System BlockHash (r:1 w:0) + /// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) fn consume_oneshot_account() -> Weight { - (Weight::from_ref_time(971_453_000)) + // Proof Size summary in bytes: + // Measured: `282` + // Estimated: `3747` + // Minimum execution time: 105_015_000 picoseconds. + Weight::from_parts(117_216_000, 0) + .saturating_add(Weight::from_parts(0, 3747)) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: OneshotAccount OneshotAccounts (r:1 w:1) - // Storage: System BlockHash (r:1 w:0) - // Storage: System Account (r:2 w:2) + /// Storage: OneshotAccount OneshotAccounts (r:1 w:1) + /// Proof Skipped: OneshotAccount OneshotAccounts (max_values: None, max_size: None, mode: Measured) + /// Storage: System BlockHash (r:1 w:0) + /// Proof: System BlockHash (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) + /// Storage: System Account (r:2 w:2) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) fn consume_oneshot_account_with_remaining() -> Weight { - (Weight::from_ref_time(1_500_781_000)) + // Proof Size summary in bytes: + // Measured: `386` + // Estimated: `6262` + // Minimum execution time: 140_399_000 picoseconds. + Weight::from_parts(146_010_000, 0) + .saturating_add(Weight::from_parts(0, 6262)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } diff --git a/runtime/common/src/weights/pallet_preimage.rs b/runtime/common/src/weights/pallet_preimage.rs index fc43118b2da2fbbd72e52d8bc17b467025a6789f..68899746b763dc0ef231a04d2cb29a6d24ea1c98 100644 --- a/runtime/common/src/weights/pallet_preimage.rs +++ b/runtime/common/src/weights/pallet_preimage.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_preimage` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,110 +40,177 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_preimage`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> { - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) + /// Storage: Preimage PreimageFor (r:0 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) /// The range of component `s` is `[0, 4194304]`. fn note_preimage(s: u32, ) -> Weight { - // Minimum execution time: 196_512 nanoseconds. - Weight::from_ref_time(213_561_909 as u64) - // Standard Error: 37 - .saturating_add(Weight::from_ref_time(4_735 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `144` + // Estimated: `3548` + // Minimum execution time: 95_465_000 picoseconds. + Weight::from_parts(95_465_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + // Standard Error: 82 + .saturating_add(Weight::from_parts(3_779, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) + /// Storage: Preimage PreimageFor (r:0 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) /// The range of component `s` is `[0, 4194304]`. fn note_requested_preimage(s: u32, ) -> Weight { - // Minimum execution time: 78_777 nanoseconds. - Weight::from_ref_time(57_851_183 as u64) - // Standard Error: 23 - .saturating_add(Weight::from_ref_time(4_687 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `106` + // Estimated: `3548` + // Minimum execution time: 55_082_000 picoseconds. + Weight::from_parts(55_082_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + // Standard Error: 77 + .saturating_add(Weight::from_parts(3_788, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) + /// Storage: Preimage PreimageFor (r:0 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) /// The range of component `s` is `[0, 4194304]`. fn note_no_deposit_preimage(s: u32, ) -> Weight { - // Minimum execution time: 74_579 nanoseconds. - Weight::from_ref_time(79_541_000 as u64) - // Standard Error: 14 - .saturating_add(Weight::from_ref_time(4_700 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `106` + // Estimated: `3548` + // Minimum execution time: 54_234_000 picoseconds. + Weight::from_parts(54_234_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + // Standard Error: 86 + .saturating_add(Weight::from_parts(3_800, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) + /// Storage: Preimage PreimageFor (r:0 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) fn unnote_preimage() -> Weight { - // Minimum execution time: 154_621 nanoseconds. - Weight::from_ref_time(162_561_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `282` + // Estimated: `3548` + // Minimum execution time: 125_550_000 picoseconds. + Weight::from_parts(144_762_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) + /// Storage: Preimage PreimageFor (r:0 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) fn unnote_no_deposit_preimage() -> Weight { - // Minimum execution time: 115_122 nanoseconds. - Weight::from_ref_time(120_939_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `144` + // Estimated: `3548` + // Minimum execution time: 72_643_000 picoseconds. + Weight::from_parts(77_957_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) fn request_preimage() -> Weight { - // Minimum execution time: 109_632 nanoseconds. - Weight::from_ref_time(113_138_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `180` + // Estimated: `3548` + // Minimum execution time: 64_953_000 picoseconds. + Weight::from_parts(71_781_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) fn request_no_deposit_preimage() -> Weight { - // Minimum execution time: 69_365 nanoseconds. - Weight::from_ref_time(73_144_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `144` + // Estimated: `3548` + // Minimum execution time: 43_384_000 picoseconds. + Weight::from_parts(47_286_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) fn request_unnoted_preimage() -> Weight { - // Minimum execution time: 82_607 nanoseconds. - Weight::from_ref_time(87_314_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `42` + // Estimated: `3548` + // Minimum execution time: 58_752_000 picoseconds. + Weight::from_parts(88_290_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) fn request_requested_preimage() -> Weight { - // Minimum execution time: 39_576 nanoseconds. - Weight::from_ref_time(65_138_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `106` + // Estimated: `3548` + // Minimum execution time: 37_004_000 picoseconds. + Weight::from_parts(38_686_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) + /// Storage: Preimage PreimageFor (r:0 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) fn unrequest_preimage() -> Weight { - // Minimum execution time: 115_728 nanoseconds. - Weight::from_ref_time(122_479_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `144` + // Estimated: `3548` + // Minimum execution time: 70_801_000 picoseconds. + Weight::from_parts(81_331_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) fn unrequest_unnoted_preimage() -> Weight { - // Minimum execution time: 37_209 nanoseconds. - Weight::from_ref_time(38_525_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `106` + // Estimated: `3548` + // Minimum execution time: 37_544_000 picoseconds. + Weight::from_parts(38_578_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) fn unrequest_multi_referenced_preimage() -> Weight { - // Minimum execution time: 37_962 nanoseconds. - Weight::from_ref_time(41_368_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `106` + // Estimated: `3548` + // Minimum execution time: 36_326_000 picoseconds. + Weight::from_parts(37_114_000, 0) + .saturating_add(Weight::from_parts(0, 3548)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_provide_randomness.rs b/runtime/common/src/weights/pallet_provide_randomness.rs index 4d421aae77e05b1bae0bc1081324e9b90bd18d1f..d615e841a3b6de8c97bfada4bc677bba50300a7d 100644 --- a/runtime/common/src/weights/pallet_provide_randomness.rs +++ b/runtime/common/src/weights/pallet_provide_randomness.rs @@ -1,11 +1,3 @@ - - - -// NEED TO BE REPLACED BY FILE GENERATED WITH REFERENCE MACHINE - - - - // Copyright 2021-2022 Axiom-Team // // This file is part of Duniter-v2S. @@ -25,62 +17,85 @@ //! Autogenerated weights for `pallet_provide_randomness` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-03-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./target/release/duniter +// target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_provide_randomness +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 // --header=./file_header.txt -// --output=runtime/common/src/weights/pallet_provide_randomness.rs +// --output=./runtime/common/src/weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_provide_randomness`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_provide_randomness::WeightInfo for WeightInfo<T> { - // Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) - // Storage: ProvideRandomness RequestIdProvider (r:1 w:1) - // Storage: ProvideRandomness RequestsIds (r:1 w:1) - // Storage: Babe EpochIndex (r:1 w:0) - // Storage: ProvideRandomness NexEpochHookIn (r:1 w:0) - // Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) + /// Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) + /// Proof: ProvideRandomness CounterForRequestsIds (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: ProvideRandomness RequestIdProvider (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestIdProvider (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestsIds (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsIds (max_values: None, max_size: None, mode: Measured) + /// Storage: Babe EpochIndex (r:1 w:0) + /// Proof: Babe EpochIndex (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: ProvideRandomness NexEpochHookIn (r:1 w:0) + /// Proof Skipped: ProvideRandomness NexEpochHookIn (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: ProvideRandomness RequestsReadyAtEpoch (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsReadyAtEpoch (max_values: None, max_size: None, mode: Measured) fn request() -> Weight { - // Minimum execution time: 297_491 nanoseconds. - Weight::from_ref_time(416_014_000 as u64) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + // Proof Size summary in bytes: + // Measured: `235` + // Estimated: `3700` + // Minimum execution time: 364_880_000 picoseconds. + Weight::from_parts(390_089_000, 0) + .saturating_add(Weight::from_parts(0, 3700)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(4)) } - // Storage: ProvideRandomness RequestsReadyAtNextBlock (r:1 w:1) - // Storage: Babe AuthorVrfRandomness (r:1 w:0) - // Storage: ProvideRandomness RequestsIds (r:1 w:1) - // Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) - // Storage: Account PendingRandomIdAssignments (r:1 w:0) - // Storage: ProvideRandomness NexEpochHookIn (r:1 w:1) + /// Storage: ProvideRandomness RequestsReadyAtNextBlock (r:1 w:1) + /// Proof Skipped: ProvideRandomness RequestsReadyAtNextBlock (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Babe AuthorVrfRandomness (r:1 w:0) + /// Proof: Babe AuthorVrfRandomness (max_values: Some(1), max_size: Some(33), added: 528, mode: MaxEncodedLen) + /// Storage: ProvideRandomness RequestsIds (r:100 w:100) + /// Proof Skipped: ProvideRandomness RequestsIds (max_values: None, max_size: None, mode: Measured) + /// Storage: ProvideRandomness CounterForRequestsIds (r:1 w:1) + /// Proof: ProvideRandomness CounterForRequestsIds (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Account PendingRandomIdAssignments (r:100 w:0) + /// Proof Skipped: Account PendingRandomIdAssignments (max_values: None, max_size: None, mode: Measured) + /// Storage: ProvideRandomness NexEpochHookIn (r:1 w:1) + /// Proof Skipped: ProvideRandomness NexEpochHookIn (max_values: Some(1), max_size: None, mode: Measured) /// The range of component `i` is `[1, 100]`. fn on_initialize(i: u32, ) -> Weight { - // Minimum execution time: 171_605 nanoseconds. - Weight::from_ref_time(214_775_000 as u64) - // Standard Error: 802_126 - .saturating_add(Weight::from_ref_time(53_240_660 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(i as u64))) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + // Proof Size summary in bytes: + // Measured: `375 + i * (59 ±0)` + // Estimated: `1866 + i * (2535 ±0)` + // Minimum execution time: 155_829_000 picoseconds. + Weight::from_parts(250_060_279, 0) + .saturating_add(Weight::from_parts(0, 1866)) + // Standard Error: 1_564_408 + .saturating_add(Weight::from_parts(28_734_558, 0).saturating_mul(i.into())) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(i.into()))) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) + .saturating_add(Weight::from_parts(0, 2535).saturating_mul(i.into())) } } diff --git a/runtime/common/src/weights/pallet_proxy.rs b/runtime/common/src/weights/pallet_proxy.rs index 80e615b13bfc8515c10eba8a3cafb31e1a856684..c26dc8073531b4d76bdb093b526b5fde08009c76 100644 --- a/runtime/common/src/weights/pallet_proxy.rs +++ b/runtime/common/src/weights/pallet_proxy.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_proxy` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,119 +40,175 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_proxy`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> { - // Storage: Proxy Proxies (r:1 w:0) + /// Storage: Proxy Proxies (r:1 w:0) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) /// The range of component `p` is `[1, 31]`. - fn proxy(_p: u32, ) -> Weight { - // Minimum execution time: 79_187 nanoseconds. - Weight::from_ref_time(108_041_143 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + fn proxy(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `157 + p * (37 ±0)` + // Estimated: `4698` + // Minimum execution time: 56_724_000 picoseconds. + Weight::from_parts(65_770_585, 0) + .saturating_add(Weight::from_parts(0, 4698)) + // Standard Error: 757_288 + .saturating_add(Weight::from_parts(477_652, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1)) } - // Storage: Proxy Proxies (r:1 w:0) - // Storage: Proxy Announcements (r:1 w:1) - // Storage: System Account (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:0) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) + /// Storage: Proxy Announcements (r:1 w:1) + /// Proof: Proxy Announcements (max_values: None, max_size: Some(2225), added: 4700, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 31]`. - fn proxy_announced(a: u32, p: u32, ) -> Weight { - // Minimum execution time: 143_674 nanoseconds. - Weight::from_ref_time(143_710_039 as u64) - // Standard Error: 108_923 - .saturating_add(Weight::from_ref_time(863_989 as u64).saturating_mul(a as u64)) - // Standard Error: 112_539 - .saturating_add(Weight::from_ref_time(442_300 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + fn proxy_announced(_a: u32, _p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `440 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5690` + // Minimum execution time: 129_635_000 picoseconds. + Weight::from_parts(192_311_555, 0) + .saturating_add(Weight::from_parts(0, 5690)) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Proxy Announcements (r:1 w:1) - // Storage: System Account (r:1 w:1) + /// Storage: Proxy Announcements (r:1 w:1) + /// Proof: Proxy Announcements (max_values: None, max_size: Some(2225), added: 4700, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 31]`. fn remove_announcement(a: u32, p: u32, ) -> Weight { - // Minimum execution time: 101_817 nanoseconds. - Weight::from_ref_time(113_237_372 as u64) - // Standard Error: 114_240 - .saturating_add(Weight::from_ref_time(424_730 as u64).saturating_mul(a as u64)) - // Standard Error: 118_033 - .saturating_add(Weight::from_ref_time(606_801 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `363 + a * (68 ±0)` + // Estimated: `5690` + // Minimum execution time: 80_344_000 picoseconds. + Weight::from_parts(80_423_745, 0) + .saturating_add(Weight::from_parts(0, 5690)) + // Standard Error: 134_418 + .saturating_add(Weight::from_parts(626_615, 0).saturating_mul(a.into())) + // Standard Error: 139_765 + .saturating_add(Weight::from_parts(26_990, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Proxy Announcements (r:1 w:1) - // Storage: System Account (r:1 w:1) + /// Storage: Proxy Announcements (r:1 w:1) + /// Proof: Proxy Announcements (max_values: None, max_size: Some(2225), added: 4700, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 31]`. - fn reject_announcement(_a: u32, _p: u32, ) -> Weight { - // Minimum execution time: 103_836 nanoseconds. - Weight::from_ref_time(172_822_278 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + fn reject_announcement(a: u32, _p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `363 + a * (68 ±0)` + // Estimated: `5690` + // Minimum execution time: 82_615_000 picoseconds. + Weight::from_parts(84_060_589, 0) + .saturating_add(Weight::from_parts(0, 5690)) + // Standard Error: 55_713 + .saturating_add(Weight::from_parts(454_915, 0).saturating_mul(a.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Proxy Proxies (r:1 w:0) - // Storage: Proxy Announcements (r:1 w:1) - // Storage: System Account (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:0) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) + /// Storage: Proxy Announcements (r:1 w:1) + /// Proof: Proxy Announcements (max_values: None, max_size: Some(2225), added: 4700, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 31]`. fn announce(a: u32, _p: u32, ) -> Weight { - // Minimum execution time: 130_738 nanoseconds. - Weight::from_ref_time(176_997_876 as u64) - // Standard Error: 125_722 - .saturating_add(Weight::from_ref_time(429_964 as u64).saturating_mul(a as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `372 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5690` + // Minimum execution time: 109_209_000 picoseconds. + Weight::from_parts(113_559_431, 0) + .saturating_add(Weight::from_parts(0, 5690)) + // Standard Error: 164_802 + .saturating_add(Weight::from_parts(508_902, 0).saturating_mul(a.into())) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Proxy Proxies (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:1) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) /// The range of component `p` is `[1, 31]`. fn add_proxy(p: u32, ) -> Weight { - // Minimum execution time: 112_651 nanoseconds. - Weight::from_ref_time(120_583_149 as u64) - // Standard Error: 167_552 - .saturating_add(Weight::from_ref_time(1_270_503 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `157 + p * (37 ±0)` + // Estimated: `4698` + // Minimum execution time: 84_439_000 picoseconds. + Weight::from_parts(103_883_398, 0) + .saturating_add(Weight::from_parts(0, 4698)) + // Standard Error: 1_013_121 + .saturating_add(Weight::from_parts(128_107, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Proxy Proxies (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:1) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) /// The range of component `p` is `[1, 31]`. - fn remove_proxy(_p: u32, ) -> Weight { - // Minimum execution time: 111_296 nanoseconds. - Weight::from_ref_time(152_032_560 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn remove_proxy(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `157 + p * (37 ±0)` + // Estimated: `4698` + // Minimum execution time: 88_102_000 picoseconds. + Weight::from_parts(87_281_421, 0) + .saturating_add(Weight::from_parts(0, 4698)) + // Standard Error: 1_185_595 + .saturating_add(Weight::from_parts(2_228_137, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Proxy Proxies (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:1) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) /// The range of component `p` is `[1, 31]`. fn remove_proxies(p: u32, ) -> Weight { - // Minimum execution time: 98_477 nanoseconds. - Weight::from_ref_time(112_771_033 as u64) - // Standard Error: 117_613 - .saturating_add(Weight::from_ref_time(97_304 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `157 + p * (37 ±0)` + // Estimated: `4698` + // Minimum execution time: 75_650_000 picoseconds. + Weight::from_parts(80_253_867, 0) + .saturating_add(Weight::from_parts(0, 4698)) + // Standard Error: 611_026 + .saturating_add(Weight::from_parts(617_546, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) - // Storage: Proxy Proxies (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:1) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) /// The range of component `p` is `[1, 31]`. - fn create_pure(p: u32, ) -> Weight { - // Minimum execution time: 119_272 nanoseconds. - Weight::from_ref_time(140_356_266 as u64) - // Standard Error: 184_823 - .saturating_add(Weight::from_ref_time(119_234 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn create_pure(_p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `177` + // Estimated: `4698` + // Minimum execution time: 91_192_000 picoseconds. + Weight::from_parts(114_007_922, 0) + .saturating_add(Weight::from_parts(0, 4698)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Proxy Proxies (r:1 w:1) + /// Storage: Proxy Proxies (r:1 w:1) + /// Proof: Proxy Proxies (max_values: None, max_size: Some(1233), added: 3708, mode: MaxEncodedLen) /// The range of component `p` is `[0, 30]`. fn kill_pure(p: u32, ) -> Weight { - // Minimum execution time: 103_670 nanoseconds. - Weight::from_ref_time(124_550_797 as u64) - // Standard Error: 167_705 - .saturating_add(Weight::from_ref_time(981_750 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `194 + p * (37 ±0)` + // Estimated: `4698` + // Minimum execution time: 81_457_000 picoseconds. + Weight::from_parts(93_074_034, 0) + .saturating_add(Weight::from_parts(0, 4698)) + // Standard Error: 639_450 + .saturating_add(Weight::from_parts(446_774, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_scheduler.rs b/runtime/common/src/weights/pallet_scheduler.rs index 69e79d55b1b41815e14cc8874896b371c9dda06c..10deba3338f87d479f2ec4baf6bdbcdefa38cd63 100644 --- a/runtime/common/src/weights/pallet_scheduler.rs +++ b/runtime/common/src/weights/pallet_scheduler.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_scheduler` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,104 +40,166 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_scheduler`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> { - // Storage: Scheduler IncompleteSince (r:1 w:1) + /// Storage: Scheduler IncompleteSince (r:1 w:1) + /// Proof: Scheduler IncompleteSince (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn service_agendas_base() -> Weight { - // Minimum execution time: 30_886 nanoseconds. - Weight::from_ref_time(38_405_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `30` + // Estimated: `1489` + // Minimum execution time: 13_202_000 picoseconds. + Weight::from_parts(15_091_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Scheduler Agenda (r:1 w:1) + /// Storage: Scheduler Agenda (r:1 w:1) + /// Proof: Scheduler Agenda (max_values: None, max_size: Some(10463), added: 12938, mode: MaxEncodedLen) /// The range of component `s` is `[0, 50]`. fn service_agenda_base(s: u32, ) -> Weight { - // Minimum execution time: 29_979 nanoseconds. - Weight::from_ref_time(54_694_924 as u64) - // Standard Error: 45_330 - .saturating_add(Weight::from_ref_time(714_154 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `77 + s * (177 ±0)` + // Estimated: `13928` + // Minimum execution time: 11_746_000 picoseconds. + Weight::from_parts(28_656_600, 0) + .saturating_add(Weight::from_parts(0, 13928)) + // Standard Error: 305_064 + .saturating_add(Weight::from_parts(1_160_822, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } fn service_task_base() -> Weight { - // Minimum execution time: 34_143 nanoseconds. - Weight::from_ref_time(34_689_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 19_384_000 picoseconds. + Weight::from_parts(26_332_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) + /// Storage: Preimage PreimageFor (r:1 w:1) + /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured) + /// Storage: Preimage StatusFor (r:1 w:1) + /// Proof: Preimage StatusFor (max_values: None, max_size: Some(83), added: 2558, mode: MaxEncodedLen) /// The range of component `s` is `[128, 4194304]`. fn service_task_fetched(s: u32, ) -> Weight { - // Minimum execution time: 80_911 nanoseconds. - Weight::from_ref_time(83_713_000 as u64) - // Standard Error: 14 - .saturating_add(Weight::from_ref_time(3_138 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `179 + s * (1 ±0)` + // Estimated: `3641 + s * (1 ±0)` + // Minimum execution time: 62_922_000 picoseconds. + Weight::from_parts(62_922_000, 0) + .saturating_add(Weight::from_parts(0, 3641)) + // Standard Error: 65 + .saturating_add(Weight::from_parts(2_841, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) } - // Storage: Scheduler Lookup (r:0 w:1) + /// Storage: Scheduler Lookup (r:0 w:1) + /// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen) fn service_task_named() -> Weight { - // Minimum execution time: 40_252 nanoseconds. - Weight::from_ref_time(41_642_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 24_642_000 picoseconds. + Weight::from_parts(28_343_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + .saturating_add(T::DbWeight::get().writes(1)) } fn service_task_periodic() -> Weight { - // Minimum execution time: 63_013 nanoseconds. - Weight::from_ref_time(73_838_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 18_019_000 picoseconds. + Weight::from_parts(20_918_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } fn execute_dispatch_signed() -> Weight { - // Minimum execution time: 16_209 nanoseconds. - Weight::from_ref_time(16_535_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_410_000 picoseconds. + Weight::from_parts(14_722_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } fn execute_dispatch_unsigned() -> Weight { - // Minimum execution time: 16_742 nanoseconds. - Weight::from_ref_time(17_773_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_433_000 picoseconds. + Weight::from_parts(13_751_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } - // Storage: Scheduler Agenda (r:1 w:1) + /// Storage: Scheduler Agenda (r:1 w:1) + /// Proof: Scheduler Agenda (max_values: None, max_size: Some(10463), added: 12938, mode: MaxEncodedLen) /// The range of component `s` is `[0, 49]`. fn schedule(s: u32, ) -> Weight { - // Minimum execution time: 66_214 nanoseconds. - Weight::from_ref_time(82_581_291 as u64) - // Standard Error: 80_735 - .saturating_add(Weight::from_ref_time(1_898_014 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `77 + s * (177 ±0)` + // Estimated: `13928` + // Minimum execution time: 43_639_000 picoseconds. + Weight::from_parts(38_437_623, 0) + .saturating_add(Weight::from_parts(0, 13928)) + // Standard Error: 483_029 + .saturating_add(Weight::from_parts(2_611_143, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) + /// Storage: Scheduler Agenda (r:1 w:1) + /// Proof: Scheduler Agenda (max_values: None, max_size: Some(10463), added: 12938, mode: MaxEncodedLen) + /// Storage: Scheduler Lookup (r:0 w:1) + /// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - // Minimum execution time: 72_484 nanoseconds. - Weight::from_ref_time(109_361_989 as u64) - // Standard Error: 97_373 - .saturating_add(Weight::from_ref_time(829_532 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `77 + s * (177 ±0)` + // Estimated: `13928` + // Minimum execution time: 57_949_000 picoseconds. + Weight::from_parts(80_631_060, 0) + .saturating_add(Weight::from_parts(0, 13928)) + // Standard Error: 529_622 + .saturating_add(Weight::from_parts(1_420_021, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Scheduler Lookup (r:1 w:1) - // Storage: Scheduler Agenda (r:1 w:1) + /// Storage: Scheduler Lookup (r:1 w:1) + /// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen) + /// Storage: Scheduler Agenda (r:1 w:1) + /// Proof: Scheduler Agenda (max_values: None, max_size: Some(10463), added: 12938, mode: MaxEncodedLen) /// The range of component `s` is `[0, 49]`. fn schedule_named(s: u32, ) -> Weight { - // Minimum execution time: 76_219 nanoseconds. - Weight::from_ref_time(93_529_478 as u64) - // Standard Error: 100_596 - .saturating_add(Weight::from_ref_time(2_154_161 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `147 + s * (188 ±0)` + // Estimated: `13928` + // Minimum execution time: 56_980_000 picoseconds. + Weight::from_parts(61_448_997, 0) + .saturating_add(Weight::from_parts(0, 13928)) + // Standard Error: 586_567 + .saturating_add(Weight::from_parts(2_359_752, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Scheduler Lookup (r:1 w:1) - // Storage: Scheduler Agenda (r:1 w:1) + /// Storage: Scheduler Lookup (r:1 w:1) + /// Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen) + /// Storage: Scheduler Agenda (r:1 w:1) + /// Proof: Scheduler Agenda (max_values: None, max_size: Some(10463), added: 12938, mode: MaxEncodedLen) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - // Minimum execution time: 91_931 nanoseconds. - Weight::from_ref_time(151_184_724 as u64) - // Standard Error: 95_637 - .saturating_add(Weight::from_ref_time(5_202 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `276 + s * (185 ±0)` + // Estimated: `13928` + // Minimum execution time: 65_809_000 picoseconds. + Weight::from_parts(81_021_470, 0) + .saturating_add(Weight::from_parts(0, 13928)) + // Standard Error: 285_342 + .saturating_add(Weight::from_parts(1_694_132, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } } diff --git a/runtime/common/src/weights/pallet_session.rs b/runtime/common/src/weights/pallet_session.rs index db853538a58776193dc568a7f78925dcf5eb6e03..23dfda8a7e6acd2d666140eecf705b1c24d8a514 100644 --- a/runtime/common/src/weights/pallet_session.rs +++ b/runtime/common/src/weights/pallet_session.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_session` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-05-04, STEPS: `5`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev +// --chain=gdev-benchmark // --steps=5 // --repeat=2 -// --pallet=pallet_session +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,27 +40,40 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_session`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> { - // Storage: Session NextKeys (r:1 w:1) - // Storage: Session KeyOwner (r:4 w:4) + /// Storage: Session NextKeys (r:1 w:1) + /// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured) + /// Storage: Session KeyOwner (r:4 w:4) + /// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured) fn set_keys() -> Weight { - // Minimum execution time: 127_407 nanoseconds. - Weight::from_ref_time(136_848_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + // Proof Size summary in bytes: + // Measured: `723` + // Estimated: `11613` + // Minimum execution time: 95_906_000 picoseconds. + Weight::from_parts(109_541_000, 0) + .saturating_add(Weight::from_parts(0, 11613)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(5)) } - // Storage: Session NextKeys (r:1 w:1) - // Storage: Session KeyOwner (r:0 w:4) + /// Storage: Session NextKeys (r:1 w:1) + /// Proof Skipped: Session NextKeys (max_values: None, max_size: None, mode: Measured) + /// Storage: Session KeyOwner (r:0 w:4) + /// Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured) fn purge_keys() -> Weight { - // Minimum execution time: 161_605 nanoseconds. - Weight::from_ref_time(166_513_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + // Proof Size summary in bytes: + // Measured: `412` + // Estimated: `3877` + // Minimum execution time: 68_641_000 picoseconds. + Weight::from_parts(111_659_000, 0) + .saturating_add(Weight::from_parts(0, 3877)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(5)) } } diff --git a/runtime/common/src/weights/pallet_timestamp.rs b/runtime/common/src/weights/pallet_timestamp.rs index 1639a4cbfd2a43afb591701a9bf037b83ceb83d2..3c67ff5aca402c32ed3fdd2bc8367e711a62f475 100644 --- a/runtime/common/src/weights/pallet_timestamp.rs +++ b/runtime/common/src/weights/pallet_timestamp.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_timestamp` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,23 +40,34 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_timestamp`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> { - // Storage: Timestamp Now (r:1 w:1) - // Storage: Babe CurrentSlot (r:1 w:0) + /// Storage: Timestamp Now (r:1 w:1) + /// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: Babe CurrentSlot (r:1 w:0) + /// Proof: Babe CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) fn set() -> Weight { - // Minimum execution time: 39_777 nanoseconds. - Weight::from_ref_time(41_189_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `211` + // Estimated: `1493` + // Minimum execution time: 39_273_000 picoseconds. + Weight::from_parts(45_253_000, 0) + .saturating_add(Weight::from_parts(0, 1493)) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) } fn on_finalize() -> Weight { - // Minimum execution time: 19_734 nanoseconds. - Weight::from_ref_time(32_562_000 as u64) + // Proof Size summary in bytes: + // Measured: `94` + // Estimated: `0` + // Minimum execution time: 13_519_000 picoseconds. + Weight::from_parts(14_543_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } } diff --git a/runtime/common/src/weights/pallet_treasury.rs b/runtime/common/src/weights/pallet_treasury.rs index 38bf975016f57e6942ee006e3dfce2c35319039c..55dc543e1117622efedca7ecd4791c09876d0fd4 100644 --- a/runtime/common/src/weights/pallet_treasury.rs +++ b/runtime/common/src/weights/pallet_treasury.rs @@ -17,18 +17,19 @@ //! Autogenerated weights for `pallet_treasury` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_treasury +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm // --wasm-execution=compiled @@ -39,64 +40,105 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_treasury`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> { fn spend() -> Weight { - // Minimum execution time: 1_146 nanoseconds. - Weight::from_ref_time(1_428_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 981_000 picoseconds. + Weight::from_parts(1_308_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } - // Storage: Treasury ProposalCount (r:1 w:1) - // Storage: Treasury Proposals (r:0 w:1) + /// Storage: Treasury ProposalCount (r:1 w:1) + /// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: Treasury Proposals (r:0 w:1) + /// Proof: Treasury Proposals (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen) fn propose_spend() -> Weight { - // Minimum execution time: 158_571 nanoseconds. - Weight::from_ref_time(163_129_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `144` + // Estimated: `1489` + // Minimum execution time: 90_903_000 picoseconds. + Weight::from_parts(121_481_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Treasury Proposals (r:1 w:1) - // Storage: System Account (r:1 w:1) + /// Storage: Treasury Proposals (r:1 w:1) + /// Proof: Treasury Proposals (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) fn reject_proposal() -> Weight { - // Minimum execution time: 226_104 nanoseconds. - Weight::from_ref_time(249_137_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + // Proof Size summary in bytes: + // Measured: `286` + // Estimated: `3626` + // Minimum execution time: 123_826_000 picoseconds. + Weight::from_parts(129_116_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Treasury Proposals (r:1 w:0) - // Storage: Treasury Approvals (r:1 w:1) + /// Storage: Treasury Proposals (r:1 w:0) + /// Proof: Treasury Proposals (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen) + /// Storage: Treasury Approvals (r:1 w:1) + /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen) /// The range of component `p` is `[0, 99]`. fn approve_proposal(p: u32, ) -> Weight { - // Minimum execution time: 57_029 nanoseconds. - Weight::from_ref_time(90_162_378 as u64) - // Standard Error: 40_171 - .saturating_add(Weight::from_ref_time(757_294 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `350 + p * (11 ±0)` + // Estimated: `3557` + // Minimum execution time: 37_180_000 picoseconds. + Weight::from_parts(50_614_720, 0) + .saturating_add(Weight::from_parts(0, 3557)) + // Standard Error: 108_420 + .saturating_add(Weight::from_parts(48_757, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Treasury Approvals (r:1 w:1) + /// Storage: Treasury Approvals (r:1 w:1) + /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen) fn remove_approval() -> Weight { - // Minimum execution time: 53_325 nanoseconds. - Weight::from_ref_time(67_475_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + // Proof Size summary in bytes: + // Measured: `127` + // Estimated: `1887` + // Minimum execution time: 25_793_000 picoseconds. + Weight::from_parts(27_949_000, 0) + .saturating_add(Weight::from_parts(0, 1887)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Treasury Approvals (r:1 w:1) - // Storage: Treasury Proposals (r:2 w:2) - // Storage: System Account (r:4 w:4) - // Storage: Account PendingNewAccounts (r:0 w:2) + /// Storage: Treasury Deactivated (r:1 w:1) + /// Proof: Treasury Deactivated (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: Balances InactiveIssuance (r:1 w:1) + /// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: Treasury Approvals (r:1 w:1) + /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen) + /// Storage: Treasury Proposals (r:100 w:100) + /// Proof: Treasury Proposals (max_values: None, max_size: Some(92), added: 2567, mode: MaxEncodedLen) + /// Storage: System Account (r:200 w:200) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:100) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) /// The range of component `p` is `[0, 100]`. fn on_initialize_proposals(p: u32, ) -> Weight { - // Minimum execution time: 109_965 nanoseconds. - Weight::from_ref_time(118_648_000 as u64) - // Standard Error: 1_429_278 - .saturating_add(Weight::from_ref_time(164_690_636 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(p as u64))) + // Proof Size summary in bytes: + // Measured: `0 + p * (235 ±0)` + // Estimated: `5795 + p * (5272 ±0)` + // Minimum execution time: 70_735_000 picoseconds. + Weight::from_parts(92_977_700, 0) + .saturating_add(Weight::from_parts(0, 5795)) + // Standard Error: 778_601 + .saturating_add(Weight::from_parts(115_313_606, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into()))) + .saturating_add(T::DbWeight::get().writes(3)) + .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(p.into()))) + .saturating_add(Weight::from_parts(0, 5272).saturating_mul(p.into())) } } diff --git a/runtime/common/src/weights/pallet_universal_dividend.rs b/runtime/common/src/weights/pallet_universal_dividend.rs index 30f2ba996ee93ee058353cbebd9c4db757314d84..94cc1438d66fc9788dbb9c08a0c5f4db3f6561ed 100644 --- a/runtime/common/src/weights/pallet_universal_dividend.rs +++ b/runtime/common/src/weights/pallet_universal_dividend.rs @@ -17,82 +17,143 @@ //! Autogenerated weights for `pallet_universal_dividend` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-07-03, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Interpreted, CHAIN: Some("dev"), DB CACHE: 1024 +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./duniter +// target/release/duniter // benchmark -// --chain=dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_universal_dividend +// pallet +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm -// --wasm-execution=interpreted-i-know-what-i-do +// --wasm-execution=compiled // --heap-pages=4096 // --header=./file_header.txt -// --output=. +// --output=./runtime/common/src/weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_universal_dividend`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_universal_dividend::WeightInfo for WeightInfo<T> { + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) fn on_initialize() -> Weight { - Weight::from_ref_time(111_220_000) + // Proof Size summary in bytes: + // Measured: `123` + // Estimated: `1608` + // Minimum execution time: 13_281_000 picoseconds. + Weight::from_parts(22_005_000, 0) + .saturating_add(Weight::from_parts(0, 1608)) + .saturating_add(T::DbWeight::get().reads(1)) } - // Storage: Membership CounterForMembership (r:1 w:0) - // Storage: UniversalDividend NextReeval (r:1 w:0) - // Storage: UniversalDividend CurrentUd (r:1 w:0) - // Storage: UniversalDividend MonetaryMass (r:1 w:1) - // Storage: UniversalDividend CurrentUdIndex (r:1 w:1) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership CounterForMembership (r:1 w:0) + /// Proof: Membership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: UniversalDividend NextReeval (r:1 w:0) + /// Proof: UniversalDividend NextReeval (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: UniversalDividend CurrentUd (r:1 w:0) + /// Proof: UniversalDividend CurrentUd (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: UniversalDividend MonetaryMass (r:1 w:1) + /// Proof: UniversalDividend MonetaryMass (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: UniversalDividend CurrentUdIndex (r:1 w:1) + /// Proof: UniversalDividend CurrentUdIndex (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) fn on_initialize_ud_created() -> Weight { - Weight::from_ref_time(525_382_000) - .saturating_add(T::DbWeight::get().reads(5)) + // Proof Size summary in bytes: + // Measured: `304` + // Estimated: `1789` + // Minimum execution time: 67_003_000 picoseconds. + Weight::from_parts(71_537_000, 0) + .saturating_add(Weight::from_parts(0, 1789)) + .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Membership CounterForMembership (r:1 w:0) - // Storage: UniversalDividend NextReeval (r:1 w:1) - // Storage: UniversalDividend CurrentUd (r:1 w:1) - // Storage: UniversalDividend MonetaryMass (r:1 w:1) - // Storage: UniversalDividend PastReevals (r:1 w:1) - // Storage: UniversalDividend CurrentUdIndex (r:1 w:1) + /// Storage: Parameters ParametersStorage (r:1 w:0) + /// Proof Skipped: Parameters ParametersStorage (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: Membership CounterForMembership (r:1 w:0) + /// Proof: Membership CounterForMembership (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: UniversalDividend NextReeval (r:1 w:1) + /// Proof: UniversalDividend NextReeval (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: UniversalDividend CurrentUd (r:1 w:1) + /// Proof: UniversalDividend CurrentUd (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: UniversalDividend MonetaryMass (r:1 w:1) + /// Proof: UniversalDividend MonetaryMass (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: UniversalDividend PastReevals (r:1 w:1) + /// Proof: UniversalDividend PastReevals (max_values: Some(1), max_size: Some(41), added: 536, mode: MaxEncodedLen) + /// Storage: UniversalDividend CurrentUdIndex (r:1 w:1) + /// Proof: UniversalDividend CurrentUdIndex (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) fn on_initialize_ud_reevalued() -> Weight { - Weight::from_ref_time(1_161_595_000) - .saturating_add(T::DbWeight::get().reads(6)) + // Proof Size summary in bytes: + // Measured: `325` + // Estimated: `1810` + // Minimum execution time: 96_492_000 picoseconds. + Weight::from_parts(108_747_000, 0) + .saturating_add(Weight::from_parts(0, 1810)) + .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } - // Storage: Identity IdentityIndexOf (r:1 w:0) - // Storage: Identity Identities (r:1 w:1) - // Storage: UniversalDividend CurrentUdIndex (r:1 w:0) - // Storage: UniversalDividend PastReevals (r:1 w:0) - fn claim_uds(n: u32) -> Weight { - Weight::from_ref_time(1_228_876_000) - // Standard Error: 958_000 - .saturating_add((Weight::from_ref_time(7_551_000)).saturating_mul(n as u64)) + /// Storage: Identity IdentityIndexOf (r:1 w:0) + /// Proof Skipped: Identity IdentityIndexOf (max_values: None, max_size: None, mode: Measured) + /// Storage: Identity Identities (r:1 w:1) + /// Proof Skipped: Identity Identities (max_values: None, max_size: None, mode: Measured) + /// Storage: UniversalDividend CurrentUdIndex (r:1 w:0) + /// Proof: UniversalDividend CurrentUdIndex (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: UniversalDividend PastReevals (r:1 w:0) + /// Proof: UniversalDividend PastReevals (max_values: Some(1), max_size: Some(41), added: 536, mode: MaxEncodedLen) + /// The range of component `n` is `[1, 4]`. + fn claim_uds(n: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `627 + n * (11 ±0)` + // Estimated: `4092 + n * (11 ±0)` + // Minimum execution time: 120_972_000 picoseconds. + Weight::from_parts(135_187_750, 0) + .saturating_add(Weight::from_parts(0, 4092)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) + .saturating_add(Weight::from_parts(0, 11).saturating_mul(n.into())) } - // Storage: UniversalDividend CurrentUd (r:1 w:0) - // Storage: System Account (r:1 w:1) - // Storage: Account PendingNewAccounts (r:0 w:1) + /// Storage: UniversalDividend CurrentUd (r:1 w:0) + /// Proof: UniversalDividend CurrentUd (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) fn transfer_ud() -> Weight { - (Weight::from_ref_time(2_468_842_000)) + // Proof Size summary in bytes: + // Measured: `116` + // Estimated: `3626` + // Minimum execution time: 185_351_000 picoseconds. + Weight::from_parts(198_407_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: UniversalDividend CurrentUd (r:1 w:0) - // Storage: System Account (r:1 w:1) - // Storage: Account PendingNewAccounts (r:0 w:1) + /// Storage: UniversalDividend CurrentUd (r:1 w:0) + /// Proof: UniversalDividend CurrentUd (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: System Account (r:1 w:1) + /// Proof: System Account (max_values: None, max_size: Some(161), added: 2636, mode: MaxEncodedLen) + /// Storage: Account PendingNewAccounts (r:0 w:1) + /// Proof Skipped: Account PendingNewAccounts (max_values: None, max_size: None, mode: Measured) fn transfer_ud_keep_alive() -> Weight { - (Weight::from_ref_time(1_442_150_000)) + // Proof Size summary in bytes: + // Measured: `116` + // Estimated: `3626` + // Minimum execution time: 281_525_000 picoseconds. + Weight::from_parts(290_861_000, 0) + .saturating_add(Weight::from_parts(0, 3626)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/common/src/weights/pallet_upgrade_origin.rs b/runtime/common/src/weights/pallet_upgrade_origin.rs index caa7c5b62b96b5fe14b75bb84ce4930bf9020396..c6425cda7a621cd079141bb4b687857927bdcaa9 100644 --- a/runtime/common/src/weights/pallet_upgrade_origin.rs +++ b/runtime/common/src/weights/pallet_upgrade_origin.rs @@ -17,35 +17,43 @@ //! Autogenerated weights for `pallet_upgrade_origin` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-06-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Interpreted, CHAIN: Some("dev"), DB CACHE: 1024 +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: -// ./duniter2 +// target/release/duniter // benchmark -// --chain=dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_upgrade_origin +// pallet +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 +// --pallet=* // --extrinsic=* // --execution=wasm -// --wasm-execution=interpreted-i-know-what-i-do +// --wasm-execution=compiled // --heap-pages=4096 // --header=./file_header.txt -// --output=. +// --output=./runtime/common/src/weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_upgrade_origin`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_upgrade_origin::WeightInfo for WeightInfo<T> { fn dispatch_as_root() -> Weight { - (Weight::from_ref_time(324_716_000)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 31_113_000 picoseconds. + Weight::from_parts(38_024_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } } diff --git a/runtime/common/src/weights/pallet_utility.rs b/runtime/common/src/weights/pallet_utility.rs index 3d548e48812e7ea35904e192d529dece49aa44aa..02319cb4f6fd045aa0eeac3baf08f47bc4b66f1f 100644 --- a/runtime/common/src/weights/pallet_utility.rs +++ b/runtime/common/src/weights/pallet_utility.rs @@ -17,17 +17,18 @@ //! Autogenerated weights for `pallet_utility` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-04-27, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-06-08, STEPS: `5`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `benjamin-xps139380`, CPU: `Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("gdev-benchmark"), DB CACHE: 1024 // Executed Command: // target/release/duniter // benchmark // pallet -// --chain=dev -// --steps=50 -// --repeat=20 +// --chain=gdev-benchmark +// --steps=5 +// --repeat=2 // --pallet=* // --extrinsic=* // --execution=wasm @@ -39,40 +40,61 @@ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_utility`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> { /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - // Minimum execution time: 45_652 nanoseconds. - Weight::from_ref_time(46_509_000 as u64) - // Standard Error: 133_165 - .saturating_add(Weight::from_ref_time(14_584_449 as u64).saturating_mul(c as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 25_603_000 picoseconds. + Weight::from_parts(381_206_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 1_030_015 + .saturating_add(Weight::from_parts(11_787_342, 0).saturating_mul(c.into())) } fn as_derivative() -> Weight { - // Minimum execution time: 24_660 nanoseconds. - Weight::from_ref_time(25_846_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 19_941_000 picoseconds. + Weight::from_parts(24_250_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - // Minimum execution time: 46_218 nanoseconds. - Weight::from_ref_time(47_980_000 as u64) - // Standard Error: 149_727 - .saturating_add(Weight::from_ref_time(15_250_282 as u64).saturating_mul(c as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 25_455_000 picoseconds. + Weight::from_parts(630_310_100, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 1_845_214 + .saturating_add(Weight::from_parts(12_302_687, 0).saturating_mul(c.into())) } fn dispatch_as() -> Weight { - // Minimum execution time: 95_665 nanoseconds. - Weight::from_ref_time(103_426_000 as u64) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 32_380_000 picoseconds. + Weight::from_parts(42_919_000, 0) + .saturating_add(Weight::from_parts(0, 0)) } /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - // Minimum execution time: 85_444 nanoseconds. - Weight::from_ref_time(922_502_527 as u64) - // Standard Error: 244_755 - .saturating_add(Weight::from_ref_time(12_996_772 as u64).saturating_mul(c as u64)) + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 25_526_000 picoseconds. + Weight::from_parts(428_222_600, 0) + .saturating_add(Weight::from_parts(0, 0)) + // Standard Error: 804_488 + .saturating_add(Weight::from_parts(11_680_199, 0).saturating_mul(c.into())) } } diff --git a/runtime/common/src/weights/paritydb_weights.rs b/runtime/common/src/weights/paritydb_weights.rs index d57bf202758f4163e1620544c096bd8f8dad4cfc..0787d9d0edb15690b65e44a8fc3a1b619deb4eff 100644 --- a/runtime/common/src/weights/paritydb_weights.rs +++ b/runtime/common/src/weights/paritydb_weights.rs @@ -59,7 +59,7 @@ pub mod constants { /// 99th: 151_424 /// 95th: 143_017 /// 75th: 133_498 - read: 250_000 * constants::WEIGHT_PER_NANOS.ref_time(), + read: 250_000 * constants::WEIGHT_REF_TIME_PER_NANOS, /// Time to write one storage item. /// Calculated by multiplying the *Average* of all values with `2` and adding `0`. @@ -74,7 +74,7 @@ pub mod constants { /// 99th: 611_825 /// 95th: 512_789 /// 75th: 457_938 - write: 840_000 * constants::WEIGHT_PER_NANOS.ref_time(), + write: 840_000 * constants::WEIGHT_REF_TIME_PER_NANOS, }; } @@ -90,20 +90,20 @@ pub mod constants { fn bound() { // At least 1 µs. assert!( - W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().reads(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Read weight should be at least 1 µs." ); assert!( - W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(), + W::get().writes(1).ref_time() >= constants::WEIGHT_REF_TIME_PER_MICROS, "Write weight should be at least 1 µs." ); // At most 1 ms. assert!( - W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().reads(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Read weight should be at most 1 ms." ); assert!( - W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(), + W::get().writes(1).ref_time() <= constants::WEIGHT_REF_TIME_PER_MILLIS, "Write weight should be at most 1 ms." ); } diff --git a/runtime/g1/Cargo.toml b/runtime/g1/Cargo.toml index 5f9c149ce3f11ecd39f5da15f9ca4a8fc31e1db2..13433cb5822ef2145bac48061f2ce4965ee926c8 100644 --- a/runtime/g1/Cargo.toml +++ b/runtime/g1/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -104,10 +104,8 @@ try-runtime = [ ] [dev-dependencies] -sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } [dependencies] # local @@ -128,53 +126,49 @@ sp-membership = { path = '../../primitives/membership', default-features = false pallet-offences = { path = '../../pallets/offences', default-features = false } # crates.io -codec = { package = "parity-scale-codec", version = "3.1.5", features = [ - "derive", -], default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } -hex-literal = { version = '0.3.1', optional = true } -scale-info = { version = "2.1.1", default-features = false, features = [ - "derive", -] } -serde = { version = "1.0.101", optional = true, features = ["derive"] } +hex-literal = { version = '0.4.1', default-features = false, optional = true } +scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.139", default-features = false, optional = true, features = ["derive"] } # substrate -frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', optional = true } -frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs index ab38d78338d3958fed5f482d7550cdb4b300baec..62517b4f03f35f28096326e102765fe95fb3fe42 100644 --- a/runtime/g1/src/lib.rs +++ b/runtime/g1/src/lib.rs @@ -64,7 +64,9 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{EqualPrivilegeOnly, KeyOwnerProofSystem, Randomness}, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + constants::{ + BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, + }, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, StorageValue, @@ -255,7 +257,7 @@ construct_runtime!( // Consensus support. AuthorityMembers: pallet_authority_members::{Pallet, Call, Storage, Config<T>, Event<T>} = 10, - Authorship: pallet_authorship::{Pallet, Call, Storage} = 11, + Authorship: pallet_authorship::{Pallet, Storage} = 11, Offences: pallet_offences::{Pallet, Storage, Event} = 12, Historical: session_historical::{Pallet} = 13, Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 14, diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs index ec911e29e24322e3c270ae7a62c30b49cec6dc96..11315f7fce15a178460901522ace74a2a33b977b 100644 --- a/runtime/g1/src/parameters.rs +++ b/runtime/g1/src/parameters.rs @@ -18,14 +18,14 @@ use crate::*; use common_runtime::constants::*; use common_runtime::{Balance, BlockNumber, Moment}; use frame_support::parameter_types; -use frame_support::weights::constants::WEIGHT_PER_SECOND; +use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND; use sp_arithmetic::Perbill; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { pub const BlockHashCount: BlockNumber = 2400; /// We allow for 2 seconds of compute with a 6 second average block time. - pub BlockWeights: frame_system::limits::BlockWeights = block_weights((WEIGHT_PER_SECOND * 2) + pub BlockWeights: frame_system::limits::BlockWeights = block_weights((Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0) * 2) .set_proof_size(5 * 1024 * 1024), NORMAL_DISPATCH_RATIO); pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength ::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); diff --git a/runtime/gdev/Cargo.toml b/runtime/gdev/Cargo.toml index 9cb9f382a7d4f7d4c703a061f101522b267f673a..c7a84e4994097901c544a920207e75ab31806e3f 100644 --- a/runtime/gdev/Cargo.toml +++ b/runtime/gdev/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -130,11 +130,8 @@ try-runtime = [ ] [dev-dependencies] -sp-consensus-slots = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } [dependencies] # local @@ -157,56 +154,53 @@ sp-distance = { path = '../../primitives/distance', default-features = false } sp-membership = { path = '../../primitives/membership', default-features = false } # crates.io -codec = { package = "parity-scale-codec", version = "3.1.5", features = [ - "derive", -], default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } -hex-literal = { version = '0.3.1', optional = true } -scale-info = { version = "2.1.1", default-features = false, features = [ - "derive", -] } -serde = { version = "1.0.101", default-features = false } -serde_derive = { version = "1.0.101", optional = true } +hex-literal = { version = '0.4.1', default-features = false, optional = true } +scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.139", default-features = false } +serde_derive = { version = "1.0.117", default-features = false, optional = true } # substrate -frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-consensus-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } # substrate benchmarking -frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } -frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index d27a62dd4cd9fe13f73018e7949513c3ca1b90c9..5c4491398802f43fae43c87551fbad5483c5ca92 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -71,7 +71,9 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{EqualPrivilegeOnly, KeyOwnerProofSystem, Randomness}, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + constants::{ + BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, + }, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, StorageValue, @@ -311,7 +313,7 @@ construct_runtime!( // Consensus support AuthorityMembers: pallet_authority_members::{Pallet, Call, Storage, Config<T>, Event<T>} = 10, - Authorship: pallet_authorship::{Pallet, Call, Storage} = 11, + Authorship: pallet_authorship::{Pallet, Storage} = 11, Offences: pallet_offences::{Pallet, Storage, Event} = 12, Historical: session_historical::{Pallet} = 13, Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 14, diff --git a/runtime/gdev/src/migrations_v400.rs b/runtime/gdev/src/migrations_v400.rs index f4bc46c49282295786ca76487d0d6bd43df944d1..e58e69cb9925985a337336508ae4f99c4d9a9280 100644 --- a/runtime/gdev/src/migrations_v400.rs +++ b/runtime/gdev/src/migrations_v400.rs @@ -19,7 +19,7 @@ use crate::*; pub struct MigrationsV400; impl frame_support::traits::OnRuntimeUpgrade for MigrationsV400 { fn on_runtime_upgrade() -> Weight { - let mut weight = Weight::from_ref_time(1_000_000_000); // Safety margin + let mut weight = Weight::from_parts(1_000_000_000, 0); // Safety margin type OldvalueType = AccountId; diff --git a/runtime/gdev/src/parameters.rs b/runtime/gdev/src/parameters.rs index f43402dc31a6e576e2268c8586e34b6435f8b73a..220511c5cf42e5302e8b1b59a863afb341ba357e 100644 --- a/runtime/gdev/src/parameters.rs +++ b/runtime/gdev/src/parameters.rs @@ -19,14 +19,14 @@ use common_runtime::constants::*; use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; use frame_support::traits::EitherOfDiverse; -use frame_support::weights::constants::WEIGHT_PER_SECOND; +use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND; use sp_arithmetic::Perbill; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { pub const BlockHashCount: BlockNumber = 2400; /// We allow for 2 seconds of compute with a 6 second average block time. - pub BlockWeights: frame_system::limits::BlockWeights = block_weights((WEIGHT_PER_SECOND * 2) + pub BlockWeights: frame_system::limits::BlockWeights = block_weights((Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0) * 2) .set_proof_size(5 * 1024 * 1024), NORMAL_DISPATCH_RATIO); pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength ::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs index c2d6be1f6a65c053d3dd94f7acf12ae9b4fb7479..541ffd4ec9ae41cff058f848f5322d642c9141d0 100644 --- a/runtime/gdev/tests/common/mod.rs +++ b/runtime/gdev/tests/common/mod.rs @@ -25,11 +25,11 @@ use gdev_runtime::*; use pallet_authority_members::OnNewSession; use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId; use sp_consensus_babe::{AuthorityId as BabeId, Slot}; -use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof}; +use sp_consensus_babe::{VrfOutput, VrfProof}; +use sp_consensus_grandpa::AuthorityId as GrandpaId; use sp_core::crypto::IsWrappedBy; use sp_core::sr25519; use sp_core::{Encode, Pair, Public, H256}; -use sp_finality_grandpa::AuthorityId as GrandpaId; use sp_membership::MembershipData; use sp_runtime::testing::{Digest, DigestItem}; use sp_runtime::traits::{IdentifyAccount, Verify}; @@ -154,6 +154,12 @@ impl ExtBuilder { .build_storage::<Runtime>() .unwrap(); + // compute total monetary mass + let monetary_mass = initial_accounts + .values() + .map(|balance| balance.balance) + .sum(); + pallet_authority_members::GenesisConfig::<Runtime> { initial_authorities: initial_smiths .iter() @@ -172,7 +178,14 @@ impl ExtBuilder { .unwrap();*/ pallet_duniter_account::GenesisConfig::<Runtime> { - accounts: initial_accounts, + accounts: initial_accounts.clone(), + } + .assimilate_storage(&mut t) + .unwrap(); + + // Necessary to initialize TotalIssuance + pallet_balances::GenesisConfig::<Runtime> { + total_issuance: monetary_mass, } .assimilate_storage(&mut t) .unwrap(); @@ -270,7 +283,7 @@ impl ExtBuilder { pallet_universal_dividend::GenesisConfig::<Runtime> { first_reeval: Some(600_000), first_ud: Some(24_000), - initial_monetary_mass: 0, + initial_monetary_mass: monetary_mass, ud: 1_000, } .assimilate_storage(&mut t) @@ -313,12 +326,16 @@ pub fn get_authority_keys_from_seed(s: &str) -> AuthorityKeys { } fn mock_babe_initialize(n: u32) { - let slot: sp_consensus_slots::Slot = (n as u64).into(); + let slot: sp_consensus_babe::Slot = (n as u64).into(); pallet_babe::CurrentSlot::<Runtime>::put(slot); + // force epoch change based on session + let session = Session::current_index() as u64; + pallet_babe::EpochIndex::<Runtime>::put(session); } pub fn run_to_block(n: u32) { while System::block_number() < n { + // --- // Finalize the previous block Babe::on_finalize(System::block_number()); //Timestamp::on_finalize(System::block_number()); @@ -327,6 +344,7 @@ pub fn run_to_block(n: u32) { Authorship::on_finalize(System::block_number()); Grandpa::on_finalize(System::block_number()); + // --- // Set the new block number and author System::reset_events(); System::set_block_number(System::block_number() + 1); @@ -337,8 +355,8 @@ pub fn run_to_block(n: u32) { // Initialize the new block Account::on_initialize(System::block_number()); Scheduler::on_initialize(System::block_number()); - mock_babe_initialize(System::block_number()); Session::on_initialize(System::block_number()); + mock_babe_initialize(System::block_number()); Authorship::on_initialize(System::block_number()); /*if session_before != session_after { @@ -348,6 +366,7 @@ pub fn run_to_block(n: u32) { assert!(!Babe::should_end_session(System::block_number())); }*/ + // --- UniversalDividend::on_initialize(System::block_number()); Wot::on_initialize(System::block_number()); Identity::on_initialize(System::block_number()); diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs index 79b29cb936850abbffd885eff40f7c8d672ca8d3..b7eb8a87f20d99898a799528a1d89820668ffd2e 100644 --- a/runtime/gdev/tests/integration_tests.rs +++ b/runtime/gdev/tests/integration_tests.rs @@ -81,31 +81,229 @@ fn test_genesis_build() { }); } +/// test initial state +/// +/// in order to make sure that it does not change accidentally +#[test] +fn test_initial_state() { + ExtBuilder::new(1, 2, 3) + .with_initial_balances(vec![ + (AccountKeyring::Alice.to_account_id(), 1_000), + (AccountKeyring::Bob.to_account_id(), 200), + (AccountKeyring::Charlie.to_account_id(), 100), // below ED allowed for identities + (AccountKeyring::Dave.to_account_id(), 900), + ]) + .build() + .execute_with(|| { + run_to_block(1); + + assert_eq!( + Balances::free_balance(AccountKeyring::Alice.to_account_id()), + 1_000 + ); + assert_eq!( + Balances::free_balance(AccountKeyring::Bob.to_account_id()), + 200 + ); + assert_eq!( + Balances::free_balance(AccountKeyring::Charlie.to_account_id()), + 100 + ); + assert_eq!( + Balances::free_balance(AccountKeyring::Dave.to_account_id()), + 900 + ); + assert_eq!( + Balances::free_balance(AccountKeyring::Eve.to_account_id()), + 0 + ); + // total issuance and monetary mass should be coherent + assert_eq!(Balances::total_issuance(), 2_200); + assert_eq!( + pallet_universal_dividend::MonetaryMass::<Runtime>::get(), + 2_200 + ); + }); +} + +/// test total issuance against monetary mass +/// the monetary mass represents the claimable monetary mass +/// the total issuance represents the actually claimed currency +#[test] +fn test_total_issuance_vs_monetary_mass() { + ExtBuilder::new(1, 2, 3) + .with_initial_balances(vec![ + (AccountKeyring::Alice.to_account_id(), 2000), + (AccountKeyring::Bob.to_account_id(), 1000), + (AccountKeyring::Charlie.to_account_id(), 0), + ]) + .build() + .execute_with(|| { + let ud_creation_period = + <Runtime as pallet_universal_dividend::Config>::UdCreationPeriod::get(); + assert_eq!(ud_creation_period, 60_000); // this is 10 blocks × 6 seconds in milliseconds + + run_to_block(1); + // total issuance and monetary mass should be coherent + assert_eq!(Balances::total_issuance(), 3000); + assert_eq!( + pallet_universal_dividend::MonetaryMass::<Runtime>::get(), + 3000 + ); + // first UD creation + run_to_block(11); + assert_eq!(Balances::total_issuance(), 3000); + assert_eq!( + pallet_universal_dividend::MonetaryMass::<Runtime>::get(), + 6000 + ); + // Alice claims her UD + assert_ok!(UniversalDividend::claim_uds( + frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into() + )); + assert_eq!(Balances::total_issuance(), 4000); + assert_eq!( + pallet_universal_dividend::MonetaryMass::<Runtime>::get(), + 6000 + ); + // second UD creation + run_to_block(21); + // Bob claims his 2 UDs + assert_ok!(UniversalDividend::claim_uds( + frame_system::RawOrigin::Signed(AccountKeyring::Bob.to_account_id()).into() + )); + assert_eq!(Balances::total_issuance(), 6000); + assert_eq!( + pallet_universal_dividend::MonetaryMass::<Runtime>::get(), + 9000 + ); + }); +} + +/// test identity go below ED +#[test] +fn test_identity_below_ed() { + ExtBuilder::new(1, 1, 1) + .with_initial_balances(vec![(AccountKeyring::Alice.to_account_id(), 900)]) + .build() + .execute_with(|| { + run_to_block(1); + // new behavior : nobody is able to go below ED without killing the account + // a transfer below ED will lead to frozen token error + assert_noop!( + Balances::transfer( + frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into(), + MultiAddress::Id(AccountKeyring::Bob.to_account_id()), + 800 + ), + sp_runtime::TokenError::Frozen + ); + // // Old behavior below + // // Should be able to go below existential deposit, loose dust, and still not die + // assert_ok!(Balances::transfer( + // frame_system::RawOrigin::Signed(AccountKeyring::Alice.to_account_id()).into(), + // MultiAddress::Id(AccountKeyring::Bob.to_account_id()), + // 800 + // )); + // assert_eq!( + // Balances::free_balance(AccountKeyring::Alice.to_account_id()), + // 0 + // ); + // assert_eq!( + // Balances::free_balance(AccountKeyring::Bob.to_account_id()), + // 800 + // ); + // // since alice is identity, her account should not be killed even she lost currency below ED + // System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::Transfer { + // from: AccountKeyring::Alice.to_account_id(), + // to: AccountKeyring::Bob.to_account_id(), + // amount: 800, + // })); + // System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::DustLost { + // account: AccountKeyring::Alice.to_account_id(), + // amount: 100, + // })); + // System::assert_has_event(RuntimeEvent::System(frame_system::Event::NewAccount { + // account: AccountKeyring::Bob.to_account_id(), + // })); + // System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::Endowed { + // account: AccountKeyring::Bob.to_account_id(), + // free_balance: 800, + // })); + }) +} + +/// test session change +// session duration is set to 25 blocks +// this is to test that mock code behaves well +#[test] +fn test_session_change() { + ExtBuilder::new(1, 3, 4).build().execute_with(|| { + assert_eq!(<Runtime as pallet_babe::Config>::EpochDuration::get(), 25); + assert_eq!(Session::current_index(), 0); + assert_eq!(Babe::epoch_index(), 0); + assert_eq!(Babe::current_epoch_start(), 0u64); + run_to_block(2); + assert_eq!(Session::current_index(), 0); + assert_eq!(Babe::epoch_index(), 0); + run_to_block(24); + assert_eq!(Session::current_index(), 0); + assert_eq!(Babe::epoch_index(), 0); + run_to_block(25); + assert_eq!(Session::current_index(), 1); + assert_eq!(Babe::epoch_index(), 1); + assert_eq!(Babe::current_epoch_start(), 25u64); + run_to_block(26); + assert_eq!(Session::current_index(), 1); + assert_eq!(Babe::epoch_index(), 1); + run_to_block(50); + assert_eq!(Session::current_index(), 2); + assert_eq!(Babe::epoch_index(), 2); + assert_eq!(Babe::current_epoch_start(), 50u64); + run_to_block(51); + assert_eq!(Session::current_index(), 2); + assert_eq!(Babe::epoch_index(), 2); + run_to_block(52); + assert_eq!(Session::current_index(), 2); + assert_eq!(Babe::epoch_index(), 2); + run_to_block(60); + assert_eq!(Session::current_index(), 2); + assert_eq!(Babe::epoch_index(), 2); + assert_eq!(Babe::current_epoch_start(), 50u64); + run_to_block(75); + assert_eq!(Session::current_index(), 3); + assert_eq!(Babe::epoch_index(), 3); + run_to_block(100); + assert_eq!(Session::current_index(), 4); + assert_eq!(Babe::epoch_index(), 4); + }) +} + /// test calling remove_identity #[test] fn test_remove_identity() { ExtBuilder::new(1, 3, 4).build().execute_with(|| { run_to_block(2); - + // remove the identity assert_ok!(Identity::remove_identity( frame_system::RawOrigin::Root.into(), 4, None, pallet_identity::IdtyRemovalReason::Manual )); - System::assert_has_event(RuntimeEvent::Membership( pallet_membership::Event::MembershipRevoked(4), )); - System::assert_has_event(RuntimeEvent::System(frame_system::Event::KilledAccount { - account: AccountKeyring::Dave.to_account_id(), - })); System::assert_has_event(RuntimeEvent::Identity( pallet_identity::Event::IdtyRemoved { idty_index: 4, reason: pallet_identity::IdtyRemovalReason::Manual, }, )); + // since Dave does not have ED, his account is killed + System::assert_has_event(RuntimeEvent::System(frame_system::Event::KilledAccount { + account: AccountKeyring::Dave.to_account_id(), + })); }); } @@ -252,6 +450,20 @@ fn test_remove_identity_after_one_ud() { + 1) as u32, ); + // before UD, dave has 0 (initial amount) + run_to_block(1); + assert_eq!( + Balances::free_balance(AccountKeyring::Dave.to_account_id()), + 0 + ); + + // go after UD creation block + run_to_block( + (<Runtime as pallet_universal_dividend::Config>::UdCreationPeriod::get() + / <Runtime as pallet_babe::Config>::ExpectedBlockTime::get() + + 1) as u32, + ); + // remove identity assert_ok!(Identity::remove_identity( frame_system::RawOrigin::Root.into(), 4, @@ -260,17 +472,7 @@ fn test_remove_identity_after_one_ud() { )); // Verify events - System::assert_has_event(RuntimeEvent::Membership( - pallet_membership::Event::MembershipRevoked(4), - )); - System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::Deposit { - who: AccountKeyring::Dave.to_account_id(), - amount: 1_000, - })); - System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::Endowed { - account: AccountKeyring::Dave.to_account_id(), - free_balance: 1_000, - })); + // universal dividend was automatically paid to dave System::assert_has_event(RuntimeEvent::UniversalDividend( pallet_universal_dividend::Event::UdsAutoPaidAtRemoval { count: 1, @@ -278,6 +480,15 @@ fn test_remove_identity_after_one_ud() { who: AccountKeyring::Dave.to_account_id(), }, )); + // dave account actually received this UD + System::assert_has_event(RuntimeEvent::Balances(pallet_balances::Event::Deposit { + who: AccountKeyring::Dave.to_account_id(), + amount: 1_000, + })); + // membership and identity were actually removed + System::assert_has_event(RuntimeEvent::Membership( + pallet_membership::Event::MembershipRevoked(4), + )); System::assert_has_event(RuntimeEvent::Identity( pallet_identity::Event::IdtyRemoved { idty_index: 4, @@ -285,7 +496,7 @@ fn test_remove_identity_after_one_ud() { }, )); - // Verify state + // thanks to the new UD, Dave has existential deposit and is not killed assert!(Identity::identity(4).is_none()); assert_eq!( Balances::free_balance(AccountKeyring::Dave.to_account_id()), @@ -305,11 +516,11 @@ fn test_ud_claimed_membership_on_and_off() { pallet_universal_dividend::Event::NewUdCreated { amount: 1000, index: 1, - monetary_mass: 4000, + monetary_mass: 4_000, // 0 (initial) + 4 * 1000 (produced) members_count: 4, }, )); - // UD not claimed, still initial balance to 0 + // UD not claimed, still initial balance to initial 0 assert_eq!( Balances::free_balance(AccountKeyring::Alice.to_account_id()), 0 @@ -337,8 +548,8 @@ fn test_ud_claimed_membership_on_and_off() { pallet_universal_dividend::Event::NewUdCreated { amount: 1000, index: 2, - monetary_mass: 7000, // 4000 + 3 × 1000 - members_count: 3, // alice is not member at this UD + monetary_mass: 7_000, // 4000 + 3 × 1000 + members_count: 3, // alice is not member at this UD }, )); @@ -421,6 +632,8 @@ fn test_remove_smith_identity() { }); } +/// test create new account with balance lower than existential deposit +// the treasury gets the dust #[test] fn test_create_new_account_with_insufficient_balance() { ExtBuilder::new(1, 3, 4) @@ -475,6 +688,7 @@ fn test_create_new_account_with_insufficient_balance() { }); } +/// test new account creation #[test] fn test_create_new_account() { ExtBuilder::new(1, 3, 4) @@ -533,27 +747,33 @@ fn test_create_new_account() { // We can't remove the account until the random id is assigned run_to_block(4); + // can not remove using transfer assert_noop!( Balances::transfer( frame_system::RawOrigin::Signed(AccountKeyring::Eve.to_account_id()).into(), MultiAddress::Id(AccountKeyring::Alice.to_account_id()), 200 ), - pallet_balances::Error::<Runtime>::KeepAlive, + sp_runtime::DispatchError::ConsumerRemaining, ); assert_eq!( Balances::free_balance(AccountKeyring::Eve.to_account_id()), 200 ); - assert_ok!(Balances::transfer_all( - frame_system::RawOrigin::Signed(AccountKeyring::Eve.to_account_id()).into(), - MultiAddress::Id(AccountKeyring::Alice.to_account_id()), - false - ),); + // can not remove using transfer_all either + assert_noop!( + Balances::transfer_all( + frame_system::RawOrigin::Signed(AccountKeyring::Eve.to_account_id()).into(), + MultiAddress::Id(AccountKeyring::Alice.to_account_id()), + false + ), + sp_runtime::DispatchError::ConsumerRemaining, + ); assert_eq!( Balances::free_balance(AccountKeyring::Eve.to_account_id()), 200 ); + // TODO detail account removal }); } diff --git a/runtime/gtest/Cargo.toml b/runtime/gtest/Cargo.toml index 14fce690eb32837945f11bdd61c19d33092ebb47..a76ac672d2e03e078f7af411898cf38a71989173 100644 --- a/runtime/gtest/Cargo.toml +++ b/runtime/gtest/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.32' +branch = 'duniter-substrate-v0.9.42' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -127,10 +127,8 @@ try-runtime = [ ] [dev-dependencies] -sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } -sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } [dependencies] # local @@ -151,56 +149,52 @@ sp-membership = { path = '../../primitives/membership', default-features = false pallet-offences = { path = '../../pallets/offences', default-features = false } # crates.io -codec = { package = "parity-scale-codec", version = "3.1.5", features = [ - "derive", -], default-features = false } +codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } -hex-literal = { version = '0.3.1', optional = true } -scale-info = { version = "2.1.1", default-features = false, features = [ - "derive", -] } -serde = { version = "1.0.101", default-features = false } -serde_derive = { version = "1.0.101", optional = true } +hex-literal = { version = '0.4.1', default-features = false, optional = true } +scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.139", default-features = false } +serde_derive = { version = "1.0.117", default-features = false, optional = true } # substrate -frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } -sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false } # substrate benchmarking -frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } -frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.32', default-features = false, optional = true } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.42', default-features = false, optional = true } diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs index 42d4d9c6cc7c094ae64999fdbc16696e9c128f1f..083a83ec7fd858ece155a88c2798d5e40ac840e4 100644 --- a/runtime/gtest/src/lib.rs +++ b/runtime/gtest/src/lib.rs @@ -68,7 +68,9 @@ pub use frame_support::{ construct_runtime, parameter_types, traits::{EqualPrivilegeOnly, KeyOwnerProofSystem, Randomness}, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + constants::{ + BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND, + }, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, StorageValue, @@ -271,7 +273,7 @@ construct_runtime!( // Consensus support AuthorityMembers: pallet_authority_members::{Pallet, Call, Storage, Config<T>, Event<T>} = 10, - Authorship: pallet_authorship::{Pallet, Call, Storage} = 11, + Authorship: pallet_authorship::{Pallet, Storage} = 11, Offences: pallet_offences::{Pallet, Storage, Event} = 12, Historical: session_historical::{Pallet} = 13, Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 14, diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs index 8b3a650ad2b7cff2a6c444d63756bf6bd0f6f7d7..9f29ce90f9b78334989dccd6c2ffefaed8293672 100644 --- a/runtime/gtest/src/parameters.rs +++ b/runtime/gtest/src/parameters.rs @@ -18,14 +18,14 @@ use crate::*; use common_runtime::constants::*; use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; -use frame_support::weights::constants::WEIGHT_PER_SECOND; +use frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND; use sp_arithmetic::Perbill; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { pub const BlockHashCount: BlockNumber = 2400; /// We allow for 2 seconds of compute with a 6 second average block time. - pub BlockWeights: frame_system::limits::BlockWeights = block_weights((WEIGHT_PER_SECOND * 2) + pub BlockWeights: frame_system::limits::BlockWeights = block_weights((Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0) * 2) .set_proof_size(5 * 1024 * 1024), NORMAL_DISPATCH_RATIO); pub BlockLength: frame_system::limits::BlockLength = frame_system::limits::BlockLength ::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO); diff --git a/rust-toolchain b/rust-toolchain.toml similarity index 77% rename from rust-toolchain rename to rust-toolchain.toml index fe2d86aa67f086868d92ef4ba4c2528d6de1d766..7c39cc2dff56643cbdabbb51b183f6f1fc2b8fc1 100644 --- a/rust-toolchain +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2022-10-09" +channel = "nightly-2023-08-23" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ] profile = "minimal" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index acf7d5b5e7a982f10b54ef6f3c9c31555404d308..4ed72ab585f7698b4e017014744650640e9ae244 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -26,7 +26,7 @@ run_script = "0.6.3" scale-info = { version = "2.1.1", features = ["bit-vec"] } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0" -tokio = { version = "1.15.0", features = ["macros"] } +tokio = { version = "1.24.2", features = ["macros"] } version_check = "0.9.2" version-compare = "0.0.11" -tera = { version = "1", default-features = false } \ No newline at end of file +tera = { version = "1", default-features = false } diff --git a/xtask/src/gen_calls_doc.rs b/xtask/src/gen_calls_doc.rs index 543c880f6ee1f13626bd8119246b9c895053dd21..c1c03b3c9c44cc3fd3f8f712c558ff4f4151d027 100644 --- a/xtask/src/gen_calls_doc.rs +++ b/xtask/src/gen_calls_doc.rs @@ -50,7 +50,7 @@ impl Pallet { Ok(Self { index, name, - calls: calls_enum.variants().iter().map(Into::into).collect(), + calls: calls_enum.variants.iter().map(Into::into).collect(), }) } else { bail!("Invalid metadata") @@ -70,15 +70,15 @@ impl From<&scale_info::Variant<PortableForm>> for Call { fn from(variant: &scale_info::Variant<PortableForm>) -> Self { Self { documentation: variant - .docs() + .docs .iter() .take_while(|line| !line.starts_with("# <weight>")) .cloned() .collect::<Vec<_>>() .join("\n"), - index: variant.index(), - name: variant.name().to_owned(), - params: variant.fields().iter().map(Into::into).collect(), + index: variant.index, + name: variant.name.to_owned(), + params: variant.fields.iter().map(Into::into).collect(), } } } @@ -92,8 +92,8 @@ struct CallParam { impl From<&scale_info::Field<PortableForm>> for CallParam { fn from(field: &scale_info::Field<PortableForm>) -> Self { Self { - name: field.name().cloned().unwrap_or_default(), - type_name: field.type_name().cloned().unwrap_or_default(), + name: field.clone().name.unwrap_or_default(), + type_name: field.clone().type_name.unwrap_or_default(), } } } @@ -186,8 +186,8 @@ fn get_calls_from_metadata_v14( let mut pallets = Vec::new(); for pallet in metadata_v14.pallets { if let Some(calls) = pallet.calls { - if let Some(calls_type) = metadata_v14.types.resolve(calls.ty.id()) { - let pallet = Pallet::new(pallet.index, pallet.name.clone(), calls_type.type_def())?; + if let Some(calls_type) = metadata_v14.types.resolve(calls.ty.id) { + let pallet = Pallet::new(pallet.index, pallet.name.clone(), &calls_type.type_def)?; let calls_len = pallet.calls.len(); println!("{}: {} ({} calls)", pallet.index, pallet.name, calls_len); pallets.push(pallet);