diff --git a/Cargo.lock b/Cargo.lock index 62a887f91f5870db09d984f1e791953ebda9b323..0029d6e7fe7320d7135d04c34c0b2c8783f572a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom 0.2.3", "once_cell", @@ -206,7 +206,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.1", + "socket2", "waker-fn", "winapi 0.3.9", ] @@ -276,15 +276,16 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638" +checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", + "socket2", "trust-dns-resolver", ] @@ -305,26 +306,13 @@ dependencies = [ "syn", ] -[[package]] -name = "asynchronous-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" -dependencies = [ - "bytes 1.1.0", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite 0.2.7", -] - [[package]] name = "asynchronous-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-sink", "futures-util", "memchr", @@ -365,16 +353,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.63" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", - "object", + "miniz_oxide 0.5.3", + "object 0.29.0", "rustc-demangle", ] @@ -384,6 +372,12 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base58" version = "0.2.0" @@ -451,33 +445,31 @@ version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ - "funty", + "funty 1.1.0", "radium 0.5.3", "tap", - "wyz", + "wyz 0.2.0", ] [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "funty", - "radium 0.6.2", + "funty 2.0.0", + "radium 0.7.0", "tap", - "wyz", + "wyz 0.5.0", ] [[package]] name = "blake2" -version = "0.9.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest 0.10.3", ] [[package]] @@ -492,39 +484,37 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.1", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.1", "constant_time_eq", ] [[package]] name = "blake3" -version = "0.3.8" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.1", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", ] [[package]] @@ -643,19 +633,20 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "0.4.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] -name = "bytes" -version = "1.1.0" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "cache-padded" @@ -683,9 +674,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", @@ -726,21 +717,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.1.5", + "cpufeatures 0.2.1", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", @@ -749,12 +740,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "chameleon" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd83544cd11113170ce1eee45383928f3f720bc8b305af18c2a3da3547e1ae" - [[package]] name = "chrono" version = "0.4.19" @@ -779,13 +764,15 @@ dependencies = [ [[package]] name = "cid" -version = "0.6.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +checksum = "fc949bff6704880faf064c42a4854032ab07bfcf3a4fcb82a57470acededb69c" dependencies = [ + "core2", "multibase", - "multihash 0.13.2", - "unsigned-varint 0.5.1", + "multihash", + "serde", + "unsigned-varint", ] [[package]] @@ -869,6 +856,17 @@ dependencies = [ "unreachable", ] +[[package]] +name = "comfy-table" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" +dependencies = [ + "strum", + "strum_macros", + "unicode-width", +] + [[package]] name = "common-runtime" version = "0.8.0-dev" @@ -936,16 +934,16 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-oid" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] -name = "convert_case" -version = "0.4.0" +name = "constant_time_eq" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" @@ -963,6 +961,15 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpp_demangle" version = "0.3.5" @@ -992,18 +999,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc68cdb867b7d27b5f33cd65eb11376dfb41a2d09568a1a2c2bc1dc204f4ef" +checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31253a44ab62588f8235a996cc9b0636d98a299190069ced9628b8547329b47a" +checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", @@ -1018,33 +1025,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a20ab4627d30b702fb1b8a399882726d216b8164d3b3fa6189e3bf901506afe" +checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6687d9668dacfed4468361f7578d86bded8ca4db978f734d9b631494bebbb5b8" +checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" [[package]] name = "cranelift-entity" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77c5d72db97ba2cb36f69037a709edbae0d29cb25503775891e7151c5c874bf" +checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426dca83f63c7c64ea459eb569aadc5e0c66536c0042ed5d693f91830e8750d0" +checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" dependencies = [ "cranelift-codegen", "log", @@ -1054,9 +1061,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8007864b5d0c49b026c861a15761785a2871124e401630c03ef1426e6d0d559e" +checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" dependencies = [ "cranelift-codegen", "libc", @@ -1065,9 +1072,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cf12c071415ba261d897387ae5350c4d83c238376c8c5a96514ecfa2ea66a3" +checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1139,13 +1146,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +dependencies = [ + "generic-array 0.14.4", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" -version = "0.1.1" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +checksum = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f" dependencies = [ "generic-array 0.14.4", + "typenum", ] [[package]] @@ -1168,15 +1188,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctor" version = "0.1.20" @@ -1231,7 +1242,7 @@ dependencies = [ "cucumber-expressions", "derive_more", "either", - "futures 0.3.19", + "futures 0.3.21", "gherkin", "globwalk", "inventory", @@ -1297,11 +1308,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "darling" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" +checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" dependencies = [ "darling_core", "darling_macro", @@ -1309,9 +1333,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" +checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" dependencies = [ "fnv", "ident_case", @@ -1323,9 +1347,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" +checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" dependencies = [ "darling_core", "quote", @@ -1358,6 +1382,15 @@ dependencies = [ "syn", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1375,10 +1408,8 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", "syn", ] @@ -1402,13 +1433,13 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.1", "crypto-common", - "generic-array 0.14.4", + "subtle", ] [[package]] @@ -1459,7 +1490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ "byteorder", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -1470,9 +1501,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "duniter" @@ -1484,12 +1515,13 @@ dependencies = [ "common-runtime", "frame-benchmarking", "frame-benchmarking-cli", - "futures 0.3.19", + "futures 0.3.21", "g1-runtime", "gdev-runtime", "gtest-runtime", "hex", - "jsonrpc-core", + "jsonrpsee 0.13.1", + "lazy_static", "log", "maplit", "memmap2 0.5.0", @@ -1525,6 +1557,7 @@ dependencies = [ "sp-consensus-babe", "sp-core", "sp-finality-grandpa", + "sp-inherents", "sp-io", "sp-keyring", "sp-keystore", @@ -1538,6 +1571,7 @@ dependencies = [ "sp-trie", "substrate-build-script-utils", "substrate-frame-rpc-system", + "tracing-core", "try-runtime-cli", ] @@ -1610,6 +1644,18 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +[[package]] +name = "ecdsa" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] + [[package]] name = "ed25519" version = "1.2.0" @@ -1639,6 +1685,24 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "elliptic-curve" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "ff", + "generic-array 0.14.4", + "group", + "rand_core 0.6.3", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -1656,11 +1720,11 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck 0.3.3", + "heck 0.4.0", "proc-macro2", "quote", "syn", @@ -1728,7 +1792,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", ] [[package]] @@ -1783,6 +1847,16 @@ dependencies = [ "libc", ] +[[package]] +name = "ff" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -1807,12 +1881,12 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "num-traits", @@ -1849,7 +1923,7 @@ dependencies = [ "crc32fast", "libc", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.4.4", ] [[package]] @@ -1876,7 +1950,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", ] @@ -1888,13 +1962,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -1903,6 +1977,7 @@ dependencies = [ "parity-scale-codec", "paste", "scale-info", + "serde", "sp-api", "sp-application-crypto", "sp-io", @@ -1915,33 +1990,57 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "Inflector", "chrono", "clap", + "comfy-table", "frame-benchmarking", "frame-support", + "frame-system", "handlebars", + "hash-db", + "hex", + "itertools", + "kvdb", + "lazy_static", "linked-hash-map", "log", + "memory-db", "parity-scale-codec", + "rand 0.8.4", + "rand_pcg 0.3.1", + "sc-block-builder", "sc-cli", + "sc-client-api", "sc-client-db", "sc-executor", "sc-service", + "sc-sysinfo", "serde", + "serde_json", + "serde_nanos", + "sp-api", + "sp-blockchain", "sp-core", + "sp-database", "sp-externalities", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-storage", + "sp-trie", + "tempfile", + "thiserror", + "thousands", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -1956,9 +2055,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec", @@ -1969,12 +2068,13 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", + "k256", "log", "once_cell", "parity-scale-codec", @@ -1998,7 +2098,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2010,10 +2110,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -2022,7 +2122,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "proc-macro2", "quote", @@ -2032,7 +2132,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "log", @@ -2049,7 +2149,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -2064,7 +2164,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "sp-api", @@ -2073,7 +2173,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "sp-api", @@ -2103,6 +2203,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "fsevent" version = "0.4.0" @@ -2154,6 +2260,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.1.31" @@ -2162,9 +2274,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -2177,9 +2289,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -2187,15 +2299,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -2205,9 +2317,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-lite" @@ -2226,9 +2338,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", @@ -2237,26 +2349,26 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", - "rustls 0.19.1", - "webpki 0.21.4", + "rustls", + "webpki", ] [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-timer" @@ -2266,9 +2378,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2622,6 +2734,17 @@ dependencies = [ "syn", ] +[[package]] +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff", + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "gtest-runtime" version = "3.0.0" @@ -2696,7 +2819,7 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -2705,22 +2828,22 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.9", "tracing", ] [[package]] name = "handlebars" -version = "4.2.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2483bce82dd3ed52509d0117e4a30a488bd608be250ed7a0185301314239ed31" +checksum = "36641a8b9deb60e23fb9bb47ac631d664a780b088909b89179a4eab5618b076b" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -2747,6 +2870,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" +dependencies = [ + "ahash", +] + [[package]] name = "heck" version = "0.3.3" @@ -2837,7 +2969,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "itoa 0.4.7", ] @@ -2848,7 +2980,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ - "bytes 1.1.0", + "bytes", "http", "pin-project-lite 0.2.7", ] @@ -2877,7 +3009,7 @@ version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2888,30 +3020,13 @@ dependencies = [ "httpdate", "itoa 1.0.1", "pin-project-lite 0.2.7", - "socket2 0.4.1", + "socket2", "tokio", "tower-service", "tracing", "want", ] -[[package]] -name = "hyper-rustls" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" -dependencies = [ - "ct-logs", - "futures-util", - "hyper", - "log", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", - "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", -] - [[package]] name = "hyper-rustls" version = "0.23.0" @@ -2921,11 +3036,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.2", - "rustls-native-certs 0.6.1", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.23.2", - "webpki-roots 0.22.2", + "tokio-rustls", ] [[package]] @@ -2934,7 +3048,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.1.0", + "bytes", "hyper", "native-tls", "tokio", @@ -2947,17 +3061,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -2971,39 +3074,30 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28538916eb3f3976311f5dfbe67b5362d0add1293d0a9cad17debf86f8e3aa48" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ - "if-addrs-sys", "libc", "winapi 0.3.9", ] [[package]] -name = "if-addrs-sys" -version = "0.3.2" +name = "if-watch" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" +checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "if-watch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" -dependencies = [ - "async-io", - "futures 0.3.19", - "futures-lite", - "if-addrs", - "ipnet", - "libc", - "log", - "winapi 0.3.9", + "async-io", + "core-foundation", + "fnv", + "futures 0.3.21", + "if-addrs", + "ipnet", + "log", + "rtnetlink", + "system-configuration", + "windows", ] [[package]] @@ -3026,9 +3120,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] @@ -3044,9 +3138,9 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", @@ -3060,7 +3154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -3092,9 +3186,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] @@ -3120,12 +3214,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" -dependencies = [ - "winapi 0.3.9", -] +checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" [[package]] name = "iovec" @@ -3144,14 +3235,14 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" +checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" dependencies = [ - "socket2 0.3.19", + "socket2", "widestring", "winapi 0.3.9", - "winreg 0.6.2", + "winreg 0.7.0", ] [[package]] @@ -3162,9 +3253,9 @@ checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] @@ -3199,229 +3290,91 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-pubsub", - "log", - "serde", - "serde_json", - "url 1.7.2", -] - -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures 0.3.19", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.19", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.19", - "hyper", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes 1.1.0", - "futures 0.3.19", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util", - "unicase", -] - -[[package]] -name = "jsonrpc-ws-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" -dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-ws", - "parking_lot 0.11.2", - "slab", -] - [[package]] name = "jsonrpsee" -version = "0.4.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" +checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" dependencies = [ - "jsonrpsee-types 0.4.1", - "jsonrpsee-utils", - "jsonrpsee-ws-client 0.4.1", + "jsonrpsee-core 0.13.1", + "jsonrpsee-http-server", + "jsonrpsee-proc-macros", + "jsonrpsee-types 0.13.1", + "jsonrpsee-ws-client", + "jsonrpsee-ws-server", + "tracing", ] [[package]] name = "jsonrpsee" -version = "0.8.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" +checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ - "jsonrpsee-core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-proc-macros 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-ws-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "jsonrpsee" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" -dependencies = [ - "jsonrpsee-client-transport 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-core 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-http-client", - "jsonrpsee-proc-macros 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-types 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-ws-client 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", + "jsonrpsee-client-transport 0.14.0", + "jsonrpsee-core 0.14.0", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" +checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" dependencies = [ - "futures 0.3.19", + "futures-util", "http", - "jsonrpsee-core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pin-project", - "rustls-native-certs 0.6.1", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", + "pin-project 1.0.10", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", - "tokio-util", + "tokio-rustls", + "tokio-util 0.7.3", "tracing", - "webpki-roots 0.22.2", + "webpki-roots", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" dependencies = [ - "futures 0.3.19", + "futures-util", "http", - "jsonrpsee-core 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-types 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "pin-project", - "rustls-native-certs 0.6.1", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "pin-project 1.0.10", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", - "tokio-util", + "tokio-rustls", + "tokio-util 0.7.3", "tracing", - "webpki-roots 0.22.2", + "webpki-roots", ] [[package]] name = "jsonrpsee-core" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3" +checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" dependencies = [ "anyhow", "arrayvec 0.7.1", + "async-lock", "async-trait", "beef", "futures-channel", + "futures-timer", "futures-util", "hyper", - "jsonrpsee-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpsee-types 0.13.1", + "parking_lot 0.12.0", + "rand 0.8.4", "rustc-hash", "serde", "serde_json", @@ -3433,62 +3386,52 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" dependencies = [ "anyhow", - "arrayvec 0.7.1", + "async-lock", "async-trait", "beef", "futures-channel", + "futures-timer", "futures-util", - "hyper", - "jsonrpsee-types 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", + "jsonrpsee-types 0.14.0", "rustc-hash", "serde", "serde_json", - "soketto", "thiserror", "tokio", "tracing", ] [[package]] -name = "jsonrpsee-http-client" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" +name = "jsonrpsee-http-server" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" dependencies = [ - "async-trait", + "futures-channel", + "futures-util", + "globset", "hyper", - "hyper-rustls 0.23.0", - "jsonrpsee-core 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-types 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "rustc-hash", - "serde", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", + "lazy_static", "serde_json", - "thiserror", "tokio", "tracing", + "unicase", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" +checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" -dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -3496,28 +3439,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" -dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "log", - "serde", - "serde_json", - "soketto", - "thiserror", -] - -[[package]] -name = "jsonrpsee-types" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58" +checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" dependencies = [ "anyhow", "beef", @@ -3529,8 +3453,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" dependencies = [ "anyhow", "beef", @@ -3541,59 +3466,43 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-utils" -version = "0.4.1" +name = "jsonrpsee-ws-client" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" +checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" dependencies = [ - "arrayvec 0.7.1", - "beef", - "jsonrpsee-types 0.4.1", + "jsonrpsee-client-transport 0.13.1", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.4.1" +name = "jsonrpsee-ws-server" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" +checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" dependencies = [ - "arrayvec 0.7.1", - "async-trait", - "fnv", - "futures 0.3.19", - "http", - "jsonrpsee-types 0.4.1", - "log", - "pin-project", - "rustls-native-certs 0.5.0", - "serde", + "futures-channel", + "futures-util", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", "serde_json", "soketto", - "thiserror", "tokio", - "tokio-rustls 0.22.0", - "tokio-util", + "tokio-util 0.7.3", + "tracing", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.8.0" +name = "k256" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" -dependencies = [ - "jsonrpsee-client-transport 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpsee-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" dependencies = [ - "jsonrpsee-client-transport 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-core 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "jsonrpsee-types 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "sec1", ] [[package]] @@ -3623,9 +3532,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -3633,20 +3542,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -3654,7 +3563,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -3706,14 +3615,18 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.40.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" +checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f" dependencies = [ "atomic", - "bytes 1.1.0", - "futures 0.3.19", + "bytes", + "futures 0.3.21", + "futures-timer", + "getrandom 0.2.3", + "instant", "lazy_static", + "libp2p-autonat", "libp2p-core", "libp2p-deflate", "libp2p-dns", @@ -3739,65 +3652,85 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.11.2", - "pin-project", + "parking_lot 0.12.0", + "pin-project 1.0.10", + "rand 0.7.3", "smallvec", - "wasm-timer", +] + +[[package]] +name = "libp2p-autonat" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13b690e65046af6a09c0b27bd9508fa1cab0efce889de74b0b643b9d2a98f9a" +dependencies = [ + "async-trait", + "futures 0.3.21", + "futures-timer", + "instant", + "libp2p-core", + "libp2p-request-response", + "libp2p-swarm", + "log", + "prost 0.9.0", + "prost-build", + "rand 0.8.4", ] [[package]] name = "libp2p-core" -version = "0.30.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef22d9bba1e8bcb7ec300073e6802943fe8abb8190431842262b5f1c30abba1" +checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", + "instant", "lazy_static", "libsecp256k1", "log", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", - "parking_lot 0.11.2", - "pin-project", - "prost", + "parking_lot 0.12.0", + "pin-project 1.0.10", + "prost 0.9.0", "prost-build", "rand 0.8.4", "ring", "rw-stream-sink", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", "thiserror", - "unsigned-varint 0.7.0", + "unsigned-varint", "void", "zeroize", ] [[package]] name = "libp2p-deflate" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" +checksum = "6b1d37f042f748e224f04785d0e987ae09a2aa518d6401d82d412dad83e360ed" dependencies = [ "flate2", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core", ] [[package]] name = "libp2p-dns" -version = "0.30.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" +checksum = "066e33e854e10b5c93fc650458bf2179c7e0d143db260b0963e44a94859817f1" dependencies = [ "async-std-resolver", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core", "log", "smallvec", @@ -3806,17 +3739,17 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" +checksum = "733d3ea6ebe7a7a85df2bc86678b93f24b015fae5fe3b3acc4c400e795a55d2d" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", "smallvec", @@ -3824,83 +3757,87 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.33.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeead619eb5dac46e65acc78c535a60aaec803d1428cca6407c3a4fc74d698d" +checksum = "a90c989a7c0969c2ab63e898da9bc735e3be53fb4f376e9c045ce516bcc9f928" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "base64", "byteorder", - "bytes 1.1.0", + "bytes", "fnv", - "futures 0.3.19", + "futures 0.3.21", "hex_fmt", + "instant", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prometheus-client", + "prost 0.9.0", "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", - "unsigned-varint 0.7.0", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" +checksum = "c5ef5a5b57904c7c33d6713ef918d239dc6b7553458f3475d87f8a18e9c651c8" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "lru 0.6.6", - "prost", + "lru", + "prost 0.9.0", "prost-build", "smallvec", - "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2297dc0ca285f3a09d1368bde02449e539b46f94d32d53233f53f6625bcd3ba" +checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e" dependencies = [ "arrayvec 0.5.2", - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "either", "fnv", - "futures 0.3.19", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", + "thiserror", "uint", - "unsigned-varint 0.7.0", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c864b64bdc8a84ff3910a0df88e6535f256191a450870f1e7e10cbf8e64d45" +checksum = "611ae873c8e280ccfab0d57c7a13cac5644f364529e233114ff07863946058b0" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.19", + "futures 0.3.21", "if-watch", "lazy_static", "libp2p-core", @@ -3908,58 +3845,60 @@ dependencies = [ "log", "rand 0.8.4", "smallvec", - "socket2 0.4.1", + "socket2", "void", ] [[package]] name = "libp2p-metrics" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" +checksum = "985be799bb3796e0c136c768208c3c06604a38430571906a13dcfeda225a3b9d" dependencies = [ "libp2p-core", + "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", + "libp2p-relay", "libp2p-swarm", - "open-metrics-client", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" +checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.19", + "asynchronous-codec", + "bytes", + "futures 0.3.21", "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.0", + "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" +checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" dependencies = [ - "bytes 1.1.0", + "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.19", + "futures 0.3.21", "lazy_static", "libp2p-core", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.4", - "sha2 0.9.9", + "sha2 0.10.2", "snow", "static_assertions", "x25519-dalek", @@ -3968,33 +3907,34 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" +checksum = "bf57a3c2e821331dda9fe612d4654d676ab6e33d18d9434a18cced72630df6ad" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "rand 0.7.3", "void", - "wasm-timer", ] [[package]] name = "libp2p-plaintext" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" +checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.19", + "asynchronous-codec", + "bytes", + "futures 0.3.21", "libp2p-core", "log", - "prost", + "prost 0.9.0", "prost-build", - "unsigned-varint 0.7.0", + "unsigned-varint", "void", ] @@ -4004,99 +3944,106 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", - "pin-project", + "pin-project 1.0.10", "rand 0.7.3", "salsa20", - "sha3", + "sha3 0.9.1", ] [[package]] name = "libp2p-relay" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" +checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.19", + "asynchronous-codec", + "bytes", + "either", + "futures 0.3.21", "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", - "pin-project", - "prost", + "pin-project 1.0.10", + "prost 0.9.0", "prost-build", - "rand 0.7.3", + "rand 0.8.4", "smallvec", - "unsigned-varint 0.7.0", + "static_assertions", + "thiserror", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-rendezvous" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" +checksum = "bbd0baab894c5b84da510b915d53264d566c3c35889f09931fe9edbd2a773bee" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bimap", - "futures 0.3.19", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.4", - "sha2 0.9.9", + "sha2 0.10.2", "thiserror", - "unsigned-varint 0.7.0", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-request-response" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" +checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869" dependencies = [ "async-trait", - "bytes 1.1.0", - "futures 0.3.19", + "bytes", + "futures 0.3.21", + "instant", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.2", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.0", - "wasm-timer", + "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" +checksum = "8f0c69ad9e8f7c5fc50ad5ad9c7c8b57f33716532a2b623197f69f93e374d14c" dependencies = [ "either", - "futures 0.3.19", + "fnv", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "log", + "pin-project 1.0.10", "rand 0.7.3", "smallvec", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-swarm-derive" -version = "0.25.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2" +checksum = "4f693c8c68213034d472cbb93a379c63f4f307d97c06f1c41e4985de481687a5" dependencies = [ "quote", "syn", @@ -4104,40 +4051,40 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" +checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" dependencies = [ "async-io", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "if-watch", "ipnet", "libc", "libp2p-core", "log", - "socket2 0.4.1", + "socket2", ] [[package]] name = "libp2p-uds" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" +checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" dependencies = [ "async-std", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" +checksum = "4f6ea0f84a967ef59a16083f222c18115ae2e91db69809dce275df62e101b279" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4147,45 +4094,48 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" +checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" dependencies = [ "either", - "futures 0.3.19", + "futures 0.3.21", "futures-rustls", "libp2p-core", "log", "quicksink", "rw-stream-sink", "soketto", - "url 2.2.2", - "webpki-roots 0.21.1", + "url", + "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" +checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p-core", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "thiserror", "yamux", ] [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -4274,9 +4224,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.36" +version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" +checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" [[package]] name = "lock_api" @@ -4300,20 +4250,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.6.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" +checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" dependencies = [ - "hashbrown", -] - -[[package]] -name = "lru" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f" -dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -4396,6 +4337,15 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.2.3" @@ -4425,12 +4375,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.12.2", "parity-util-mem", ] @@ -4474,6 +4424,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.6.23" @@ -4487,7 +4446,7 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.2", + "miow", "net2", "slab", "winapi 0.2.8", @@ -4495,15 +4454,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", - "miow 0.3.7", - "ntapi", - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -4522,21 +4480,12 @@ dependencies = [ name = "miow" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" dependencies = [ - "winapi 0.3.9", + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", ] [[package]] @@ -4547,27 +4496,27 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", - "percent-encoding 2.1.0", + "multihash", + "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.0", - "url 2.2.2", + "unsigned-varint", + "url", ] [[package]] name = "multibase" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" dependencies = [ "base-x", "data-encoding", @@ -4576,41 +4525,28 @@ dependencies = [ [[package]] name = "multihash" -version = "0.13.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" +checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", - "digest 0.9.0", - "generic-array 0.14.4", - "multihash-derive", - "sha2 0.9.9", - "sha3", - "unsigned-varint 0.5.1", -] - -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.4", + "core2", + "digest 0.10.3", "multihash-derive", - "sha2 0.9.9", - "unsigned-varint 0.7.0", + "sha2 0.10.2", + "sha3 0.10.1", + "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -4626,16 +4562,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" +checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ - "bytes 1.1.0", - "futures 0.3.19", + "bytes", + "futures 0.3.21", "log", - "pin-project", + "pin-project 1.0.10", "smallvec", - "unsigned-varint 0.7.0", + "unsigned-varint", ] [[package]] @@ -4669,9 +4605,9 @@ dependencies = [ [[package]] name = "names" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" +checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" dependencies = [ "rand 0.8.4", ] @@ -4705,6 +4641,72 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "netlink-packet-core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +dependencies = [ + "anyhow", + "byteorder", + "libc", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +dependencies = [ + "bytes", + "futures 0.3.21", + "log", + "netlink-packet-core", + "netlink-sys", + "thiserror", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +dependencies = [ + "async-io", + "bytes", + "futures 0.3.21", + "libc", + "log", +] + [[package]] name = "nias" version = "0.5.0" @@ -4741,7 +4743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ "bitvec 0.19.5", - "funty", + "funty 1.1.0", "memchr", "version_check", ] @@ -4786,15 +4788,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -4815,6 +4808,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-format" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +dependencies = [ + "arrayvec 0.4.12", + "itoa 0.4.7", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -4899,13 +4902,22 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" dependencies = [ - "parking_lot 0.12.0", + "parking_lot_core 0.9.3", ] [[package]] @@ -4920,29 +4932,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "open-metrics-client" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" -dependencies = [ - "dtoa", - "itoa 0.4.7", - "open-metrics-client-derive-text-encode", - "owning_ref", -] - -[[package]] -name = "open-metrics-client-derive-text-encode" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl" version = "0.10.40" @@ -5006,7 +4995,7 @@ dependencies = [ [[package]] name = "pallet-atomic-swap" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -5021,7 +5010,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -5058,7 +5047,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -5073,7 +5062,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5097,7 +5086,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5129,7 +5118,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5213,7 +5202,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5253,7 +5242,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5291,7 +5280,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5306,7 +5295,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -5323,7 +5312,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5354,7 +5343,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5369,7 +5358,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5385,7 +5374,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -5406,7 +5395,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", @@ -5420,7 +5409,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5438,14 +5427,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "smallvec", "sp-core", "sp-io", "sp-runtime", @@ -5455,11 +5443,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee 0.13.1", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -5472,7 +5458,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5483,7 +5469,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5532,7 +5518,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5547,9 +5533,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a95abf24f1097c6e3181abbbbfc3630b3b5e681470940f719b69acb4911c7f" +checksum = "966eb23bd3a09758b8dac09f82b9d417c00f14e5d46171bf04cffdd9cb2e1eb1" dependencies = [ "blake2-rfc", "crc32fast", @@ -5566,12 +5552,12 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec 0.7.1", - "bitvec 0.20.4", + "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", @@ -5580,11 +5566,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -5596,31 +5582,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.19", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown", + "hashbrown 0.12.2", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "smallvec", "winapi 0.3.9", @@ -5652,24 +5624,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" -[[package]] -name = "parity-ws" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log", - "mio 0.6.23", - "mio-extras", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url 2.2.2", -] - [[package]] name = "parking" version = "2.0.0" @@ -5781,12 +5735,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9555b1514d2d99d78150d3c799d4c357a3e2c2a8062cd108e93a06d9057629c5" -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -5846,13 +5794,33 @@ dependencies = [ "indexmap", ] +[[package]] +name = "pin-project" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal 0.4.30", +] + [[package]] name = "pin-project" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal", + "pin-project-internal 1.0.10", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -5959,9 +5927,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", @@ -5972,18 +5940,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -6015,11 +5974,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -6036,14 +5995,47 @@ dependencies = [ "thiserror", ] +[[package]] +name = "prometheus-client" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +dependencies = [ + "dtoa", + "itoa 1.0.1", + "owning_ref", + "prometheus-client-derive-text-encode", +] + +[[package]] +name = "prometheus-client-derive-text-encode" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.1.0", - "prost-derive", + "bytes", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +dependencies = [ + "bytes", + "prost-derive 0.10.1", ] [[package]] @@ -6052,14 +6044,14 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.1.0", + "bytes", "heck 0.3.3", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost", + "prost 0.9.0", "prost-types", "regex", "tempfile", @@ -6079,14 +6071,27 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.1.0", - "prost", + "bytes", + "prost 0.9.0", ] [[package]] @@ -6104,12 +6109,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quicksink" version = "0.1.2" @@ -6123,9 +6122,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -6138,9 +6137,9 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -6153,7 +6152,7 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", - "rand_pcg", + "rand_pcg 0.2.1", ] [[package]] @@ -6243,6 +6242,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_pcg" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" +dependencies = [ + "rand_core 0.6.3", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -6314,9 +6322,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.33" +version = "0.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" +checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" dependencies = [ "log", "rustc-hash", @@ -6325,9 +6333,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -6345,9 +6353,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "region" @@ -6364,10 +6372,10 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "env_logger", - "jsonrpsee 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "serde", @@ -6394,7 +6402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ "base64", - "bytes 1.1.0", + "bytes", "encoding_rs", "futures-core", "futures-util", @@ -6409,7 +6417,7 @@ dependencies = [ "log", "mime", "native-tls", - "percent-encoding 2.1.0", + "percent-encoding", "pin-project-lite 0.2.7", "serde", "serde_json", @@ -6417,7 +6425,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tower-service", - "url 2.2.2", + "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -6431,7 +6439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -6440,6 +6448,17 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11000e6ba5020e53e7cc26f73b91ae7d5496b4977851479edb66b694c0675c21" +[[package]] +name = "rfc6979" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +dependencies = [ + "crypto-bigint", + "hmac 0.11.0", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -6457,9 +6476,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -6469,10 +6488,25 @@ dependencies = [ name = "rpassword" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "rtnetlink" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "libc", - "winapi 0.3.9", + "async-global-executor", + "futures 0.3.21", + "log", + "netlink-packet-route", + "netlink-proto", + "nix", + "thiserror", ] [[package]] @@ -6502,15 +6536,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" @@ -6522,9 +6547,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.31.3" +version = "0.33.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", "errno", @@ -6534,19 +6559,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.2" @@ -6555,20 +6567,8 @@ checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", + "webpki", ] [[package]] @@ -6613,10 +6613,11 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.2.1" -source = "git+https://github.com/librelois/rw-stream-sink?branch=master#7a5614fa27964c082faeb67749f5c892a16317cd" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.19", - "pin-project", + "futures 0.3.21", + "pin-project 0.4.30", "static_assertions", ] @@ -6647,7 +6648,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "log", "sp-core", @@ -6658,9 +6659,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", @@ -6681,7 +6682,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6697,7 +6698,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -6714,9 +6715,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -6725,12 +6726,12 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "chrono", "clap", "fdlimit", - "futures 0.3.19", + "futures 0.3.21", "hex", "libp2p", "log", @@ -6740,6 +6741,7 @@ dependencies = [ "regex", "rpassword", "sc-client-api", + "sc-client-db", "sc-keystore", "sc-network", "sc-service", @@ -6763,14 +6765,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "fnv", - "futures 0.3.19", + "futures 0.3.21", "hash-db", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -6791,7 +6793,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "hash-db", "kvdb", @@ -6801,7 +6803,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -6816,14 +6818,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -6840,10 +6842,10 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "log", "parity-scale-codec", "sc-block-builder", @@ -6869,18 +6871,18 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "fork-tree", - "futures 0.3.19", + "futures 0.3.21", "log", "merlin", "num-bigint", "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -6912,7 +6914,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6925,14 +6927,12 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "assert_matches", "async-trait", - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "futures 0.3.21", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -6961,10 +6961,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", @@ -6986,7 +6986,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "sc-client-api", "sp-authorship", @@ -6997,14 +6997,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "lazy_static", - "libsecp256k1", - "log", - "lru 0.6.6", + "lru", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -7019,19 +7017,20 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "environmental", "parity-scale-codec", "sc-allocator", - "sp-core", "sp-maybe-compressed-blob", + "sp-sandbox", "sp-serializer", "sp-wasm-interface", "thiserror", @@ -7042,15 +7041,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "scoped-tls", - "sp-core", "sp-runtime-interface", + "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -7058,7 +7056,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "cfg-if 1.0.0", "libc", @@ -7067,8 +7065,8 @@ dependencies = [ "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", - "sp-core", "sp-runtime-interface", + "sp-sandbox", "sp-wasm-interface", "wasmtime", ] @@ -7076,17 +7074,19 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ + "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", + "hex", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.4", "sc-block-builder", "sc-chain-spec", @@ -7114,10 +7114,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "ansi_term", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-util-mem", @@ -7131,11 +7131,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -7146,18 +7146,17 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "async-std", "async-trait", - "asynchronous-codec 0.5.0", + "asynchronous-codec", "bitflags", - "bytes 1.1.0", + "bytes", "cid", "either", "fnv", "fork-tree", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "hex", "ip_network", @@ -7165,16 +7164,19 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.2", + "lru", "parity-scale-codec", - "parking_lot 0.11.2", - "pin-project", - "prost", + "parking_lot 0.12.0", + "pin-project 1.0.10", + "prost 0.10.4", "prost-build", "rand 0.7.3", "sc-block-builder", "sc-client-api", "sc-consensus", + "sc-network-common", + "sc-network-light", + "sc-network-sync", "sc-peerset", "sc-utils", "serde", @@ -7188,43 +7190,106 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.6.0", + "unsigned-varint", "void", "zeroize", ] +[[package]] +name = "sc-network-common" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +dependencies = [ + "futures 0.3.21", + "libp2p", + "parity-scale-codec", + "prost-build", + "sc-peerset", + "smallvec", +] + [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "ahash", + "futures 0.3.21", "futures-timer", "libp2p", "log", - "lru 0.7.2", + "lru", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "sc-network-light" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +dependencies = [ + "futures 0.3.21", + "libp2p", + "log", + "parity-scale-codec", + "prost 0.10.4", + "prost-build", + "sc-client-api", + "sc-network-common", + "sc-peerset", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "sc-network-sync" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +dependencies = [ + "bitflags", + "either", + "fork-tree", + "futures 0.3.21", + "libp2p", + "log", + "lru", + "parity-scale-codec", + "prost 0.10.4", + "prost-build", + "sc-client-api", + "sc-consensus", + "sc-network-common", + "sc-peerset", + "smallvec", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "hex", "hyper", - "hyper-rustls 0.22.1", + "hyper-rustls", "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -7240,9 +7305,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p", "log", "sc-utils", @@ -7253,7 +7318,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7262,15 +7327,14 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -7293,18 +7357,16 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "futures 0.3.21", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", + "scale-info", "serde", "serde_json", "sp-core", @@ -7318,14 +7380,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", + "futures 0.3.21", + "jsonrpsee 0.13.1", "log", "serde_json", "substrate-prometheus-endpoint", @@ -7335,21 +7393,20 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", - "pin-project", + "parking_lot 0.12.0", + "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -7360,9 +7417,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-common", "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -7399,28 +7458,47 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] +[[package]] +name = "sc-sysinfo" +version = "6.0.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +dependencies = [ + "futures 0.3.21", + "libc", + "log", + "rand 0.7.3", + "rand_pcg 0.2.1", + "regex", + "sc-telemetry", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-std", +] + [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "chrono", - "futures 0.3.19", + "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", - "pin-project", + "parking_lot 0.12.0", + "pin-project 1.0.10", "rand 0.7.3", "serde", "serde_json", @@ -7431,7 +7509,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "ansi_term", "atty", @@ -7440,7 +7518,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -7462,9 +7540,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7473,15 +7551,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "linked-hash-map", "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -7500,9 +7578,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", "serde", "sp-blockchain", @@ -7513,22 +7591,23 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "log", + "parking_lot 0.12.0", "prometheus", ] [[package]] name = "scale-info" -version = "1.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.1", "cfg-if 1.0.0", "derive_more", "parity-scale-codec", @@ -7538,11 +7617,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "1.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7576,28 +7655,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -7620,6 +7683,36 @@ dependencies = [ "syn", ] +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array 0.14.4", + "subtle", + "zeroize", +] + +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -7658,16 +7751,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -7685,29 +7769,20 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.133" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -7716,15 +7791,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.74" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa 1.0.1", "ryu", "serde", ] +[[package]] +name = "serde_nanos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -7789,13 +7873,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", - "digest 0.10.1", + "digest 0.10.3", ] [[package]] @@ -7810,6 +7894,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.3" @@ -7849,6 +7943,10 @@ name = "signature" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" +dependencies = [ + "digest 0.9.0", + "rand_core 0.6.3", +] [[package]] name = "simba" @@ -7870,9 +7968,9 @@ checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "smallvec" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "snap" @@ -7882,38 +7980,26 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" +checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "rand 0.8.4", + "curve25519-dalek 4.0.0-pre.1", "rand_core 0.6.3", "ring", - "rustc_version 0.3.3", - "sha2 0.9.9", + "rustc_version", + "sha2 0.10.2", "subtle", - "x25519-dalek", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", ] [[package]] name = "socket2" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi 0.3.9", @@ -7926,9 +8012,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64", - "bytes 1.1.0", + "bytes", "flate2", - "futures 0.3.19", + "futures 0.3.21", "httparse", "log", "rand 0.8.4", @@ -7938,7 +8024,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "hash-db", "log", @@ -7955,10 +8041,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "blake2-rfc", - "proc-macro-crate 1.1.0", + "blake2", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7966,8 +8052,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -7979,8 +8065,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "integer-sqrt", "num-traits", @@ -7995,7 +8081,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -8008,7 +8094,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "parity-scale-codec", @@ -8020,7 +8106,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "sp-api", @@ -8032,13 +8118,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", - "lru 0.7.2", + "lru", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -8050,10 +8136,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", @@ -8069,7 +8155,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "parity-scale-codec", @@ -8087,7 +8173,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "merlin", @@ -8110,21 +8196,24 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", + "scale-info", "schnorrkel", "sp-core", "sp-runtime", @@ -8133,8 +8222,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "base58", "bitflags", @@ -8142,7 +8231,7 @@ dependencies = [ "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.19", + "futures 0.3.21", "hash-db", "hash256-std-hasher", "hex", @@ -8154,15 +8243,15 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", "scale-info", "schnorrkel", + "secp256k1", "secrecy", "serde", - "sha2 0.10.1", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -8173,8 +8262,6 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "tiny-keccak", - "twox-hash", "wasmi", "zeroize", ] @@ -8182,20 +8269,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "blake2-rfc", + "blake2", "byteorder", - "sha2 0.10.1", + "digest 0.10.3", + "sha2 0.10.2", + "sha3 0.10.1", "sp-std", - "tiny-keccak", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "proc-macro2", "quote", @@ -8206,16 +8294,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "proc-macro2", "quote", @@ -8224,8 +8312,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "0.12.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "environmental", "parity-scale-codec", @@ -8236,7 +8324,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "finality-grandpa", "log", @@ -8254,7 +8342,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8267,15 +8355,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", + "secp256k1", "sp-core", "sp-externalities", "sp-keystore", @@ -8291,8 +8380,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "lazy_static", "sp-core", @@ -8302,14 +8391,14 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "0.12.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "merlin", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -8320,8 +8409,9 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ + "thiserror", "zstd", ] @@ -8340,7 +8430,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "sp-api", "sp-core", @@ -8350,7 +8440,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "backtrace", "lazy_static", @@ -8359,8 +8449,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "rustc-hash", "serde", @@ -8369,8 +8459,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "either", "hash256-std-hasher", @@ -8391,8 +8481,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8408,20 +8498,34 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "Inflector", - "proc-macro-crate 1.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn", ] +[[package]] +name = "sp-sandbox" +version = "0.10.0-dev" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +dependencies = [ + "log", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-std", + "sp-wasm-interface", + "wasmi", +] + [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "serde", "serde_json", @@ -8430,7 +8534,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -8444,7 +8548,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "scale-info", @@ -8454,14 +8558,14 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "0.12.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -8471,19 +8575,18 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-db", "trie-root", ] [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" [[package]] name = "sp-storage" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8496,7 +8599,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "log", "sp-core", @@ -8509,7 +8612,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "futures-timer", @@ -8524,8 +8627,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "sp-std", @@ -8537,7 +8640,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "sp-api", "sp-runtime", @@ -8546,7 +8649,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "async-trait", "log", @@ -8561,8 +8664,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "hash-db", "memory-db", @@ -8570,20 +8673,22 @@ dependencies = [ "scale-info", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "5.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", + "sp-core-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -8593,7 +8698,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8603,8 +8708,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +version = "6.0.0" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "impl-trait-for-tuples", "log", @@ -8622,11 +8727,12 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.12.0" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" +checksum = "5b3522333512d68c1a4793f4f1109354a2b56d935b19fee6929d204a120b3673" dependencies = [ "Inflector", + "num-format", "proc-macro2", "quote", "serde", @@ -8703,7 +8809,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "platforms", ] @@ -8711,18 +8817,17 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "futures 0.3.21", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -8733,9 +8838,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -8747,7 +8851,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "ansi_term", "build-helper", @@ -8768,72 +8872,72 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.17.0" -source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-02#42166f6bc3762e8e4aa873542f0d3f59c119fb49" +version = "0.22.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" dependencies = [ - "async-trait", - "bitvec 0.20.4", - "chameleon", + "bitvec 1.0.1", "derivative", "frame-metadata", - "futures 0.3.19", + "futures 0.3.21", "hex", - "jsonrpsee 0.8.0 (git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02)", - "log", - "num-traits", + "jsonrpsee 0.14.0", "parity-scale-codec", + "parking_lot 0.12.0", "scale-info", "serde", "serde_json", "sp-core", "sp-runtime", - "sp-version", "subxt-macro", + "subxt-metadata", "thiserror", + "tracing", ] [[package]] name = "subxt-codegen" -version = "0.17.0" -source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-02#42166f6bc3762e8e4aa873542f0d3f59c119fb49" +version = "0.22.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" dependencies = [ - "async-trait", "darling", "frame-metadata", - "heck 0.3.3", + "heck 0.4.0", "parity-scale-codec", - "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2", "quote", "scale-info", + "subxt-metadata", "syn", ] [[package]] name = "subxt-macro" -version = "0.17.0" -source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-02#42166f6bc3762e8e4aa873542f0d3f59c119fb49" +version = "0.22.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" dependencies = [ - "async-trait", "darling", - "frame-metadata", - "heck 0.3.3", - "parity-scale-codec", - "proc-macro-crate 0.1.5", "proc-macro-error", - "proc-macro2", - "quote", - "scale-info", "subxt-codegen", "syn", ] +[[package]] +name = "subxt-metadata" +version = "0.22.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" +dependencies = [ + "frame-metadata", + "parity-scale-codec", + "scale-info", + "sp-core", +] + [[package]] name = "syn" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", @@ -8885,6 +8989,27 @@ dependencies = [ "syn", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -8965,6 +9090,12 @@ dependencies = [ "syn", ] +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + [[package]] name = "thread_local" version = "1.1.3" @@ -8983,6 +9114,17 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.3+5.2.1-patched.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "time" version = "0.1.44" @@ -9013,15 +9155,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.3.1" @@ -9039,18 +9172,21 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.15.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ - "bytes 1.1.0", + "autocfg", + "bytes", "libc", "memchr", - "mio 0.7.14", + "mio 0.8.4", "num_cpus", "once_cell", + "parking_lot 0.12.0", "pin-project-lite 0.2.7", "signal-hook-registry", + "socket2", "tokio-macros", "winapi 0.3.9", ] @@ -9076,50 +9212,41 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" dependencies = [ - "rustls 0.20.2", + "rustls", "tokio", - "webpki 0.22.0", + "webpki", ] [[package]] -name = "tokio-stream" -version = "0.1.8" +name = "tokio-util" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ + "bytes", "futures-core", + "futures-sink", + "log", "pin-project-lite 0.2.7", "tokio", ] [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", "futures-io", "futures-sink", - "log", "pin-project-lite 0.2.7", "tokio", ] @@ -9141,9 +9268,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.7", @@ -9153,9 +9280,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -9164,11 +9291,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -9177,18 +9305,20 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project", + "pin-project 1.0.10", "tracing", ] [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "ahash", "lazy_static", "log", + "lru", "tracing-core", ] @@ -9227,12 +9357,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa" +checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.12.2", "log", "rustc-hex", "smallvec", @@ -9240,18 +9370,18 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd" +checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ "hash-db", ] [[package]] name = "trust-dns-proto" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -9260,7 +9390,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna", "ipnet", "lazy_static", "log", @@ -9268,14 +9398,14 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "url 2.2.2", + "url", ] [[package]] name = "trust-dns-resolver" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -9283,7 +9413,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "resolv-conf", "smallvec", "thiserror", @@ -9299,10 +9429,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#80f060dfad0363af03dbecbe39c6fa9b99042acc" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" dependencies = [ "clap", - "jsonrpsee 0.4.1", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "remote-externalities", @@ -9333,7 +9463,8 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", + "digest 0.10.3", "rand 0.8.4", "static_assertions", ] @@ -9351,9 +9482,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" @@ -9388,6 +9519,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -9436,30 +9573,12 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" - -[[package]] -name = "unsigned-varint" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" -dependencies = [ - "asynchronous-codec 0.5.0", - "bytes 1.1.0", - "futures-io", - "futures-util", -] - -[[package]] -name = "unsigned-varint" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f" +checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "futures-io", "futures-util", ] @@ -9470,17 +9589,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.2.2" @@ -9488,9 +9596,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna", "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -9503,6 +9611,12 @@ dependencies = [ "log", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" version = "1.0.0-alpha.9" @@ -9576,6 +9690,12 @@ 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.76" @@ -9668,7 +9788,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -9685,6 +9805,7 @@ checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" dependencies = [ "downcast-rs", "libc", + "libm", "memory_units", "num-rational 0.2.4", "num-traits", @@ -9703,31 +9824,30 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.81.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" +checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wasmtime" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c724da92e39a85d2231d4c2a942c8be295211441dbca581c6c3f3f45a9f00" +checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" dependencies = [ "anyhow", "backtrace", "bincode", "cfg-if 1.0.0", - "cpp_demangle", "indexmap", "lazy_static", "libc", "log", - "object", + "object 0.27.1", + "once_cell", "paste", "psm", "rayon", "region", - "rustc-demangle", "serde", "target-lexicon", "wasmparser", @@ -9741,9 +9861,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4439d99100298344567c0eb6916ad5864e99e54760b8177c427e529077fb30" +checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" dependencies = [ "anyhow", "base64", @@ -9761,9 +9881,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1762765dd69245f00e5d9783b695039e449a7be0f9c5383e4c78465dd6131aeb" +checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" dependencies = [ "anyhow", "cranelift-codegen", @@ -9774,7 +9894,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object", + "object 0.27.1", "target-lexicon", "thiserror", "wasmparser", @@ -9783,9 +9903,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4468301d95ec71710bb6261382efe27d1296447711645e3dbabaea6e4de3504" +checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" dependencies = [ "anyhow", "cranelift-entity", @@ -9793,7 +9913,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object", + "object 0.27.1", "serde", "target-lexicon", "thiserror", @@ -9803,41 +9923,56 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0ae6e581ff014b470ec35847ea3c0b4c3ace89a55df5a04c802a11f4574e7d" +checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" dependencies = [ "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", + "cpp_demangle", "gimli", - "object", + "log", + "object 0.27.1", "region", + "rustc-demangle", "rustix", "serde", "target-lexicon", "thiserror", "wasmtime-environ", + "wasmtime-jit-debug", "wasmtime-runtime", "winapi 0.3.9", ] +[[package]] +name = "wasmtime-jit-debug" +version = "0.35.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" +dependencies = [ + "lazy_static", + "object 0.27.1", + "rustix", +] + [[package]] name = "wasmtime-runtime" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9c28877ae37a367cda7b52b8887589816152e95dde9b7c80cc686f52761961" +checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" dependencies = [ "anyhow", "backtrace", "cc", "cfg-if 1.0.0", "indexmap", - "lazy_static", "libc", "log", "mach", + "memfd", "memoffset", "more-asserts", "rand 0.8.4", @@ -9845,14 +9980,15 @@ dependencies = [ "rustix", "thiserror", "wasmtime-environ", + "wasmtime-jit-debug", "winapi 0.3.9", ] [[package]] name = "wasmtime-types" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395726e8f5dd8c57cb0db445627b842343f7e29ed7489467fdf7953ed9d3cd4f" +checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" dependencies = [ "cranelift-entity", "serde", @@ -9870,16 +10006,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -9890,22 +10016,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] @@ -9930,9 +10047,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -9977,43 +10094,86 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + [[package]] name = "windows-sys" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "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", ] +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -10022,9 +10182,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winreg" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ "winapi 0.3.9", ] @@ -10054,6 +10214,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +[[package]] +name = "wyz" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] + [[package]] name = "x25519-dalek" version = "1.1.1" @@ -10089,14 +10258,14 @@ dependencies = [ [[package]] name = "yamux" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" +checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.8.4", "static_assertions", ] @@ -10124,18 +10293,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.10.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "4.1.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" dependencies = [ "libc", "zstd-sys", @@ -10143,9 +10312,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index ae17782bb5ae07e5992e8bfdadae227bf9dd0209..d6ddf72f3984686bf5c16d07f08ce5e3b521f074 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ authors = ['Axiom-Team Developers <https://axiom-team.fr>'] build = 'node/build.rs' description = 'Crypto-currency software (based on Substrate framework) to operate Äž1 libre currency' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'duniter' @@ -40,16 +40,16 @@ try-runtime = [ [build-dependencies] clap = { version = "3.0" } #clap_complete = { version = "3.0" } -substrate-build-script-utils = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } +substrate-build-script-utils = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } [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/librelois/substrate.git", branch = "duniter-monthly-2022-02", features = ["wasmtime"] } -sc-service = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02", features = ["wasmtime"] } -sp-trie = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02", features = ["memory-tracker"] } +sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23", features = ["wasmtime"] } +sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23", features = ["wasmtime"] } +sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23", features = ["memory-tracker"] } [dependencies] @@ -67,56 +67,59 @@ clap = { version = "3.0", features = ["derive"] } clap_complete = { version = "3" } futures = { version = "0.3.1", features = ["compat"] } hex = "0.4.3" -jsonrpc-core = '18.0.0' +jsonrpsee = { version = "0.13.0", 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.26" # substrate dependencies -frame-benchmarking = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -frame-benchmarking-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -pallet-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -pallet-transaction-payment-rpc = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-basic-authorship = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-chain-spec = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-client-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-consensus = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -babe = { package = "sc-consensus-babe", git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -manual-seal = { package = "sc-consensus-manual-seal", git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-consensus-uncles = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-executor = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-finality-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-keystore = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-network = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-rpc-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-service = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-telemetry = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-transaction-pool = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sc-transaction-pool-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-authority-discovery = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-block-builder = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-blockchain = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-consensus = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-consensus-babe = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-core = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-finality-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-io = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-offchain = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-keyring = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-keystore = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-runtime = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-session = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-storage = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-timestamp = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-transaction-pool = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -sp-trie = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -substrate-frame-rpc-system = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -try-runtime-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02", optional = true } +frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +frame-benchmarking-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +pallet-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +pallet-transaction-payment-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-basic-authorship = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-chain-spec = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-client-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +babe = { package = "sc-consensus-babe", git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +manual-seal = { package = "sc-consensus-manual-seal", git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-consensus-uncles = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-executor = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-finality-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-network = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-rpc-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-telemetry = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sc-transaction-pool-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-authority-discovery = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-block-builder = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-blockchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-consensus-babe = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-core = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-finality-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-inherents = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-io = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-offchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-runtime = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-session = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-storage = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-timestamp = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +substrate-frame-rpc-system = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +try-runtime-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23", optional = true } [workspace] resolver = "2" @@ -203,4 +206,4 @@ panic = "unwind" [patch.crates-io] # rw-stream-sink has not been updated for 2 years and uses a too old version of pin-project (v0.4.28) # For the project to compile, we have to patch this dependency to force the use of pin-project v1.x -rw-stream-sink = { git = "https://github.com/librelois/rw-stream-sink", branch = "master" } +#rw-stream-sink = { git = "https://github.com/librelois/rw-stream-sink", branch = "master" } diff --git a/docker/cross-arm.Dockerfile b/docker/cross-arm.Dockerfile index 930c58d40ebee3626a169b7928faf5fe01800738..06e9303ac8d02d91478954259a3a52624a958795 100644 --- a/docker/cross-arm.Dockerfile +++ b/docker/cross-arm.Dockerfile @@ -15,12 +15,12 @@ RUN dpkg --add-architecture armhf && \ libssl-dev:armhf # Install nightly with armv7 and w32-u-u -RUN rustup install nightly-2021-11-12-x86_64-unknown-linux-gnu && \ +RUN rustup install nightly-2022-04-20-x86_64-unknown-linux-gnu && \ rustup target add armv7-unknown-linux-gnueabihf --toolchain \ - nightly-2021-11-12-x86_64-unknown-linux-gnu && \ + nightly-2022-04-20-x86_64-unknown-linux-gnu && \ rustup target add wasm32-unknown-unknown --toolchain \ - nightly-2021-11-12-x86_64-unknown-linux-gnu && \ - cargo +nightly-2021-11-12-x86_64-unknown-linux-gnu install --git \ + nightly-2022-04-20-x86_64-unknown-linux-gnu && \ + cargo +nightly-2022-04-20-x86_64-unknown-linux-gnu install --git \ https://github.com/alexcrichton/wasm-gc --force ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER arm-linux-gnueabihf-gcc diff --git a/docs/dev/weights-benchmarking.md b/docs/dev/weights-benchmarking.md index 0b6e127c65d577d5de11907fae07da4de03865e8..6f7f3358edfd450701334d106495822e0676bacd 100644 --- a/docs/dev/weights-benchmarking.md +++ b/docs/dev/weights-benchmarking.md @@ -7,7 +7,7 @@ complete real example. 3. If the benchmark tests compiles and pass, compile the binary with benchmarks on your local machine: `cargo build --release --features runtime-benchmarks` 4. Run the benchmarks on your local machine (to test if it work mith a real runtime). The command -is: `duniter benchmark --chain=CURRENCY-dev --steps=50 --repeat=20 --pallet=pallet_universal_dividend --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=.` +is: `duniter benchmark pallet --chain=CURRENCY-dev --steps=50 --repeat=20 --pallet=pallet_universal_dividend --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --header=./file_header.txt --output=.` 5. If it work, use the generated file content to create or update the `WeightInfo` trait and the `()` dummy implementation. Then use the `WeightInfo` tarit in the real code of the pallet. See 79e0fd4bf3b0579279fc957da5e2fdfc6d8a17fa for a complete real example. 6. Redo steps `3.` and `4.` on the reference machine. diff --git a/end2end-tests/Cargo.toml b/end2end-tests/Cargo.toml index 09aae7a4982bc07e83eeeddca11c4e293a1d40e1..952d63bdb844154d9b2517a287e8990142402541 100644 --- a/end2end-tests/Cargo.toml +++ b/end2end-tests/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] description = 'duniter end2end tests.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'duniter-end2end-tests' @@ -16,11 +16,11 @@ ctrlc = "3.2.2" cucumber = "0.11" env_logger = "0.9.0" notify = "4.0" -parity-scale-codec = "2.3.1" +parity-scale-codec = "3.1.5" portpicker = "0.1.1" serde_json = "1.0.64" -sp-keyring = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } -subxt = { git = 'https://github.com/librelois/subxt.git', branch = 'duniter-monthly-2022-02' } +sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.23" } +subxt = { git = 'https://github.com/duniter/subxt.git', branch = 'duniter-substrate-v0.9.23' } tokio = { version = "1.15.0", features = ["macros"] } [[test]] diff --git a/end2end-tests/tests/common/balances.rs b/end2end-tests/tests/common/balances.rs index 781abf549e229cb28f20a18c387e60e4ad80ed46..c39ca91dd7a2204c535c8969906da64f2d499e84 100644 --- a/end2end-tests/tests/common/balances.rs +++ b/end2end-tests/tests/common/balances.rs @@ -36,8 +36,11 @@ pub async fn set_balance( new_free: amount, new_reserved: 0, }, - )) - .create_signed(&PairSigner::new(SUDO_ACCOUNT.pair()), ()) + ))? + .create_signed( + &PairSigner::new(SUDO_ACCOUNT.pair()), + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; @@ -59,8 +62,8 @@ pub async fn transfer( client, api.tx() .balances() - .transfer(to.clone().into(), amount) - .create_signed(&from, ()) + .transfer(to.clone().into(), amount)? + .create_signed(&from, BaseExtrinsicParamsBuilder::new()) .await?, ) .await?; @@ -81,8 +84,8 @@ pub async fn transfer_all( client, api.tx() .balances() - .transfer_all(to.clone().into(), false) - .create_signed(&from, ()) + .transfer_all(to.clone().into(), false)? + .create_signed(&from, BaseExtrinsicParamsBuilder::new()) .await?, ) .await?; @@ -104,8 +107,8 @@ pub async fn transfer_ud( client, api.tx() .universal_dividend() - .transfer_ud(to.clone().into(), amount) - .create_signed(&from, ()) + .transfer_ud(to.clone().into(), amount)? + .create_signed(&from, BaseExtrinsicParamsBuilder::new()) .await?, ) .await?; diff --git a/end2end-tests/tests/common/cert.rs b/end2end-tests/tests/common/cert.rs index 6e1a363be9c512faabc9ab4efe6e09cb1b9ff45a..a686cd8998731fb5d30f5c70fca3d00cbbb5c7ac 100644 --- a/end2end-tests/tests/common/cert.rs +++ b/end2end-tests/tests/common/cert.rs @@ -18,7 +18,7 @@ use super::node_runtime::runtime_types::gdev_runtime; use super::node_runtime::runtime_types::pallet_certification; use super::*; use sp_keyring::AccountKeyring; -use subxt::{sp_runtime::MultiAddress, PairSigner, Signer}; +use subxt::{sp_runtime::MultiAddress, PairSigner}; pub async fn certify( api: &Api, @@ -33,13 +33,13 @@ pub async fn certify( let issuer_index = api .storage() .identity() - .identity_index_of(from, None) + .identity_index_of(&from, None) .await? .unwrap(); let receiver_index = api .storage() .identity() - .identity_index_of(to, None) + .identity_index_of(&to, None) .await? .unwrap(); @@ -47,8 +47,8 @@ pub async fn certify( client, api.tx() .cert() - .add_cert(issuer_index, receiver_index) - .create_signed(&signer, ()) + .add_cert(issuer_index, receiver_index)? + .create_signed(&signer, BaseExtrinsicParamsBuilder::new()) .await?, ) .await?; diff --git a/end2end-tests/tests/common/mod.rs b/end2end-tests/tests/common/mod.rs index c3d53e9d6b1010f2dee2977c781dec2c97fcf3bc..56317abf66a6b6f4e2265204f78dae385bffcf81 100644 --- a/end2end-tests/tests/common/mod.rs +++ b/end2end-tests/tests/common/mod.rs @@ -23,6 +23,7 @@ pub mod cert; pub mod node_runtime {} use anyhow::anyhow; +use parity_scale_codec::Encode; use serde_json::Value; use sp_keyring::AccountKeyring; use std::io::prelude::*; @@ -30,13 +31,40 @@ use std::path::PathBuf; use std::process::Command; use std::str::FromStr; use subxt::rpc::{rpc_params, ClientT, SubscriptionClientT}; -use subxt::{ClientBuilder, DefaultConfig, DefaultExtra}; +use subxt::{extrinsic::BaseExtrinsicParamsBuilder, ClientBuilder, DefaultConfig}; -pub type Api = node_runtime::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>; +pub type Api = node_runtime::RuntimeApi<DefaultConfig, BaseExtrinsicParams<DefaultConfig>>; +type BaseExtrinsicParams<T> = subxt::extrinsic::BaseExtrinsicParams<T, Tip>; pub type Client = subxt::Client<DefaultConfig>; +pub type Event = node_runtime::Event; pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>; +pub type SignedSubmittableExtrinsic<'client> = subxt::SignedSubmittableExtrinsic< + 'client, + DefaultConfig, + BaseExtrinsicParams<DefaultConfig>, + node_runtime::DispatchError, + Event, +>; pub type TransactionProgress<'client> = - subxt::TransactionProgress<'client, DefaultConfig, node_runtime::DispatchError>; + subxt::TransactionProgress<'client, DefaultConfig, node_runtime::DispatchError, Event>; + +#[derive(Copy, Clone, Debug, Default, Encode)] +pub struct Tip { + #[codec(compact)] + tip: u64, +} + +impl Tip { + pub fn new(amount: u64) -> Self { + Tip { tip: amount } + } +} + +impl From<u64> for Tip { + fn from(n: u64) -> Self { + Self::new(n) + } +} pub const SUDO_ACCOUNT: AccountKeyring = AccountKeyring::Alice; @@ -98,14 +126,15 @@ pub async fn create_empty_block(client: &Client) -> Result<()> { pub async fn create_block_with_extrinsic( client: &Client, - extrinsic: subxt::UncheckedExtrinsic<DefaultConfig, DefaultExtra<DefaultConfig>>, -) -> Result<subxt::TransactionEvents<DefaultConfig>> { - // Get a hash of the extrinsic (we'll need this later). + extrinsic: SignedSubmittableExtrinsic<'_>, +) -> Result<subxt::TransactionEvents<DefaultConfig, Event>> { + /*// Get a hash of the extrinsic (we'll need this later). use subxt::sp_runtime::traits::Hash as _; - let ext_hash = <DefaultConfig as subxt::Config>::Hashing::hash_of(&extrinsic); + let ext_hash = <DefaultConfig as subxt::Config>::Hashing::hash_of(&encoded_extrinsic); // Submit and watch for transaction progress. - let sub = client.rpc().watch_extrinsic(extrinsic).await?; - let watcher = TransactionProgress::new(sub, client, ext_hash); + let sub = client.rpc().submit_extrinsic(encoded_extrinsic).await?; + let watcher = TransactionProgress::new(sub, client, ext_hash);*/ + let watcher = extrinsic.submit_and_watch().await?; // Create a non-empty block let _: Value = client diff --git a/end2end-tests/tests/cucumber_tests.rs b/end2end-tests/tests/cucumber_tests.rs index dbe9e4cc8cce4dbe243fa59a9120824eab946ed5..265b782956af207df08e1768c147c0ff565cb6b8 100644 --- a/end2end-tests/tests/cucumber_tests.rs +++ b/end2end-tests/tests/cucumber_tests.rs @@ -214,7 +214,7 @@ async fn should_have( .to_account_id(); let (amount, _is_ud) = parse_amount(amount, &unit); - let who_account = world.api().storage().system().account(who, None).await?; + let who_account = world.api().storage().system().account(&who, None).await?; assert_eq!(who_account.data.free, amount); Ok(()) } @@ -267,14 +267,14 @@ async fn should_be_certified_by( .api() .storage() .identity() - .identity_index_of(issuer_account, None) + .identity_index_of(&issuer_account, None) .await? .unwrap(); let receiver_index = world .api() .storage() .identity() - .identity_index_of(receiver_account, None) + .identity_index_of(&receiver_account, None) .await? .unwrap(); @@ -282,7 +282,7 @@ async fn should_be_certified_by( .api() .storage() .cert() - .certs_by_receiver(receiver_index, None) + .certs_by_receiver(&receiver_index, None) .await?; match issuers.binary_search_by(|(issuer_, _)| issuer_index.cmp(issuer_)) { @@ -362,12 +362,12 @@ async fn main() { fn genesis_conf_name(feature_tags: &[String], scenario_tags: &[String]) -> String { for tag in scenario_tags { - if let Some(("genesis", conf_name)) = tag.split_once(".") { + if let Some(("genesis", conf_name)) = tag.split_once('.') { return conf_name.to_owned(); } } for tag in feature_tags { - if let Some(("genesis", conf_name)) = tag.split_once(".") { + if let Some(("genesis", conf_name)) = tag.split_once('.') { return conf_name.to_owned(); } } diff --git a/live-tests/Cargo.toml b/live-tests/Cargo.toml index 275d3e3d6f1cbfb613c45c2676183d406ac10fb0..46484cc82e79568c9a09da6f60e6bf1784248bed 100644 --- a/live-tests/Cargo.toml +++ b/live-tests/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] description = 'duniter live tests.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'duniter-live-tests' @@ -11,7 +11,7 @@ version = '3.0.0' [dev-dependencies] anyhow = "1.0" hex-literal = "0.3" -parity-scale-codec = "2.3.1" -sp-core = { git = 'https://github.com/librelois/substrate', branch = 'duniter-monthly-2022-02' } -subxt = { git = 'https://github.com/librelois/subxt', branch = 'duniter-monthly-2022-02' } +parity-scale-codec = "3.1.5" +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +subxt = { git = 'https://github.com/duniter/subxt', branch = 'duniter-substrate-v0.9.23' } tokio = { version = "1.15.0", features = ["macros"] } diff --git a/live-tests/tests/sanity_gdev.rs b/live-tests/tests/sanity_gdev.rs index 115eeadda9c9ce9d09c7bb18986e370370029852..6ea2b38acbb30b81ea833578433a9984a5abe71e 100644 --- a/live-tests/tests/sanity_gdev.rs +++ b/live-tests/tests/sanity_gdev.rs @@ -21,14 +21,15 @@ use hex_literal::hex; use sp_core::crypto::AccountId32; use sp_core::{blake2_128, ByteArray, H256}; use std::collections::HashMap; -use subxt::{ClientBuilder, DefaultConfig, DefaultExtra}; +use subxt::{extrinsic::PlainTip, ClientBuilder, DefaultConfig}; const DEFAULT_ENDPOINT: &str = "wss://gdev.librelois.fr:443/ws"; const TREASURY_ACCOUNT_ID: [u8; 32] = hex!("6d6f646c70792f74727372790000000000000000000000000000000000000000"); -type Api = gdev_runtime::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>; +type Api = gdev_runtime::RuntimeApi<DefaultConfig, BaseExtrinsicParams<DefaultConfig>>; +type BaseExtrinsicParams<T> = subxt::extrinsic::BaseExtrinsicParams<T, PlainTip>; type Client = subxt::Client<DefaultConfig>; // define gdev basic types diff --git a/node/src/cli.rs b/node/src/cli.rs index fb3d99a4ac782d0cc80af8902f22cfd12d81a02c..a93bb6b8565d124152eefb01f21dd54003ae4097 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -72,8 +72,9 @@ pub enum Subcommand { /// Generate completion for various shell interpreters Completion(Completion), - /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + /// Sub-commands concerned with benchmarking. + /// The pallet benchmarking moved to the `pallet` sub-command. + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some command against runtime state. diff --git a/node/src/command.rs b/node/src/command.rs index 750a3c0eb579bd11f27439b630173b3896ed635d..023b45a71cd111021290749e3afced3e5229b1ef 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -28,8 +28,38 @@ use crate::service::GTestExecutor; use crate::service::{IdentifyRuntimeType, RuntimeType}; use crate::{chain_spec, service}; use clap::CommandFactory; +use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli}; +// TODO: create our own reference hardware +/* +lazy_static! { + /// The hardware requirements as measured on reference hardware. + pub static ref REFERENCE_HARDWARE: Requirements = { + let raw = include_bytes!("reference_hardware.json").as_slice(); + serde_json::from_slice(raw).expect("Hardcoded data is known good; qed") + }; +}*/ + +/// Unwraps a [`crate::client::Client`] into the concrete runtime client. +macro_rules! unwrap_client { + ( + $client:ident, + $code:expr + ) => { + match $client.as_ref() { + #[cfg(feature = "g1")] + crate::service::client::Client::G1($client) => $code, + #[cfg(feature = "gtest")] + crate::service::client::Client::GTest($client) => $code, + #[cfg(feature = "gdev")] + crate::service::client::Client::GDev($client) => $code, + #[allow(unreachable_patterns)] + _ => panic!("unknown runtime"), + } + }; +} + impl SubstrateCli for Cli { fn impl_name() -> String { "Duniter".into() @@ -99,8 +129,7 @@ impl SubstrateCli for Cli { let starts_with = |prefix: &str| { path.file_name() - .map(|f| f.to_str().map(|s| s.starts_with(&prefix))) - .flatten() + .and_then(|f| f.to_str().map(|s| s.starts_with(&prefix))) .unwrap_or(false) }; @@ -229,7 +258,10 @@ pub fn run() -> sc_cli::Result<()> { runner.async_run(|mut config| { let (client, backend, _, task_manager) = service::new_chain_ops(&mut config, cli.sealing.is_manual_consensus())?; - Ok((cmd.run(client, backend), task_manager)) + let aux_revert = Box::new(|client, backend, blocks| { + service::revert_backend(client, backend, blocks) + }); + Ok((cmd.run(client, backend, Some(aux_revert)), task_manager)) }) } Some(Subcommand::Sign(cmd)) => cmd.run(), @@ -247,27 +279,64 @@ pub fn run() -> sc_cli::Result<()> { Ok(()) } Some(Subcommand::Benchmark(cmd)) => { - if cfg!(feature = "runtime-benchmarks") { - let runner = cli.create_runner(cmd)?; - let chain_spec = &runner.config().chain_spec; + let runner = cli.create_runner(cmd)?; + let chain_spec = &runner.config().chain_spec; - match chain_spec.runtime_type() { - #[cfg(feature = "g1")] - RuntimeType::G1 => { - runner.sync_run(|config| cmd.run::<g1_runtime::Block, G1Executor>(config)) + 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(); + let storage = backend.expose_storage(); + + unwrap_client!(client, cmd.run(config, client.clone(), db, storage)) + }), + BenchmarkCmd::Block(cmd) => runner.sync_run(|mut config| { + let (client, _, _, _) = service::new_chain_ops(&mut config, false)?; + + unwrap_client!(client, cmd.run(client.clone())) + }), + BenchmarkCmd::Overhead(cmd) => runner.sync_run(|mut config| { + let (client, _, _, _) = service::new_chain_ops(&mut config, false)?; + let wrapped = client.clone(); + + let inherent_data = crate::service::client::benchmark_inherent_data() + .map_err(|e| format!("generating inherent data: {:?}", e))?; + + unwrap_client!( + client, + cmd.run(config, client.clone(), inherent_data, wrapped) + ) + }), + BenchmarkCmd::Pallet(cmd) => { + if cfg!(feature = "runtime-benchmarks") { + match chain_spec.runtime_type() { + #[cfg(feature = "g1")] + RuntimeType::G1 => runner.sync_run(|config| { + cmd.run::<g1_runtime::Block, G1Executor>(config) + }), + #[cfg(feature = "gtest")] + RuntimeType::GTest => runner.sync_run(|config| { + cmd.run::<gtest_runtime::Block, GTestExecutor>(config) + }), + #[cfg(feature = "gdev")] + RuntimeType::GDev => runner.sync_run(|config| { + cmd.run::<gdev_runtime::Block, GDevExecutor>(config) + }), + _ => Err(sc_cli::Error::Application("unknown runtime type".into())), + } + } else { + Err("Benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`." + .into()) } - #[cfg(feature = "gtest")] - RuntimeType::GTest => runner - .sync_run(|config| cmd.run::<gtest_runtime::Block, GTestExecutor>(config)), - #[cfg(feature = "gdev")] - RuntimeType::GDev => runner - .sync_run(|config| cmd.run::<gdev_runtime::Block, GDevExecutor>(config)), - _ => Err(sc_cli::Error::Application("unknown runtime type".into())), } - } else { - Err("Benchmarking wasn't enabled when building the node. \ - You can enable it with `--features runtime-benchmarks`." - .into()) + BenchmarkCmd::Machine(cmd) => { + runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())) + } + // NOTE: this allows the Duniter client to leniently implement + // new benchmark commands. + #[allow(unreachable_patterns)] + _ => panic!("unknown runtime"), } } #[cfg(feature = "try-runtime")] diff --git a/node/src/rpc.rs b/node/src/rpc.rs index f831299c31b638d687f0582887fd8dd694afed61..df13e51e20de213ca4bafa517b4d4869ef9ae817 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -25,7 +25,7 @@ pub use sc_rpc_api::DenyUnsafe; use common_runtime::Block; use common_runtime::{AccountId, Balance, Index}; -use manual_seal::rpc::{ManualSeal, ManualSealApi}; +use jsonrpsee::RpcModule; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; @@ -48,7 +48,7 @@ pub struct FullDeps<C, P> { /// Instantiate all full RPC extensions. pub fn create_full<C, P>( deps: FullDeps<C, P>, -) -> Result<jsonrpc_core::IoHandler<sc_rpc_api::Metadata>, Box<dyn std::error::Error + Send + Sync>> +) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>> where C: ProvideRuntimeApi<Block>, C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static, @@ -58,10 +58,11 @@ where C::Api: BlockBuilder<Block>, P: TransactionPool + 'static, { - use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; - use substrate_frame_rpc_system::{FullSystem, SystemApi}; + use manual_seal::rpc::{ManualSeal, ManualSealApiServer}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; + use substrate_frame_rpc_system::{System, SystemApiServer}; - let mut io = jsonrpc_core::IoHandler::default(); + let mut module = RpcModule::new(()); let FullDeps { client, pool, @@ -69,28 +70,19 @@ where command_sink_opt, } = deps; - io.extend_with(SystemApi::to_delegate(FullSystem::new( - client.clone(), - pool, - deny_unsafe, - ))); - - io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( - client, - ))); + 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 { - io.extend_with( - // We provide the rpc handler with the sending end of the channel to allow the rpc - // send EngineCommands to the background block authorship task. - ManualSealApi::to_delegate(ManualSeal::new(command_sink)), - ); + // We provide the rpc handler with the sending end of the channel to allow the rpc + // send EngineCommands to the background block authorship task. + module.merge(ManualSeal::new(command_sink).into_rpc())?; }; // Extend this RPC with a custom API by using the following syntax. // `YourRpcStruct` should have a reference to a client, which is needed // to call into the runtime. - // `io.extend_with(YourRpcTrait::to_delegate(YourRpcStruct::new(ReferenceToClient, ...)));` + // `module.merge(YourRpcTrait::into_rpc(YourRpcStruct::new(ReferenceToClient, ...)))?;` - Ok(io) + Ok(module) } diff --git a/node/src/service.rs b/node/src/service.rs index d3d68763b2c1cd8ecea7bfcfb21b285eb3c9eb59..ca6d2cd1e62cd625ee7f83462a96fac70c4bf709 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -16,9 +16,9 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. -mod client; +pub mod client; -use self::client::{Client, RuntimeApiCollection}; +use self::client::{Client, ClientHandle, RuntimeApiCollection}; use async_io::Timer; use common_runtime::Block; use futures::{Stream, StreamExt}; @@ -314,7 +314,7 @@ where let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); @@ -512,7 +512,7 @@ where ) .map_err(|err| format!("{:?}", err))?; let babe = sp_consensus_babe::inherents::InherentDataProvider::new( - timestamp.slot().into(), + timestamp.slot(), ); Ok((timestamp, babe)) } @@ -545,7 +545,7 @@ where let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = - sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_duration( + sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); @@ -605,7 +605,7 @@ where keystore: keystore_container.sync_keystore(), task_manager: &mut task_manager, transaction_pool, - rpc_extensions_builder, + rpc_builder: rpc_extensions_builder, backend, system_rpc_tx, config, @@ -664,3 +664,41 @@ where Ok(task_manager) } + +/// Reverts the node state down to at most the last finalized block. +/// +/// In particular this reverts: +/// - Low level Babe and Grandpa consensus data. +pub fn revert_backend( + client: Arc<Client>, + backend: Arc<FullBackend>, + blocks: common_runtime::BlockNumber, +) -> sc_cli::Result<()> { + // Revert Substrate consensus related components + client.execute_with(RevertConsensus { blocks, backend })?; + Ok(()) +} + +pub(super) struct RevertConsensus { + blocks: common_runtime::BlockNumber, + backend: Arc<FullBackend>, +} + +impl client::ExecuteWithClient for RevertConsensus { + type Output = sp_blockchain::Result<()>; + + fn execute_with_client<Client, Api, Backend>(self, client: Arc<Client>) -> Self::Output + where + <Api as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>, + Backend: sc_client_api::Backend<Block> + 'static, + Backend::State: sp_api::StateBackend<BlakeTwo256>, + Api: RuntimeApiCollection<StateBackend = Backend::State>, + Client: client::AbstractClient<Block, Backend, Api = Api> + 'static, + { + // 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)?; + Ok(()) + } +} diff --git a/node/src/service/client.rs b/node/src/service/client.rs index da65a799118cb6747b70b162ede2dff23ae9ef29..dd8023e053a849d5a83459a77db13c291daabd14 100644 --- a/node/src/service/client.rs +++ b/node/src/service/client.rs @@ -15,8 +15,9 @@ // along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>. use common_runtime::{AccountId, Balance, Block, BlockNumber, Hash, Header, Index}; -use sc_client_api::KeyIterator; -use sp_api::NumberFor; +use sc_client_api::{AuxStore, Backend as BackendT, BlockchainEvents, KeyIterator, UsageProvider}; +use sp_api::{CallApiAt, NumberFor, ProvideRuntimeApi}; +use sp_blockchain::{HeaderBackend, HeaderMetadata}; use sp_consensus::BlockStatus; use sp_runtime::{ generic::{BlockId, SignedBlock}, @@ -26,6 +27,122 @@ use sp_runtime::{ use sp_storage::{ChildInfo, StorageData, StorageKey}; use std::sync::Arc; +/// Trait that abstracts over all available client implementations. +/// +/// For a concrete type there exists [`Client`]. +pub trait AbstractClient<Block, Backend>: + BlockchainEvents<Block> + + Sized + + Send + + Sync + + ProvideRuntimeApi<Block> + + HeaderBackend<Block> + + CallApiAt<Block, StateBackend = Backend::State> + + AuxStore + + UsageProvider<Block> + + HeaderMetadata<Block, Error = sp_blockchain::Error> +where + Block: BlockT, + Backend: BackendT<Block>, + Backend::State: sp_api::StateBackend<BlakeTwo256>, + Self::Api: RuntimeApiCollection<StateBackend = Backend::State>, +{ +} + +impl<Block, Backend, Client> AbstractClient<Block, Backend> for Client +where + Block: BlockT, + Backend: BackendT<Block>, + Backend::State: sp_api::StateBackend<BlakeTwo256>, + Client: BlockchainEvents<Block> + + ProvideRuntimeApi<Block> + + HeaderBackend<Block> + + AuxStore + + UsageProvider<Block> + + Sized + + Send + + Sync + + CallApiAt<Block, StateBackend = Backend::State> + + HeaderMetadata<Block, Error = sp_blockchain::Error>, + Client::Api: RuntimeApiCollection<StateBackend = Backend::State>, +{ +} + +/// A handle to a client instance. +/// +/// The service supports multiple different runtimes (gtest, g1 itself, etc). As each runtime has a +/// specialized client, we need to hide them behind a trait. This is this trait. +/// +/// When wanting to work with the inner client, you need to use `execute_with`. +/// +/// See [`ExecuteWithClient`](trait.ExecuteWithClient.html) for more information. +pub trait ClientHandle { + /// Execute the given something with the client. + fn execute_with<T: ExecuteWithClient>(&self, t: T) -> T::Output; +} + +/// Execute something with the client instance. +/// +/// As there exist multiple chains, like g1 itself, gtest, gdev etc, +/// there can exist different kinds of client types. As these client types differ in the generics +/// that are being used, we can not easily return them from a function. For returning them from a +/// function there exists [`Client`]. However, the problem on how to use this client instance still +/// exists. This trait "solves" it in a dirty way. It requires a type to implement this trait and +/// than the [`execute_with_client`](ExecuteWithClient::execute_with_client) function can be called +/// with any possible client instance. +/// +/// In a perfect world, we could make a closure work in this way. +pub trait ExecuteWithClient { + /// The return type when calling this instance. + type Output; + + /// Execute whatever should be executed with the given client instance. + fn execute_with_client<Client, Api, Backend>(self, client: Arc<Client>) -> Self::Output + where + <Api as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>, + Backend: sc_client_api::Backend<Block> + 'static, + Backend::State: sp_api::StateBackend<BlakeTwo256>, + Api: crate::service::RuntimeApiCollection<StateBackend = Backend::State>, + Client: AbstractClient<Block, Backend, Api = Api> + 'static; +} + +/// A set of APIs that runtimes must implement. +/// +/// This trait has no methods or associated type. It is a concise marker for all the trait bounds +/// that it contains. +pub trait RuntimeApiCollection: + pallet_grandpa::fg_primitives::GrandpaApi<Block> + + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> + + sp_api::ApiExt<Block> + + sp_authority_discovery::AuthorityDiscoveryApi<Block> + + sp_block_builder::BlockBuilder<Block> + + sp_api::Metadata<Block> + + sp_consensus_babe::BabeApi<Block> + + sp_offchain::OffchainWorkerApi<Block> + + sp_session::SessionKeys<Block> + + sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> + + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index> +where + <Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>, +{ +} +impl<Api> RuntimeApiCollection for Api +where + Api: pallet_grandpa::fg_primitives::GrandpaApi<Block> + + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> + + sp_api::ApiExt<Block> + + sp_authority_discovery::AuthorityDiscoveryApi<Block> + + sp_block_builder::BlockBuilder<Block> + + sp_api::Metadata<Block> + + sp_consensus_babe::BabeApi<Block> + + sp_offchain::OffchainWorkerApi<Block> + + sp_session::SessionKeys<Block> + + sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> + + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>, + <Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>, +{ +} + /// A client instance. #[derive(Clone)] pub enum Client { @@ -37,6 +154,37 @@ pub enum Client { GDev(Arc<super::FullClient<gdev_runtime::RuntimeApi, super::GDevExecutor>>), } +macro_rules! with_client { + { + $self:ident, + $client:ident, + { + $( $code:tt )* + } + } => { + match $self { + #[cfg(feature = "g1")] + Self::G1($client) => { $( $code )* }, + #[cfg(feature = "gtest")] + Self::GTest($client) => { $( $code )* }, + #[cfg(feature = "gdev")] + Self::GDev($client) => { $( $code )* }, + } + } +} + +impl ClientHandle for Client { + fn execute_with<T: ExecuteWithClient>(&self, t: T) -> T::Output { + with_client! { + self, + client, + { + T::execute_with_client::<_, _, super::FullBackend>(t, client.clone()) + } + } + } +} + #[cfg(feature = "g1")] impl From<Arc<super::FullClient<g1_runtime::RuntimeApi, super::G1Executor>>> for Client { fn from(client: Arc<super::FullClient<g1_runtime::RuntimeApi, super::G1Executor>>) -> Self { @@ -73,12 +221,6 @@ macro_rules! match_client { }; } -impl sc_client_api::UsageProvider<Block> for Client { - fn usage_info(&self) -> sc_client_api::ClientInfo<Block> { - match_client!(self, usage_info()) - } -} - impl sc_client_api::BlockBackend<Block> for Client { fn block_body( &self, @@ -126,6 +268,73 @@ impl sc_client_api::BlockBackend<Block> for Client { ) -> sp_blockchain::Result<bool> { match_client!(self, has_indexed_transaction(hash)) } + + fn requires_full_sync(&self) -> bool { + match_client!(self, requires_full_sync()) + } +} + +impl frame_benchmarking_cli::ExtrinsicBuilder for Client { + fn remark( + &self, + _nonce: u32, + ) -> std::result::Result<sp_runtime::OpaqueExtrinsic, &'static str> { + todo!() + /*with_signed_payload! { + self, + {extra, client, raw_payload}, + { + // First the setup code to init all the variables that are needed + // to build the signed extras. + use runtime::{Call, SystemCall}; + + let call = Call::System(SystemCall::remark { remark: vec![] }); + let bob = Sr25519Keyring::Bob.pair(); + + let period = polkadot_runtime_common::BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64; + + let current_block = 0; + let tip = 0; + let genesis = client.usage_info().chain.best_hash; + }, + (period, current_block, nonce, tip, call, genesis), + /* The SignedPayload is generated here */ + { + // Use the payload to generate a signature. + let signature = raw_payload.using_encoded(|payload| bob.sign(payload)); + + let ext = runtime::UncheckedExtrinsic::new_signed( + call, + sp_runtime::AccountId32::from(bob.public()).into(), + polkadot_core_primitives::Signature::Sr25519(signature.clone()), + extra, + ); + Ok(ext.into()) + } + }*/ + } +} + +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 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 number(&self, hash: Hash) -> sp_blockchain::Result<Option<BlockNumber>> { + match_client!(self, number(hash)) + } + + fn hash(&self, number: BlockNumber) -> sp_blockchain::Result<Option<Hash>> { + match_client!(self, hash(number)) + } } impl sc_client_api::StorageProvider<Block, super::FullBackend> for Client { @@ -215,61 +424,24 @@ impl sc_client_api::StorageProvider<Block, super::FullBackend> 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 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 number(&self, hash: Hash) -> sp_blockchain::Result<Option<BlockNumber>> { - match_client!(self, number(hash)) - } - - fn hash(&self, number: BlockNumber) -> sp_blockchain::Result<Option<Hash>> { - match_client!(self, hash(number)) +impl sc_client_api::UsageProvider<Block> for Client { + fn usage_info(&self) -> sc_client_api::ClientInfo<Block> { + match_client!(self, usage_info()) } } -/// A set of APIs that runtimes must implement. +/// Generates inherent data for benchmarking G1, GTest and GDev. /// -/// This trait has no methods or associated type. It is a concise marker for all the trait bounds -/// that it contains. -pub trait RuntimeApiCollection: - pallet_grandpa::fg_primitives::GrandpaApi<Block> - + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> - + sp_api::ApiExt<Block> - + sp_authority_discovery::AuthorityDiscoveryApi<Block> - + sp_block_builder::BlockBuilder<Block> - + sp_api::Metadata<Block> - + sp_consensus_babe::BabeApi<Block> - + sp_offchain::OffchainWorkerApi<Block> - + sp_session::SessionKeys<Block> - + sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> - + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index> -where - <Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>, -{ -} -impl<Api> RuntimeApiCollection for Api -where - Api: pallet_grandpa::fg_primitives::GrandpaApi<Block> - + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> - + sp_api::ApiExt<Block> - + sp_authority_discovery::AuthorityDiscoveryApi<Block> - + sp_block_builder::BlockBuilder<Block> - + sp_api::Metadata<Block> - + sp_consensus_babe::BabeApi<Block> - + sp_offchain::OffchainWorkerApi<Block> - + sp_session::SessionKeys<Block> - + sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> - + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>, - <Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>, -{ +/// Not to be used outside of benchmarking since it returns mocked values. +pub fn benchmark_inherent_data( +) -> std::result::Result<sp_inherents::InherentData, sp_inherents::Error> { + use sp_inherents::InherentDataProvider; + let mut inherent_data = sp_inherents::InherentData::new(); + + // 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)?; + + Ok(inherent_data) } diff --git a/pallets/authority-members/Cargo.toml b/pallets/authority-members/Cargo.toml index 4ddbbc6bb4bbae1a0ab7e665bab9f593ca8bc88a..42bc87d48736f12731a736ba325c71c111cd902d 100644 --- a/pallets/authority-members/Cargo.toml +++ b/pallets/authority-members/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet authority members.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-authority-members' @@ -34,35 +34,35 @@ sp-membership = { path = "../../primitives/membership", default-features = false # crates.io log = { version = "0.4.14", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" # substrate [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.pallet-session] default-features = false features = ["historical"] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.serde] version = "1.0.101" @@ -71,23 +71,23 @@ features = ["derive"] [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-staking] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### @@ -103,5 +103,5 @@ version = '1.0.2' version = '1.0.119' [dev-dependencies.sp-io] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' diff --git a/pallets/certification/Cargo.toml b/pallets/certification/Cargo.toml index 20774a15c02c612e5aacf35fa77c6b3a3a657cd0..4a27c25d2ff3cbab3fcd21eb97afe20bf4459987 100644 --- a/pallets/certification/Cargo.toml +++ b/pallets/certification/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet certification.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-certification' @@ -27,29 +27,29 @@ try-runtime = ['frame-support/try-runtime'] [dependencies] # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.serde] version = "1.0.101" @@ -58,18 +58,18 @@ features = ["derive"] [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### @@ -85,5 +85,5 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' diff --git a/pallets/duniter-account/Cargo.toml b/pallets/duniter-account/Cargo.toml index 7bd145de7e2baf37fe6940e074342863887fb57e..75e07004d6f4453b8e3a1a47af9afe1095d108d1 100644 --- a/pallets/duniter-account/Cargo.toml +++ b/pallets/duniter-account/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet duniter account.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-duniter-account' @@ -33,36 +33,36 @@ try-runtime = ['frame-support/try-runtime'] pallet-provide-randomness = { path = "../provide-randomness", default-features = false } # crates.io -codec = { package = 'parity-scale-codec', version = "2.3.1", default-features = false, features = ["derive"] } +codec = { package = 'parity-scale-codec', version = "3.1.5", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # substrate [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.pallet-balances] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.pallet-treasury] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.serde] version = "1.0.101" @@ -71,23 +71,23 @@ features = ["derive"] [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### @@ -97,8 +97,8 @@ targets = ['x86_64-unknown-linux-gnu'] ### DEV ### [dev-dependencies.pallet-balances] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dev-dependencies.maplit] version = '1.0.2' @@ -107,5 +107,5 @@ version = '1.0.2' version = '1.0.119' [dev-dependencies.sp-io] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' diff --git a/pallets/duniter-test-parameters/Cargo.toml b/pallets/duniter-test-parameters/Cargo.toml index 6058421ef4f6dc336e6e4236ea7de8904ef5f2e1..320bab484c27c047bb2bc0a229c648a0d16112b7 100644 --- a/pallets/duniter-test-parameters/Cargo.toml +++ b/pallets/duniter-test-parameters/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'Duniter test parameters.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-duniter-test-parameters' @@ -27,44 +27,44 @@ pallet-duniter-test-parameters-macro = { path = "macro" } serde = { version = "1.0.101", features = ["derive"], optional = true } # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### diff --git a/pallets/duniter-test-parameters/macro/Cargo.toml b/pallets/duniter-test-parameters/macro/Cargo.toml index ce0b5a32fa4d52030ca18e4aec64051b6356c098..a1a6226e93ad0a50d7219039258b1d884850363b 100644 --- a/pallets/duniter-test-parameters/macro/Cargo.toml +++ b/pallets/duniter-test-parameters/macro/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'Duniter test parameters macro.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-duniter-test-parameters-macro' diff --git a/pallets/duniter-wot/Cargo.toml b/pallets/duniter-wot/Cargo.toml index eea96cbeaf5538c6151377580f90db18ce73f089..a14e0b98d39ddbe7d7e73123817f41d87ec89f79 100644 --- a/pallets/duniter-wot/Cargo.toml +++ b/pallets/duniter-wot/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet duniter wot.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-duniter-wot' @@ -36,29 +36,29 @@ pallet-membership = { path = "../membership", default-features = false } sp-membership = { path = "../../primitives/membership", default-features = false } # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.serde] version = "1.0.101" @@ -67,23 +67,23 @@ features = ["derive"] [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### @@ -95,5 +95,5 @@ version = '1.0.119' ### DEV ### [dev-dependencies.sp-io] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' diff --git a/pallets/identity/Cargo.toml b/pallets/identity/Cargo.toml index 99310914163ec01c4360008042ca6ab4673151cf..4144dce3590c576a55e1c0ce69c0293d5d434f82 100644 --- a/pallets/identity/Cargo.toml +++ b/pallets/identity/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet identity.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-identity' @@ -30,44 +30,44 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] # crates.io -codec = { package = 'parity-scale-codec', version = '2.3.1', features = ['derive'], default-features = false } +codec = { package = 'parity-scale-codec', version = "3.1.5", features = ['derive'], default-features = false } impl-trait-for-tuples = "0.2.1" -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", features = ["derive"], optional = true } # substrate [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dev-dependencies] serde = '1.0.119' -sp-io = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } diff --git a/pallets/membership/Cargo.toml b/pallets/membership/Cargo.toml index 18d8ba8b5f270cd4c655caebd1b03b8f1dc6dcac..dbfc3d454a3931c96817b3986a0b17309f7d71d1 100644 --- a/pallets/membership/Cargo.toml +++ b/pallets/membership/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet membership.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-membership' @@ -29,29 +29,29 @@ try-runtime = ['frame-support/try-runtime'] sp-membership = { path = "../../primitives/membership", default-features = false } # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.serde] version = "1.0.101" @@ -60,18 +60,18 @@ features = ["derive"] [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### @@ -87,5 +87,5 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' diff --git a/pallets/provide-randomness/Cargo.toml b/pallets/provide-randomness/Cargo.toml index d3581c7579e4bd877f44723829091567c3c6148c..73b76a62b43ffd767fc0c4a55c49500ca57368ef 100644 --- a/pallets/provide-randomness/Cargo.toml +++ b/pallets/provide-randomness/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet to provide randomness to users.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-provide-randomness' @@ -25,49 +25,49 @@ try-runtime = ['frame-support/try-runtime'] [dependencies] # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-core] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### diff --git a/pallets/provide-randomness/src/lib.rs b/pallets/provide-randomness/src/lib.rs index 9fe4d6055e3b5a5a019e6c722cad1dcd364ad1db..2cf03b426f40f398e77e78b1ea13acf4a7e9a416 100644 --- a/pallets/provide-randomness/src/lib.rs +++ b/pallets/provide-randomness/src/lib.rs @@ -81,8 +81,8 @@ pub mod pallet { type OnFilledRandomness: OnFilledRandomness; /// Handler for the unbalanced reduction when the requestor pays fees. type OnUnbalanced: OnUnbalanced<NegativeImbalanceOf<Self>>; - /// A safe source of randomness from the current block - type CurrentBlockRandomness: Randomness<Option<H256>, Self::BlockNumber>; + /// A safe source of randomness from the parent block + type ParentBlockRandomness: Randomness<Option<H256>, Self::BlockNumber>; /// A safe source of randomness from one epoch ago type RandomnessFromOneEpochAgo: Randomness<H256, Self::BlockNumber>; } @@ -169,7 +169,7 @@ pub mod pallet { total_weight += 100_000; for Request { request_id, salt } in RequestsReadyAtNextBlock::<T>::take() { - let randomness = T::CurrentBlockRandomness::random(salt.as_ref()) + let randomness = T::ParentBlockRandomness::random(salt.as_ref()) .0 .unwrap_or_default(); RequestsIds::<T>::remove(request_id); diff --git a/pallets/universal-dividend/Cargo.toml b/pallets/universal-dividend/Cargo.toml index f6ab06ac8ba9283d204d110efe13d55e6b4f87e1..3671e75d9ef983e2d91648df7aafe196d888062d 100644 --- a/pallets/universal-dividend/Cargo.toml +++ b/pallets/universal-dividend/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet universal dividend.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-universal-dividend' @@ -28,43 +28,43 @@ try-runtime = ['frame-support/try-runtime'] [dependencies] # crates.io -codec = { package = 'parity-scale-codec', version = '2.3.1', default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = 'parity-scale-codec', version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } +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/librelois/substrate.git', branch = 'duniter-monthly-2022-02', optional = true, default-features = false } -pallet-balances = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', optional = true, default-features = false } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true, default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true, default-features = false } [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-arithmetic] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### @@ -78,17 +78,17 @@ targets = ['x86_64-unknown-linux-gnu'] serde = { version = "1.0.101", features = ["derive"] } [dev-dependencies.pallet-balances] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dev-dependencies.sp-core] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dev-dependencies.sp-io] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dev-dependencies.sp-runtime] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' diff --git a/pallets/upgrade-origin/Cargo.toml b/pallets/upgrade-origin/Cargo.toml index 441c906e54d97239c8be2440f18c27452d981e8c..3d1dcf1c1b727b2475b99838716b74ccd29e37b7 100644 --- a/pallets/upgrade-origin/Cargo.toml +++ b/pallets/upgrade-origin/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'FRAME pallet to upgrade specified origin to root.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'pallet-upgrade-origin' @@ -24,44 +24,44 @@ try-runtime = ['frame-support/try-runtime'] [dependencies] # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-benchmarking] default-features = false -git = 'https://github.com/librelois/substrate.git' +git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-monthly-2022-02' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.frame-system] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-io] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### diff --git a/primitives/duniter/Cargo.toml b/primitives/duniter/Cargo.toml index e4e9820a067de90e221ceda0fad9cfbae67cbcf3..fddb69c8bf40f629980a1f479d5c81bdb42e8e71 100644 --- a/primitives/duniter/Cargo.toml +++ b/primitives/duniter/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'primitives for duniter runtime.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'duniter-primitives' @@ -22,28 +22,28 @@ try-runtime = ['frame-support/try-runtime'] [dependencies] # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### diff --git a/primitives/membership/Cargo.toml b/primitives/membership/Cargo.toml index a79dd7a285905690804f5aa872070ea72c0dff71..d4682b66c6f151e04b38a0dabeadc85cf23b0505 100644 --- a/primitives/membership/Cargo.toml +++ b/primitives/membership/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['librelois <c@elo.tf>'] description = 'primitives for pallet membership.' -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'sp-membership' @@ -23,18 +23,18 @@ try-runtime = ['frame-support/try-runtime'] [dependencies] # substrate -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dependencies.codec] default-features = false features = ['derive'] package = 'parity-scale-codec' -version = '2.3.1' +version = "3.1.5" [dependencies.frame-support] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.serde] version = "1.0.101" @@ -43,13 +43,13 @@ features = ["derive"] [dependencies.sp-runtime] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [dependencies.sp-std] default-features = false -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' ### DOC ### diff --git a/resources/metadata.scale b/resources/metadata.scale index bfcf355fbb83ffe14485443a7ec787fd343d01f1..53eb7112a2ef328bbe23045d60c5ef402470ae39 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 18152fd8ca730c359137f84c17ea80659cf2bffd..523f684043594cacff62d11844e036fbf33bebac 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -4,7 +4,7 @@ description = 'Common code shared between all runtimes' license = 'GPL-3.0-only' version = '0.8.0-dev' authors = ['Axiom-Team Developers <https://axiom-team.fr>'] -edition = '2018' +edition = "2021" [features] runtime-benchmarks = [ @@ -74,35 +74,35 @@ pallet-universal-dividend = { path = '../../pallets/universal-dividend', default sp-membership = { path = '../../primitives/membership', default-features = false } # Crates.io -codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } +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 = "1.0", default-features = false, features = ["derive"] } +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" # Substrate -frame-support = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-balances = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-multisig = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-proxy = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-scheduler = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-timestamp = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-treasury = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-arithmetic = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-consensus-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-core = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-std = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } # substrate benchmarks -frame-benchmarking = { git = "https://github.com/librelois/substrate", branch = 'duniter-monthly-2022-02', default-features = false, optional = true } -frame-system-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = 'duniter-substrate-v0.9.23', default-features = false, optional = true } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', 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/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } +sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } diff --git a/runtime/common/src/fees.rs b/runtime/common/src/fees.rs index cac38836fec495c2bbe3ad7cf6a39825806fe5e0..fbdf06895f0b1d7c1b31537cbb4969f3df12ad0d 100644 --- a/runtime/common/src/fees.rs +++ b/runtime/common/src/fees.rs @@ -14,29 +14,33 @@ // You should have received a copy of the GNU Affero General Public License // along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>. -pub use frame_support::weights::{ - Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, -}; +pub use frame_support::weights::{Weight, WeightToFee}; use sp_arithmetic::traits::{BaseArithmetic, One, Unsigned}; -pub struct WeightToFeeImpl<T>(sp_std::marker::PhantomData<T>); +pub struct LengthToFeeImpl<T>(sp_std::marker::PhantomData<T>); -impl<T> WeightToFeePolynomial for WeightToFeeImpl<T> +impl<T> WeightToFee for LengthToFeeImpl<T> where T: BaseArithmetic + From<u32> + Copy + Unsigned, { type Balance = T; - fn polynomial() -> WeightToFeeCoefficients<Self::Balance> { - smallvec::smallvec!(WeightToFeeCoefficient { - coeff_integer: 0u32.into(), - coeff_frac: sp_runtime::Perbill::from_parts(1), - negative: false, - degree: 1, - }) - } // Force constant fees - fn calc(_weight: &Weight) -> Self::Balance { + fn weight_to_fee(lenght_in_bytes: &Weight) -> Self::Balance { + (*lenght_in_bytes as u32 / 1_000_u32).into() + } +} + +pub struct WeightToFeeImpl<T>(sp_std::marker::PhantomData<T>); + +impl<T> WeightToFee for WeightToFeeImpl<T> +where + T: BaseArithmetic + From<u32> + Copy + Unsigned, +{ + type Balance = T; + + fn weight_to_fee(_weight: &Weight) -> Self::Balance { + // Force constant fees for now One::one() } } diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs index 148ee661dccc878f36a5075269ddcf0a5c70b2a7..f9e7531c7461bda911827c1a7d7a4e57db549a56 100644 --- a/runtime/common/src/pallets_config.rs +++ b/runtime/common/src/pallets_config.rs @@ -175,9 +175,9 @@ macro_rules! pallets_config { } impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter<Balances, HandleFees>; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = frame_support::traits::ConstU8<5>; type WeightToFee = common_runtime::fees::WeightToFeeImpl<Balance>; + type LengthToFee = common_runtime::fees::LengthToFeeImpl<Balance>; type FeeMultiplierUpdate = (); } @@ -269,7 +269,7 @@ macro_rules! pallets_config { impl pallet_upgrade_origin::Config for Runtime { type Event = Event; type Call = Call; - type UpgradableOrigin = pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>; + type UpgradableOrigin = pallet_collective::EnsureProportionAtLeast<AccountId, TechnicalCommitteeInstance, 2, 3>; type WeightInfo = common_runtime::weights::pallet_upgrade_origin::WeightInfo<Runtime>; #[cfg(feature = "runtime-benchmarks")] type WorstCaseOriginType = pallet_collective::RawOrigin<AccountId, TechnicalCommitteeInstance>; @@ -309,7 +309,7 @@ macro_rules! pallets_config { type RequestPrice = frame_support::traits::ConstU64<2_000>; type OnFilledRandomness = Account; type OnUnbalanced = Treasury; - type CurrentBlockRandomness = pallet_babe::CurrentBlockRandomness<Self>; + type ParentBlockRandomness = pallet_babe::ParentBlockRandomness<Self>; type RandomnessFromOneEpochAgo = pallet_babe::RandomnessFromOneEpochAgo<Self>; } @@ -520,7 +520,6 @@ macro_rules! pallets_config { type MotionDuration = TechnicalCommitteeMotionDuration; type MaxProposals = frame_support::pallet_prelude::ConstU32<20>; type MaxMembers = frame_support::pallet_prelude::ConstU32<100>; - type MembersStorage = pallet_collective::InternalMembersStorage<Runtime, Instance2>; type DefaultVote = TechnicalCommitteeDefaultVote; type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>; } diff --git a/runtime/g1/Cargo.toml b/runtime/g1/Cargo.toml index a4479f4561b5212aa20c486d0dbcd2c7c6d22789..ee9d7049bb0c306cb081934b5eedac81ba4b3151 100644 --- a/runtime/g1/Cargo.toml +++ b/runtime/g1/Cargo.toml @@ -1,10 +1,10 @@ [build-dependencies.substrate-wasm-builder] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'g1-runtime' @@ -102,10 +102,10 @@ try-runtime = [ ] [dev-dependencies] -sp-consensus-vrf = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-finality-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-io = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-keyring = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } +sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } [dependencies] # local @@ -123,50 +123,50 @@ pallet-upgrade-origin = { path = '../../pallets/upgrade-origin', default-feature sp-membership = { path = '../../primitives/membership', default-features = false } # crates.io -codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } +codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } hex-literal = { version = '0.3.1', optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } # substrate -frame-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', optional = true } -frame-try-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-support = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false} -pallet-atomic-swap = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-authority-discovery = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-authorship = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-balances = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-collective = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-im-online = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-offences = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-multisig = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-preimage = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-proxy = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-scheduler = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-sudo = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-timestamp = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-treasury = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-utility = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-arithmetic = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-authority-discovery = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-block-builder = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-consensus-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-core = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-inherents = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-offchain = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-std = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-transaction-pool = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-version = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-offences = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs index da2ddd64321bc794c3b11bb2a2d91a8c330b3498..ec455d7fad4eac0e9e16631e69c74c80e48f103d 100644 --- a/runtime/g1/src/lib.rs +++ b/runtime/g1/src/lib.rs @@ -47,7 +47,6 @@ use frame_system::EnsureRoot; use pallet_grandpa::fg_primitives; use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList}; use sp_api::impl_runtime_apis; -use sp_core::u32_trait::*; use sp_core::OpaqueMetadata; use sp_runtime::traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, NumberFor, OpaqueKeys}; use sp_runtime::{ @@ -89,6 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled natively. diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs index 88b6cb704eb15b4ff11dd85c5867e9c6cc8bf8df..c949289ae2321b8bc3ff61832430a585fafb03d6 100644 --- a/runtime/g1/src/parameters.rs +++ b/runtime/g1/src/parameters.rs @@ -20,7 +20,6 @@ use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; use frame_support::weights::constants::WEIGHT_PER_SECOND; use sp_arithmetic::Perbill; -use sp_core::u32_trait::*; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { @@ -76,11 +75,6 @@ frame_support::parameter_types! { pub const MaxLocks: u32 = 50; } -// Transaction payment -frame_support::parameter_types! { - pub const TransactionByteFee: Balance = 0; -} - // Universal dividend parameter_types! { // 0.002_381_440 = 0.0488^2 @@ -155,6 +149,6 @@ parameter_types! { // Treasury pub type TreasuryApproveOrigin = - pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, TechnicalCommitteeInstance>; + pallet_collective::EnsureProportionMoreThan<AccountId, TechnicalCommitteeInstance, 1, 2>; pub type TreasuryRejectOrigin = - pallet_collective::EnsureProportionMoreThan<_1, _3, AccountId, TechnicalCommitteeInstance>; + pallet_collective::EnsureProportionMoreThan<AccountId, TechnicalCommitteeInstance, 1, 3>; diff --git a/runtime/gdev/Cargo.toml b/runtime/gdev/Cargo.toml index 236aadec20abd3c0cc13dd1b40c6f1de80f65570..bfdc5a59a1359da72f035967c178603f9dfc0ffe 100644 --- a/runtime/gdev/Cargo.toml +++ b/runtime/gdev/Cargo.toml @@ -1,10 +1,10 @@ [build-dependencies.substrate-wasm-builder] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'gdev-runtime' @@ -124,10 +124,10 @@ try-runtime = [ ] [dev-dependencies] -sp-consensus-vrf = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-finality-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-io = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-keyring = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } +sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } [dependencies] # local @@ -145,53 +145,53 @@ pallet-upgrade-origin = { path = '../../pallets/upgrade-origin', default-feature sp-membership = { path = '../../primitives/membership', default-features = false } # crates.io -codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } +codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } hex-literal = { version = '0.3.1', optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +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 } # substrate -frame-try-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-support = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system-rpc-runtime-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false} -pallet-atomic-swap = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-authority-discovery = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-authorship = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-balances = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-collective = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-im-online = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-offences = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-multisig = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-preimage = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-proxy = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-scheduler = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-sudo = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-timestamp = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-treasury = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-utility = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-arithmetic = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-authority-discovery = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-block-builder = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-consensus-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-core = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-inherents = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-offchain = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-std = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-transaction-pool = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-version = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-offences = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } # substrate benchmarking -frame-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false, optional = true } -frame-system-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false, optional = true } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false, optional = true } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false, optional = true } diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index 84cc9fbd0fbdd8c0d759b3c7fc9b6d80f3789d9a..28422d26ced49f5970d3260efac0a41faebee544 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -51,7 +51,6 @@ use frame_system::EnsureRoot; use pallet_grandpa::fg_primitives; use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList}; use sp_api::impl_runtime_apis; -use sp_core::u32_trait::*; use sp_core::OpaqueMetadata; use sp_runtime::traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, NumberFor, OpaqueKeys}; use sp_runtime::{ @@ -93,6 +92,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled natively. diff --git a/runtime/gdev/src/parameters.rs b/runtime/gdev/src/parameters.rs index d7687e76f1a894cd90f3a752aa59ebc3e1be55bd..cbc1a22c3290099b277b4350bcfbe6f52626c631 100644 --- a/runtime/gdev/src/parameters.rs +++ b/runtime/gdev/src/parameters.rs @@ -20,7 +20,6 @@ use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; use frame_support::weights::constants::WEIGHT_PER_SECOND; use sp_arithmetic::Perbill; -use sp_core::u32_trait::*; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { @@ -74,11 +73,6 @@ frame_support::parameter_types! { pub const MaxLocks: u32 = 50; } -// Transaction payment -frame_support::parameter_types! { - pub const TransactionByteFee: Balance = 0; -} - // Universal dividend parameter_types! { // 0.002_381_440 = 0.0488^2 @@ -105,6 +99,6 @@ parameter_types! { // Treasury pub type TreasuryApproveOrigin = - pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, TechnicalCommitteeInstance>; + pallet_collective::EnsureProportionMoreThan<AccountId, TechnicalCommitteeInstance, 1, 2>; pub type TreasuryRejectOrigin = - pallet_collective::EnsureProportionMoreThan<_1, _3, AccountId, TechnicalCommitteeInstance>; + pallet_collective::EnsureProportionMoreThan<AccountId, TechnicalCommitteeInstance, 1, 3>; diff --git a/runtime/gtest/Cargo.toml b/runtime/gtest/Cargo.toml index cefd2396d6218b1a766de4753f7bc93648b18c5d..30be9e5ebb1cef2990d976df0576031588775901 100644 --- a/runtime/gtest/Cargo.toml +++ b/runtime/gtest/Cargo.toml @@ -1,10 +1,10 @@ [build-dependencies.substrate-wasm-builder] -git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-02' +git = 'https://github.com/duniter/substrate' +branch = 'duniter-substrate-v0.9.23' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] -edition = '2018' +edition = "2021" homepage = 'https://substrate.dev' license = 'AGPL-3.0' name = 'gtest-runtime' @@ -102,10 +102,10 @@ try-runtime = [ ] [dev-dependencies] -sp-consensus-vrf = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-finality-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-io = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } -sp-keyring = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } +sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } [dependencies] # local @@ -123,50 +123,50 @@ pallet-upgrade-origin = { path = '../../pallets/upgrade-origin', default-feature sp-membership = { path = '../../primitives/membership', default-features = false } # crates.io -codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } +codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } hex-literal = { version = '0.3.1', optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } # substrate -frame-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', optional = true } -frame-try-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false, optional = true } -frame-executive = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-support = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false} -pallet-atomic-swap = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-authority-discovery = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-authorship = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-balances = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-collective = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-grandpa = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-im-online = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-offences = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-multisig = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-preimage = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-proxy = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-scheduler = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-sudo = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-timestamp = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-treasury = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -pallet-utility = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-api = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-arithmetic = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-authority-discovery = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-block-builder = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-consensus-babe = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-core = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-inherents = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-offchain = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-runtime = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-session = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-std = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-transaction-pool = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } -sp-version = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02', default-features = false } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-offences = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs index dfe46aac7c9988a37cb4c4485bf0588fc3751cb6..fd21f986d2969fe69a03acb45788f81a4d1763de 100644 --- a/runtime/gtest/src/lib.rs +++ b/runtime/gtest/src/lib.rs @@ -47,7 +47,6 @@ use frame_system::EnsureRoot; use pallet_grandpa::fg_primitives; use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList}; use sp_api::impl_runtime_apis; -use sp_core::u32_trait::*; use sp_core::OpaqueMetadata; use sp_runtime::traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, NumberFor, OpaqueKeys}; use sp_runtime::{ @@ -89,6 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled natively. diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs index fbf00964202c955ee4e8698f2ca44ebe986855b2..792dae05048f90f01359cc2a63db9c72d4d67ec9 100644 --- a/runtime/gtest/src/parameters.rs +++ b/runtime/gtest/src/parameters.rs @@ -20,7 +20,6 @@ use common_runtime::{Balance, BlockNumber}; use frame_support::parameter_types; use frame_support::weights::constants::WEIGHT_PER_SECOND; use sp_arithmetic::Perbill; -use sp_core::u32_trait::*; use sp_runtime::transaction_validity::TransactionPriority; parameter_types! { @@ -76,11 +75,6 @@ frame_support::parameter_types! { pub const MaxLocks: u32 = 50; } -// Transaction payment -frame_support::parameter_types! { - pub const TransactionByteFee: Balance = 0; -} - // Universal dividend parameter_types! { // 0.002_381_440 = 0.0488^2 @@ -155,6 +149,6 @@ parameter_types! { // Treasury pub type TreasuryApproveOrigin = - pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, TechnicalCommitteeInstance>; + pallet_collective::EnsureProportionMoreThan<AccountId, TechnicalCommitteeInstance, 1, 2>; pub type TreasuryRejectOrigin = - pallet_collective::EnsureProportionMoreThan<_1, _3, AccountId, TechnicalCommitteeInstance>; + pallet_collective::EnsureProportionMoreThan<AccountId, TechnicalCommitteeInstance, 1, 3>; diff --git a/rust-toolchain b/rust-toolchain index c2815e44dd69d4ffbee08ec759d5d4c9297ca759..d5cdfc7a5a7e3388f6c4cb74d3ece9bc40229d40 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2021-11-12" +channel = "nightly-2022-04-20" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ] profile = "minimal" diff --git a/shell.nix b/shell.nix index bc289fc1d8e971d3c8fa093f19cfdccbf47dcf14..83641f17c959065cd4757feae7b0f2b6b8a49eed 100644 --- a/shell.nix +++ b/shell.nix @@ -14,7 +14,7 @@ let rev = "1fe6ed37fd9beb92afe90671c0c2a662a03463dd"; }; nixpkgs = import pinned { overlays = [ mozillaOverlay ]; }; - rust-nightly = with nixpkgs; ((rustChannelOf { date = "2021-03-01"; channel = "nightly"; }).rust.override { + rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-04-20"; channel = "nightly"; }).rust.override { targets = [ "wasm32-unknown-unknown" ]; }); in diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 9f85cb58a42b07a9b0c7a251cc40f351618d59a5..d6d2b863ec30be89fae189dfb89cfc7309a5388d 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["elois <elois@duniter.org>"] description = "Duniter-v2s xtask" -edition = "2018" +edition = "2021" license = "AGPL-3.0" name = "xtask" repository = "https://git.duniter.org/nodes/rust/duniter-v2s" @@ -15,15 +15,15 @@ name = "xtask" [dependencies] anyhow = "1.0.32" clap = { version = "3.0", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full", "bit-vec"] } -frame-metadata = "14.0.0" +codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "full", "bit-vec"] } +frame-metadata = "15.0.0" graphql_client = "0.10.0" hex = "0.4" memmap2 = "0.5.0" placeholder = "1.1.3" reqwest = { version = "0.11.11", features = ["json"] } run_script = "0.6.3" -scale-info = { version = "1.0.0", features = ["bit-vec"] } +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"] }