diff --git a/Cargo.lock b/Cargo.lock index 1c7f3b8113557e7e5d2b8d8382e457c0a775aa09..c08735b6b52d1b5f9fb083371fedb6dba5a53137 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,9 +129,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "ascii" @@ -319,15 +319,6 @@ dependencies = [ "pin-project-lite 0.2.7", ] -[[package]] -name = "atomic" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" -dependencies = [ - "autocfg", -] - [[package]] name = "atomic-waker" version = "1.0.0" @@ -489,7 +480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.7.1", + "arrayvec 0.7.2", "constant_time_eq", ] @@ -500,7 +491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.7.1", + "arrayvec 0.7.2", "constant_time_eq", ] @@ -511,7 +502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", - "arrayvec 0.7.1", + "arrayvec 0.7.2", "cc", "cfg-if 1.0.0", "constant_time_eq", @@ -843,6 +834,15 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "cmake" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089" +dependencies = [ + "cc", +] + [[package]] name = "combine" version = "3.8.1" @@ -1000,59 +1000,60 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" +checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" +checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", + "cranelift-isle", "gimli", "log", - "regalloc", + "regalloc2", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" +checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" +checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2" [[package]] name = "cranelift-entity" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" +checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" +checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c" dependencies = [ "cranelift-codegen", "log", @@ -1060,11 +1061,17 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-isle" +version = "0.85.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b" + [[package]] name = "cranelift-native" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" +checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6" dependencies = [ "cranelift-codegen", "libc", @@ -1073,9 +1080,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.82.3" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" +checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1521,7 +1528,7 @@ dependencies = [ "gdev-runtime", "gtest-runtime", "hex", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "lazy_static", "log", "maplit", @@ -1586,6 +1593,7 @@ dependencies = [ "ctrlc", "cucumber", "env_logger", + "hex", "notify", "parity-scale-codec", "portpicker", @@ -1870,21 +1878,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "winapi 0.3.9", + "windows-sys", ] [[package]] name = "finality-grandpa" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" +checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" dependencies = [ "either", "futures 0.3.21", @@ -1892,7 +1900,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "scale-info", ] @@ -1951,7 +1959,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", ] @@ -1969,7 +1977,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -1991,7 +1999,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "Inflector", "chrono", @@ -2000,6 +2008,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "gethostname", "handlebars", "hash-db", "hex", @@ -2041,7 +2050,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -2069,7 +2078,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "bitflags", "frame-metadata", @@ -2099,7 +2108,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2111,7 +2120,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2123,7 +2132,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "proc-macro2", "quote", @@ -2133,7 +2142,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "log", @@ -2150,7 +2159,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -2165,7 +2174,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "sp-api", @@ -2174,7 +2183,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "sp-api", @@ -2396,6 +2405,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "g1-runtime" version = "3.0.0" @@ -2554,6 +2572,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "getopts" version = "0.2.21" @@ -3153,12 +3181,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown 0.12.2", "serde", ] @@ -3222,6 +3250,12 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +[[package]] +name = "io-lifetimes" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" + [[package]] name = "iovec" version = "0.1.4" @@ -3296,14 +3330,14 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" +checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ - "jsonrpsee-core 0.13.1", + "jsonrpsee-core 0.14.0", "jsonrpsee-http-server", "jsonrpsee-proc-macros", - "jsonrpsee-types 0.13.1", + "jsonrpsee-types 0.14.0", "jsonrpsee-ws-client", "jsonrpsee-ws-server", "tracing", @@ -3311,25 +3345,25 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" +checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" dependencies = [ - "jsonrpsee-client-transport 0.14.0", - "jsonrpsee-core 0.14.0", + "jsonrpsee-client-transport 0.15.1", + "jsonrpsee-core 0.15.1", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" +checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" dependencies = [ "futures-util", "http", - "jsonrpsee-core 0.13.1", - "jsonrpsee-types 0.13.1", - "pin-project 1.0.10", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "pin-project", "rustls-native-certs", "soketto", "thiserror", @@ -3342,15 +3376,15 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" +checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" dependencies = [ "futures-util", "http", - "jsonrpsee-core 0.14.0", - "jsonrpsee-types 0.14.0", - "pin-project 1.0.10", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", + "pin-project", "rustls-native-certs", "soketto", "thiserror", @@ -3363,20 +3397,22 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" +checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" dependencies = [ "anyhow", - "arrayvec 0.7.1", + "arrayvec 0.7.2", "async-lock", "async-trait", "beef", "futures-channel", "futures-timer", "futures-util", + "globset", "hyper", - "jsonrpsee-types 0.13.1", + "jsonrpsee-types 0.14.0", + "lazy_static", "parking_lot 0.12.0", "rand 0.8.4", "rustc-hash", @@ -3386,13 +3422,14 @@ dependencies = [ "thiserror", "tokio", "tracing", + "unicase", ] [[package]] name = "jsonrpsee-core" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" +checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" dependencies = [ "anyhow", "async-lock", @@ -3401,39 +3438,38 @@ dependencies = [ "futures-channel", "futures-timer", "futures-util", - "jsonrpsee-types 0.14.0", + "jsonrpsee-types 0.15.1", "rustc-hash", "serde", "serde_json", "thiserror", "tokio", "tracing", + "tracing-futures", ] [[package]] name = "jsonrpsee-http-server" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" +checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03" dependencies = [ "futures-channel", "futures-util", - "globset", "hyper", - "jsonrpsee-core 0.13.1", - "jsonrpsee-types 0.13.1", - "lazy_static", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "serde", "serde_json", "tokio", "tracing", - "unicase", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" +checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3443,9 +3479,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" +checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" dependencies = [ "anyhow", "beef", @@ -3457,9 +3493,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" +checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" dependencies = [ "anyhow", "beef", @@ -3471,28 +3507,29 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" +checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a" dependencies = [ - "jsonrpsee-client-transport 0.13.1", - "jsonrpsee-core 0.13.1", - "jsonrpsee-types 0.13.1", + "jsonrpsee-client-transport 0.14.0", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", ] [[package]] name = "jsonrpsee-ws-server" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" +checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a" dependencies = [ "futures-channel", "futures-util", - "jsonrpsee-core 0.13.1", - "jsonrpsee-types 0.13.1", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", "serde_json", "soketto", "tokio", + "tokio-stream", "tokio-util 0.7.3", "tracing", ] @@ -3619,11 +3656,10 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.44.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f" +checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" dependencies = [ - "atomic", "bytes", "futures 0.3.21", "futures-timer", @@ -3657,16 +3693,16 @@ dependencies = [ "libp2p-yamux", "multiaddr", "parking_lot 0.12.0", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-autonat" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13b690e65046af6a09c0b27bd9508fa1cab0efce889de74b0b643b9d2a98f9a" +checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" dependencies = [ "async-trait", "futures 0.3.21", @@ -3676,16 +3712,16 @@ dependencies = [ "libp2p-request-response", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.8.4", ] [[package]] name = "libp2p-core" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" +checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" dependencies = [ "asn1_der", "bs58", @@ -3702,8 +3738,8 @@ dependencies = [ "multihash", "multistream-select", "parking_lot 0.12.0", - "pin-project 1.0.10", - "prost 0.9.0", + "pin-project", + "prost", "prost-build", "rand 0.8.4", "ring", @@ -3718,9 +3754,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d37f042f748e224f04785d0e987ae09a2aa518d6401d82d412dad83e360ed" +checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" dependencies = [ "flate2", "futures 0.3.21", @@ -3729,23 +3765,24 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066e33e854e10b5c93fc650458bf2179c7e0d143db260b0963e44a94859817f1" +checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" dependencies = [ "async-std-resolver", "futures 0.3.21", "libp2p-core", "log", + "parking_lot 0.12.0", "smallvec", "trust-dns-resolver", ] [[package]] name = "libp2p-floodsub" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d3ea6ebe7a7a85df2bc86678b93f24b015fae5fe3b3acc4c400e795a55d2d" +checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" dependencies = [ "cuckoofilter", "fnv", @@ -3753,7 +3790,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.7.3", "smallvec", @@ -3761,9 +3798,9 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.37.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90c989a7c0969c2ab63e898da9bc735e3be53fb4f376e9c045ce516bcc9f928" +checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" dependencies = [ "asynchronous-codec", "base64", @@ -3777,7 +3814,7 @@ dependencies = [ "libp2p-swarm", "log", "prometheus-client", - "prost 0.9.0", + "prost", "prost-build", "rand 0.7.3", "regex", @@ -3789,28 +3826,32 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ef5a5b57904c7c33d6713ef918d239dc6b7553458f3475d87f8a18e9c651c8" +checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" dependencies = [ + "asynchronous-codec", "futures 0.3.21", "futures-timer", "libp2p-core", "libp2p-swarm", "log", "lru", - "prost 0.9.0", + "prost", "prost-build", + "prost-codec", "smallvec", + "thiserror", + "void", ] [[package]] name = "libp2p-kad" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e" +checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.2", "asynchronous-codec", "bytes", "either", @@ -3821,7 +3862,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.7.3", "sha2 0.10.2", @@ -3834,9 +3875,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611ae873c8e280ccfab0d57c7a13cac5644f364529e233114ff07863946058b0" +checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" dependencies = [ "async-io", "data-encoding", @@ -3855,9 +3896,9 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985be799bb3796e0c136c768208c3c06604a38430571906a13dcfeda225a3b9d" +checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" dependencies = [ "libp2p-core", "libp2p-gossipsub", @@ -3871,9 +3912,9 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" +checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" dependencies = [ "asynchronous-codec", "bytes", @@ -3889,9 +3930,9 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" +checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" dependencies = [ "bytes", "curve25519-dalek 3.2.0", @@ -3899,7 +3940,7 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.8.4", "sha2 0.10.2", @@ -3911,9 +3952,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf57a3c2e821331dda9fe612d4654d676ab6e33d18d9434a18cced72630df6ad" +checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" dependencies = [ "futures 0.3.21", "futures-timer", @@ -3927,16 +3968,16 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe" +checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" dependencies = [ "asynchronous-codec", "bytes", "futures 0.3.21", "libp2p-core", "log", - "prost 0.9.0", + "prost", "prost-build", "unsigned-varint", "void", @@ -3950,7 +3991,7 @@ checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ "futures 0.3.21", "log", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "salsa20", "sha3 0.9.1", @@ -3958,9 +3999,9 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f" +checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" dependencies = [ "asynchronous-codec", "bytes", @@ -3971,22 +4012,22 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.10", - "prost 0.9.0", + "pin-project", + "prost", "prost-build", + "prost-codec", "rand 0.8.4", "smallvec", "static_assertions", "thiserror", - "unsigned-varint", "void", ] [[package]] name = "libp2p-rendezvous" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd0baab894c5b84da510b915d53264d566c3c35889f09931fe9edbd2a773bee" +checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" dependencies = [ "asynchronous-codec", "bimap", @@ -3996,7 +4037,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.9.0", + "prost", "prost-build", "rand 0.8.4", "sha2 0.10.2", @@ -4007,9 +4048,9 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869" +checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" dependencies = [ "async-trait", "bytes", @@ -4025,9 +4066,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0c69ad9e8f7c5fc50ad5ad9c7c8b57f33716532a2b623197f69f93e374d14c" +checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" dependencies = [ "either", "fnv", @@ -4036,7 +4077,7 @@ dependencies = [ "instant", "libp2p-core", "log", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "smallvec", "thiserror", @@ -4045,9 +4086,9 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f693c8c68213034d472cbb93a379c63f4f307d97c06f1c41e4985de481687a5" +checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" dependencies = [ "quote", "syn", @@ -4055,9 +4096,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" +checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" dependencies = [ "async-io", "futures 0.3.21", @@ -4072,9 +4113,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" +checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" dependencies = [ "async-std", "futures 0.3.21", @@ -4084,9 +4125,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6ea0f84a967ef59a16083f222c18115ae2e91db69809dce275df62e101b279" +checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" dependencies = [ "futures 0.3.21", "js-sys", @@ -4098,15 +4139,16 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" +checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" dependencies = [ "either", "futures 0.3.21", "futures-rustls", "libp2p-core", "log", + "parking_lot 0.12.0", "quicksink", "rw-stream-sink", "soketto", @@ -4116,9 +4158,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.36.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" +checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" dependencies = [ "futures 0.3.21", "libp2p-core", @@ -4232,6 +4274,12 @@ version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + [[package]] name = "lock_api" version = "0.4.7" @@ -4573,7 +4621,7 @@ dependencies = [ "bytes", "futures 0.3.21", "log", - "pin-project 1.0.10", + "pin-project", "smallvec", "unsigned-varint", ] @@ -4897,11 +4945,12 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -4999,7 +5048,7 @@ dependencies = [ [[package]] name = "pallet-atomic-swap" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5014,7 +5063,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5051,7 +5100,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5066,7 +5115,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5090,7 +5139,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5122,7 +5171,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5206,7 +5255,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5246,7 +5295,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5284,7 +5333,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5299,7 +5348,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5334,7 +5383,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5365,7 +5414,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5380,7 +5429,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5396,7 +5445,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5417,7 +5466,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5431,7 +5480,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5449,7 +5498,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-support", "frame-system", @@ -5465,9 +5514,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -5480,7 +5529,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5491,7 +5540,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5540,7 +5589,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-benchmarking", "frame-support", @@ -5578,7 +5627,7 @@ version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ - "arrayvec 0.7.1", + "arrayvec 0.7.2", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", @@ -5816,33 +5865,13 @@ 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 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", + "pin-project-internal", ] [[package]] @@ -6019,9 +6048,9 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" dependencies = [ "dtoa", "itoa 1.0.1", @@ -6040,16 +6069,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - [[package]] name = "prost" version = "0.10.4" @@ -6057,23 +6076,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" dependencies = [ "bytes", - "prost-derive 0.10.1", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ "bytes", - "heck 0.3.3", + "cfg-if 1.0.0", + "cmake", + "heck 0.4.0", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost 0.9.0", + "prost", "prost-types", "regex", "tempfile", @@ -6081,16 +6102,16 @@ dependencies = [ ] [[package]] -name = "prost-derive" -version = "0.9.0" +name = "prost-codec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", ] [[package]] @@ -6108,12 +6129,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" dependencies = [ "bytes", - "prost 0.9.0", + "prost", ] [[package]] @@ -6343,13 +6364,14 @@ dependencies = [ ] [[package]] -name = "regalloc" -version = "0.0.34" +name = "regalloc2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" +checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" dependencies = [ + "fxhash", "log", - "rustc-hash", + "slice-group-by", "smallvec", ] @@ -6394,10 +6416,10 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "env_logger", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "serde", @@ -6575,12 +6597,26 @@ checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.5.3", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.42", "winapi 0.3.9", ] +[[package]] +name = "rustix" +version = "0.35.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.7.3", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys", +] + [[package]] name = "rustls" version = "0.20.2" @@ -6634,12 +6670,12 @@ dependencies = [ [[package]] name = "rw-stream-sink" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ "futures 0.3.21", - "pin-project 0.4.30", + "pin-project", "static_assertions", ] @@ -6670,7 +6706,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "log", "sp-core", @@ -6681,7 +6717,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "futures-timer", @@ -6704,7 +6740,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6720,7 +6756,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -6737,7 +6773,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6748,7 +6784,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "chrono", "clap", @@ -6787,7 +6823,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "fnv", "futures 0.3.21", @@ -6815,7 +6851,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "hash-db", "kvdb", @@ -6840,7 +6876,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "futures 0.3.21", @@ -6864,7 +6900,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "futures 0.3.21", @@ -6893,7 +6929,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "fork-tree", @@ -6936,7 +6972,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6949,12 +6985,12 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "assert_matches", "async-trait", "futures 0.3.21", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "sc-client-api", @@ -6983,7 +7019,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "futures 0.3.21", @@ -7008,7 +7044,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "sc-client-api", "sp-authorship", @@ -7019,7 +7055,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "lazy_static", "lru", @@ -7046,7 +7082,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "environmental", "parity-scale-codec", @@ -7063,7 +7099,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "log", "parity-scale-codec", @@ -7078,13 +7114,15 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "cfg-if 1.0.0", "libc", "log", + "once_cell", "parity-scale-codec", "parity-wasm 0.42.2", + "rustix 0.35.9", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -7096,7 +7134,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "ahash", "async-trait", @@ -7136,7 +7174,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "ansi_term", "futures 0.3.21", @@ -7153,7 +7191,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "hex", @@ -7168,7 +7206,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "asynchronous-codec", @@ -7189,8 +7227,8 @@ dependencies = [ "lru", "parity-scale-codec", "parking_lot 0.12.0", - "pin-project 1.0.10", - "prost 0.10.4", + "pin-project", + "prost", "prost-build", "rand 0.7.3", "sc-block-builder", @@ -7220,7 +7258,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "libp2p", @@ -7233,7 +7271,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "ahash", "futures 0.3.21", @@ -7250,13 +7288,13 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "libp2p", "log", "parity-scale-codec", - "prost 0.10.4", + "prost", "prost-build", "sc-client-api", "sc-network-common", @@ -7270,7 +7308,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "bitflags", "either", @@ -7280,7 +7318,7 @@ dependencies = [ "log", "lru", "parity-scale-codec", - "prost 0.10.4", + "prost", "prost-build", "sc-client-api", "sc-consensus", @@ -7299,7 +7337,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "bytes", "fnv", @@ -7327,7 +7365,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "libp2p", @@ -7340,7 +7378,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7349,11 +7387,11 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "hash-db", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "parking_lot 0.12.0", @@ -7379,10 +7417,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "parking_lot 0.12.0", @@ -7402,10 +7440,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "serde_json", "substrate-prometheus-endpoint", @@ -7415,7 +7453,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "directories", @@ -7423,12 +7461,12 @@ dependencies = [ "futures 0.3.21", "futures-timer", "hash-db", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.0", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -7480,7 +7518,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "log", "parity-scale-codec", @@ -7494,7 +7532,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "libc", @@ -7513,14 +7551,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "chrono", "futures 0.3.21", "libp2p", "log", "parking_lot 0.12.0", - "pin-project 1.0.10", + "pin-project", "rand 0.7.3", "serde", "serde_json", @@ -7531,7 +7569,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "ansi_term", "atty", @@ -7562,7 +7600,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7573,7 +7611,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7600,7 +7638,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "log", @@ -7613,7 +7651,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7623,6 +7661,18 @@ dependencies = [ "prometheus", ] +[[package]] +name = "scale-decode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c70dece385bc3e5918109830d9509806b5d4525fdf594e3463078c529122979e" +dependencies = [ + "bitvec 1.0.1", + "parity-scale-codec", + "scale-info", + "thiserror", +] + [[package]] name = "scale-info" version = "2.1.2" @@ -7649,6 +7699,23 @@ dependencies = [ "syn", ] +[[package]] +name = "scale-value" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae8b296b3ebcb3425661e9b612ccc34cb1064483a61dc379c65e6b1463498f1" +dependencies = [ + "bitvec 1.0.1", + "either", + "frame-metadata", + "parity-scale-codec", + "scale-decode", + "scale-info", + "serde", + "thiserror", + "yap", +] + [[package]] name = "schannel" version = "0.1.19" @@ -7988,6 +8055,12 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +[[package]] +name = "slice-group-by" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" + [[package]] name = "smallvec" version = "1.9.0" @@ -8046,7 +8119,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "hash-db", "log", @@ -8063,7 +8136,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "blake2", "proc-macro-crate", @@ -8075,7 +8148,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "scale-info", @@ -8088,7 +8161,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "integer-sqrt", "num-traits", @@ -8103,7 +8176,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "scale-info", @@ -8116,7 +8189,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "parity-scale-codec", @@ -8128,7 +8201,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "sp-api", @@ -8140,7 +8213,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "log", @@ -8158,7 +8231,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "futures 0.3.21", @@ -8177,7 +8250,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "parity-scale-codec", @@ -8195,7 +8268,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "merlin", @@ -8218,7 +8291,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "scale-info", @@ -8232,7 +8305,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "scale-info", @@ -8245,7 +8318,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "base58", "bitflags", @@ -8291,7 +8364,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "blake2", "byteorder", @@ -8305,7 +8378,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "proc-macro2", "quote", @@ -8316,7 +8389,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -8325,7 +8398,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "proc-macro2", "quote", @@ -8335,7 +8408,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "environmental", "parity-scale-codec", @@ -8346,7 +8419,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "finality-grandpa", "log", @@ -8364,7 +8437,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8378,7 +8451,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures 0.3.21", "hash-db", @@ -8403,7 +8476,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "lazy_static", "sp-core", @@ -8414,7 +8487,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "futures 0.3.21", @@ -8431,7 +8504,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "thiserror", "zstd", @@ -8452,7 +8525,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "sp-api", "sp-core", @@ -8462,7 +8535,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "backtrace", "lazy_static", @@ -8472,7 +8545,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "rustc-hash", "serde", @@ -8482,7 +8555,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "either", "hash256-std-hasher", @@ -8504,7 +8577,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8521,7 +8594,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "Inflector", "proc-macro-crate", @@ -8533,7 +8606,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "log", "parity-scale-codec", @@ -8547,7 +8620,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "serde", "serde_json", @@ -8556,7 +8629,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "scale-info", @@ -8570,7 +8643,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "scale-info", @@ -8581,7 +8654,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "hash-db", "log", @@ -8603,12 +8676,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8621,7 +8694,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "log", "sp-core", @@ -8634,7 +8707,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "futures-timer", @@ -8650,7 +8723,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "sp-std", @@ -8662,7 +8735,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "sp-api", "sp-runtime", @@ -8671,7 +8744,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "async-trait", "log", @@ -8687,7 +8760,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "hash-db", "memory-db", @@ -8703,7 +8776,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8720,7 +8793,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8731,7 +8804,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "impl-trait-for-tuples", "log", @@ -8831,7 +8904,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "platforms", ] @@ -8839,11 +8912,11 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "sc-client-api", @@ -8860,7 +8933,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "futures-util", "hyper", @@ -8873,11 +8946,12 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", + "filetime", "sp-maybe-compressed-blob", "strum", "tempfile", @@ -8894,18 +8968,20 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.22.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" +version = "0.23.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.26#9ab601b10b4254d64368371f07e09934a0f55bf7" dependencies = [ "bitvec 1.0.1", "derivative", "frame-metadata", "futures 0.3.21", "hex", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "parking_lot 0.12.0", + "scale-decode", "scale-info", + "scale-value", "serde", "serde_json", "sp-core", @@ -8918,8 +8994,8 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.22.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" +version = "0.23.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.26#9ab601b10b4254d64368371f07e09934a0f55bf7" dependencies = [ "darling", "frame-metadata", @@ -8935,8 +9011,8 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.22.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" +version = "0.23.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.26#9ab601b10b4254d64368371f07e09934a0f55bf7" dependencies = [ "darling", "proc-macro-error", @@ -8946,8 +9022,8 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.22.0" -source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.23#e0fcf196eb6192e905e1784580f64363e2213556" +version = "0.23.0" +source = "git+https://github.com/duniter/subxt.git?branch=duniter-substrate-v0.9.26#9ab601b10b4254d64368371f07e09934a0f55bf7" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -8957,13 +9033,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.91" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -9245,6 +9321,17 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.7", + "tokio", +] + [[package]] name = "tokio-util" version = "0.6.9" @@ -9327,7 +9414,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.10", + "pin-project", "tracing", ] @@ -9451,10 +9538,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.23#3c05363666a2e719807713830b7d6eee0a9598d2" +source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.26#2fd52602a7c4e992c5b317f91a4d9b9b6e87fbff" dependencies = [ "clap", - "jsonrpsee 0.13.1", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "remote-externalities", @@ -9481,13 +9568,13 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" [[package]] name = "twox-hash" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if 0.1.10", "digest 0.10.3", - "rand 0.8.4", + "rand 0.7.3", "static_assertions", ] @@ -9846,15 +9933,18 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.83.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" +checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +dependencies = [ + "indexmap", +] [[package]] name = "wasmtime" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" +checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5" dependencies = [ "anyhow", "backtrace", @@ -9864,7 +9954,7 @@ dependencies = [ "lazy_static", "libc", "log", - "object 0.27.1", + "object 0.28.4", "once_cell", "paste", "psm", @@ -9883,9 +9973,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" +checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2" dependencies = [ "anyhow", "base64", @@ -9893,7 +9983,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.33.7", "serde", "sha2 0.9.9", "toml", @@ -9903,9 +9993,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" +checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd" dependencies = [ "anyhow", "cranelift-codegen", @@ -9916,7 +10006,7 @@ dependencies = [ "gimli", "log", "more-asserts", - "object 0.27.1", + "object 0.28.4", "target-lexicon", "thiserror", "wasmparser", @@ -9925,9 +10015,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" +checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6" dependencies = [ "anyhow", "cranelift-entity", @@ -9935,7 +10025,7 @@ dependencies = [ "indexmap", "log", "more-asserts", - "object 0.27.1", + "object 0.28.4", "serde", "target-lexicon", "thiserror", @@ -9945,9 +10035,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" +checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49" dependencies = [ "addr2line", "anyhow", @@ -9956,10 +10046,10 @@ dependencies = [ "cpp_demangle", "gimli", "log", - "object 0.27.1", + "object 0.28.4", "region", "rustc-demangle", - "rustix", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", @@ -9971,20 +10061,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" +checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac" dependencies = [ "lazy_static", - "object 0.27.1", - "rustix", + "object 0.28.4", + "rustix 0.33.7", ] [[package]] name = "wasmtime-runtime" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" +checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a" dependencies = [ "anyhow", "backtrace", @@ -9999,7 +10089,7 @@ dependencies = [ "more-asserts", "rand 0.8.4", "region", - "rustix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", "wasmtime-jit-debug", @@ -10008,9 +10098,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.35.3" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" +checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2" dependencies = [ "cranelift-entity", "serde", @@ -10292,6 +10382,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yap" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc77f52dc9e9b10d55d3f4462c3b7fc393c4f17975d641542833ab2d3bc26ef" + [[package]] name = "zeroize" version = "1.4.3" @@ -10315,18 +10411,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.10.2+zstd.1.5.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.6+zstd.1.5.2" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ "libc", "zstd-sys", @@ -10334,9 +10430,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" +version = "2.0.1+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index cb8ae4e5369a39f8341296676d3469a2f481a75d..f49756a1f8e8225326e56b99472ac56dd8c4d76e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } +substrate-build-script-utils = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } [dev-dependencies] rusty-hook = "^0.11.2" # Dependencies for specific targets [target.'cfg(any(target_arch="x86_64", target_arch="aarch64"))'.dependencies] -sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.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"] } +sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26", features = ["wasmtime"] } +sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26", features = ["wasmtime"] } +sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26", features = ["memory-tracker"] } [dependencies] @@ -67,7 +67,7 @@ clap = { version = "3.0", features = ["derive"] } clap_complete = { version = "3" } futures = { version = "0.3.1", features = ["compat"] } hex = "0.4.3" -jsonrpsee = { version = "0.13.0", features = ["server"] } +jsonrpsee = { version = "0.14.0", features = ["server"] } lazy_static = "1.4.0" log = "0.4" maplit = '1.0.2' @@ -77,49 +77,49 @@ serde_json = "1.0.64" tracing-core = "=0.1.26" # substrate dependencies -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 } +frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +frame-benchmarking-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +pallet-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +pallet-transaction-payment-rpc = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-basic-authorship = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-chain-spec = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-client-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +babe = { package = "sc-consensus-babe", git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +manual-seal = { package = "sc-consensus-manual-seal", git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-consensus-uncles = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-executor = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-finality-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-network = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-rpc-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-service = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-telemetry = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sc-transaction-pool-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-api = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-authority-discovery = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-block-builder = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-blockchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-consensus = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-consensus-babe = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-core = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-finality-grandpa = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-inherents = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-io = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-offchain = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-keystore = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-runtime = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-session = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-storage = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-timestamp = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-transaction-pool = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +sp-trie = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +substrate-frame-rpc-system = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +try-runtime-cli = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26", optional = true } [workspace] resolver = "2" diff --git a/end2end-tests/Cargo.toml b/end2end-tests/Cargo.toml index 952d63bdb844154d9b2517a287e8990142402541..fa87b795480353ece0e9b6149d74590d12d0ac6d 100644 --- a/end2end-tests/Cargo.toml +++ b/end2end-tests/Cargo.toml @@ -15,12 +15,13 @@ clap = { version = "3.0", features = ["derive"] } ctrlc = "3.2.2" cucumber = "0.11" env_logger = "0.9.0" +hex = "0.4" notify = "4.0" parity-scale-codec = "3.1.5" portpicker = "0.1.1" serde_json = "1.0.64" -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' } +sp-keyring = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.26" } +subxt = { git = 'https://github.com/duniter/subxt.git', branch = 'duniter-substrate-v0.9.26' } 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 c39ca91dd7a2204c535c8969906da64f2d499e84..4a343b9e9a97473bfae43293b2f5f4a546993eda 100644 --- a/end2end-tests/tests/common/balances.rs +++ b/end2end-tests/tests/common/balances.rs @@ -14,30 +14,27 @@ // 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/>. -use super::node_runtime::runtime_types::gdev_runtime; -use super::node_runtime::runtime_types::pallet_balances; +use super::gdev; +use super::gdev::runtime_types::pallet_balances; use super::*; use sp_keyring::AccountKeyring; -use subxt::{sp_runtime::MultiAddress, PairSigner}; +use subxt::{ext::sp_runtime::MultiAddress, tx::PairSigner}; -pub async fn set_balance( - api: &Api, - client: &Client, - who: AccountKeyring, - amount: u64, -) -> Result<()> { +pub async fn set_balance(client: &Client, who: AccountKeyring, amount: u64) -> Result<()> { let _events = create_block_with_extrinsic( client, - api.tx() - .sudo() - .sudo(gdev_runtime::Call::Balances( - pallet_balances::pallet::Call::set_balance { - who: MultiAddress::Id(who.to_account_id()), - new_free: amount, - new_reserved: 0, - }, - ))? + client + .tx() .create_signed( + &gdev::tx() + .sudo() + .sudo(gdev::runtime_types::gdev_runtime::Call::Balances( + pallet_balances::pallet::Call::set_balance { + who: MultiAddress::Id(who.to_account_id()), + new_free: amount, + new_reserved: 0, + }, + )), &PairSigner::new(SUDO_ACCOUNT.pair()), BaseExtrinsicParamsBuilder::new(), ) @@ -49,7 +46,6 @@ pub async fn set_balance( } pub async fn transfer( - api: &Api, client: &Client, from: AccountKeyring, amount: u64, @@ -60,10 +56,15 @@ pub async fn transfer( let _events = create_block_with_extrinsic( client, - api.tx() - .balances() - .transfer(to.clone().into(), amount)? - .create_signed(&from, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx() + .universal_dividend() + .transfer_ud(to.clone().into(), amount), + &from, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; @@ -71,21 +72,19 @@ pub async fn transfer( Ok(()) } -pub async fn transfer_all( - api: &Api, - client: &Client, - from: AccountKeyring, - to: AccountKeyring, -) -> Result<()> { +pub async fn transfer_all(client: &Client, from: AccountKeyring, to: AccountKeyring) -> Result<()> { let from = PairSigner::new(from.pair()); let to = to.to_account_id(); let _events = create_block_with_extrinsic( client, - api.tx() - .balances() - .transfer_all(to.clone().into(), false)? - .create_signed(&from, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx().balances().transfer_all(to.clone().into(), false), + &from, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; @@ -94,7 +93,6 @@ pub async fn transfer_all( } pub async fn transfer_ud( - api: &Api, client: &Client, from: AccountKeyring, amount: u64, @@ -105,10 +103,15 @@ pub async fn transfer_ud( let _events = create_block_with_extrinsic( client, - api.tx() - .universal_dividend() - .transfer_ud(to.clone().into(), amount)? - .create_signed(&from, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx() + .universal_dividend() + .transfer_ud(to.clone().into(), amount), + &from, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; diff --git a/end2end-tests/tests/common/cert.rs b/end2end-tests/tests/common/cert.rs index a686cd8998731fb5d30f5c70fca3d00cbbb5c7ac..05b77d7a7f8e0f7b786de9c789d41f23b572cd01 100644 --- a/end2end-tests/tests/common/cert.rs +++ b/end2end-tests/tests/common/cert.rs @@ -14,41 +14,37 @@ // 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/>. -use super::node_runtime::runtime_types::gdev_runtime; -use super::node_runtime::runtime_types::pallet_certification; +use super::gdev; +use super::gdev::runtime_types::pallet_certification; use super::*; use sp_keyring::AccountKeyring; -use subxt::{sp_runtime::MultiAddress, PairSigner}; +use subxt::{ext::sp_runtime::MultiAddress, tx::PairSigner}; -pub async fn certify( - api: &Api, - client: &Client, - from: AccountKeyring, - to: AccountKeyring, -) -> Result<()> { +pub async fn certify(client: &Client, from: AccountKeyring, to: AccountKeyring) -> Result<()> { let signer = PairSigner::new(from.pair()); let from = from.to_account_id(); let to = to.to_account_id(); - let issuer_index = api + let issuer_index = client .storage() - .identity() - .identity_index_of(&from, None) + .fetch(&gdev::storage().identity().identity_index_of(&from), None) .await? .unwrap(); - let receiver_index = api + let receiver_index = client .storage() - .identity() - .identity_index_of(&to, None) + .fetch(&gdev::storage().identity().identity_index_of(&to), None) .await? .unwrap(); let _events = create_block_with_extrinsic( client, - api.tx() - .cert() - .add_cert(issuer_index, receiver_index)? - .create_signed(&signer, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx().cert().add_cert(issuer_index, receiver_index), + &signer, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; diff --git a/end2end-tests/tests/common/mod.rs b/end2end-tests/tests/common/mod.rs index fb464d5a71c74687a31ca8fadb8f69f3a2a11979..e9ae2cb03bd370123020c22d56a912e74675ea52 100644 --- a/end2end-tests/tests/common/mod.rs +++ b/end2end-tests/tests/common/mod.rs @@ -21,7 +21,7 @@ pub mod cert; pub mod oneshot; #[subxt::subxt(runtime_metadata_path = "../resources/metadata.scale")] -pub mod node_runtime {} +pub mod gdev {} use anyhow::anyhow; use parity_scale_codec::Encode; @@ -31,23 +31,29 @@ use std::io::prelude::*; use std::path::PathBuf; use std::process::Command; use std::str::FromStr; +use subxt::ext::{sp_core, sp_runtime}; use subxt::rpc::{rpc_params, ClientT, SubscriptionClientT}; -use subxt::{extrinsic::BaseExtrinsicParamsBuilder, ClientBuilder, DefaultConfig}; +use subxt::tx::BaseExtrinsicParamsBuilder; -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 Client = subxt::OnlineClient<GdevConfig>; +pub type Event = gdev::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, Event>; +pub type SignedSubmittableExtrinsic = subxt::tx::SignedSubmittableExtrinsic<GdevConfig, Client>; +pub type TxProgress = subxt::tx::TxProgress<GdevConfig, Client>; + +pub enum GdevConfig {} +impl subxt::config::Config for GdevConfig { + type Index = u32; + type BlockNumber = u32; + type Hash = sp_core::H256; + type Hashing = sp_runtime::traits::BlakeTwo256; + type AccountId = sp_runtime::AccountId32; + type Address = sp_runtime::MultiAddress<Self::AccountId, u32>; + type Header = sp_runtime::generic::Header<Self::BlockNumber, sp_runtime::traits::BlakeTwo256>; + type Signature = sp_runtime::MultiSignature; + type Extrinsic = sp_runtime::OpaqueExtrinsic; + type ExtrinsicParams = subxt::tx::BaseExtrinsicParams<Self, Tip>; +} #[derive(Copy, Clone, Debug, Default, Encode)] pub struct Tip { @@ -85,7 +91,7 @@ struct FullNode { ws_port: u16, } -pub async fn spawn_node(maybe_genesis_conf_file: Option<PathBuf>) -> (Api, Client, Process) { +pub async fn spawn_node(maybe_genesis_conf_file: Option<PathBuf>) -> (Client, Process) { println!("maybe_genesis_conf_file={:?}", maybe_genesis_conf_file); let duniter_binary_path = std::env::var("DUNITER_BINARY_PATH").unwrap_or_else(|_| { if std::path::Path::new(DUNITER_DOCKER_PATH).exists() { @@ -104,14 +110,11 @@ pub async fn spawn_node(maybe_genesis_conf_file: Option<PathBuf>) -> (Api, Clien &duniter_binary_path, maybe_genesis_conf_file, ); - let client = ClientBuilder::new() - .set_url(format!("ws://127.0.0.1:{}", ws_port)) - .build() + let client = Client::from_url(format!("ws://127.0.0.1:{}", ws_port)) .await .expect("fail to connect to node"); - let api = client.clone().to_runtime_api::<Api>(); - (api, client, process) + (client, process) } pub async fn create_empty_block(client: &Client) -> Result<()> { @@ -127,14 +130,17 @@ pub async fn create_empty_block(client: &Client) -> Result<()> { pub async fn create_block_with_extrinsic( client: &Client, - extrinsic: SignedSubmittableExtrinsic<'_>, -) -> Result<subxt::TransactionEvents<DefaultConfig, Event>> { + extrinsic: SignedSubmittableExtrinsic, +) -> Result<subxt::tx::TxEvents<GdevConfig>> { /*// 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(&encoded_extrinsic); + let ext_hash = <GdevConfig as subxt::Config>::Hashing::hash_of(&encoded_extrinsic); // Submit and watch for transaction progress. let sub = client.rpc().submit_extrinsic(encoded_extrinsic).await?; - let watcher = TransactionProgress::new(sub, client, ext_hash);*/ + let watcher = TxProgress::new(sub, client, ext_hash);*/ + + println!("extrinsic encoded: {}", hex::encode(extrinsic.encoded())); + let watcher = extrinsic.submit_and_watch().await?; // Create a non-empty block diff --git a/end2end-tests/tests/common/oneshot.rs b/end2end-tests/tests/common/oneshot.rs index b8827fe8858dd84edad54142c64e2a0545373577..4d545e1ea67bbdfd1d1242e3c97b28cb41235986 100644 --- a/end2end-tests/tests/common/oneshot.rs +++ b/end2end-tests/tests/common/oneshot.rs @@ -14,14 +14,14 @@ // 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/>. -use super::node_runtime::runtime_types::gdev_runtime; -use super::node_runtime::runtime_types::pallet_balances; -use super::node_runtime::runtime_types::pallet_oneshot_account; +use super::gdev; +use super::gdev::runtime_types::pallet_balances; +use super::gdev::runtime_types::pallet_oneshot_account; use super::*; use sp_keyring::AccountKeyring; use subxt::{ - sp_runtime::{AccountId32, MultiAddress}, - PairSigner, + ext::sp_runtime::{AccountId32, MultiAddress}, + tx::PairSigner, }; pub enum Account { @@ -45,7 +45,6 @@ impl Account { } pub async fn create_oneshot_account( - api: &Api, client: &Client, from: AccountKeyring, amount: u64, @@ -56,10 +55,15 @@ pub async fn create_oneshot_account( let _events = create_block_with_extrinsic( client, - api.tx() - .oneshot_account() - .create_oneshot_account(to.into(), amount)? - .create_signed(&from, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx() + .oneshot_account() + .create_oneshot_account(to.into(), amount), + &from, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; @@ -68,7 +72,6 @@ pub async fn create_oneshot_account( } pub async fn consume_oneshot_account( - api: &Api, client: &Client, from: AccountKeyring, to: Account, @@ -78,10 +81,13 @@ pub async fn consume_oneshot_account( let _events = create_block_with_extrinsic( client, - api.tx() - .oneshot_account() - .consume_oneshot_account(0, to)? - .create_signed(&from, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx().oneshot_account().consume_oneshot_account(0, to), + &from, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; @@ -91,7 +97,6 @@ pub async fn consume_oneshot_account( #[allow(clippy::too_many_arguments)] pub async fn consume_oneshot_account_with_remaining( - api: &Api, client: &Client, from: AccountKeyring, amount: u64, @@ -104,10 +109,15 @@ pub async fn consume_oneshot_account_with_remaining( let _events = create_block_with_extrinsic( client, - api.tx() - .oneshot_account() - .consume_oneshot_account_with_remaining(0, to, remaining_to, amount)? - .create_signed(&from, BaseExtrinsicParamsBuilder::new()) + client + .tx() + .create_signed( + &gdev::tx() + .oneshot_account() + .consume_oneshot_account_with_remaining(0, to, remaining_to, amount), + &from, + BaseExtrinsicParamsBuilder::new(), + ) .await?, ) .await?; diff --git a/end2end-tests/tests/cucumber_tests.rs b/end2end-tests/tests/cucumber_tests.rs index 303787361b6d295853c0458e31989c3ef4dcd912..f65142545775c92d7785ad5e1586b783b6493ec8 100644 --- a/end2end-tests/tests/cucumber_tests.rs +++ b/end2end-tests/tests/cucumber_tests.rs @@ -53,13 +53,6 @@ impl DuniterWorld { self.ignore_errors = ignore_errors; } // Read methods - fn api(&self) -> &Api { - if let Some(ref inner) = self.inner { - &inner.api - } else { - panic!("uninit") - } - } fn client(&self) -> &Client { if let Some(ref inner) = self.inner { &inner.client @@ -70,6 +63,39 @@ impl DuniterWorld { fn ignore_errors(&self) -> bool { self.ignore_errors } + // Read storage entry on last block + fn read<'a, Address>( + &self, + address: &'a Address, + ) -> impl std::future::Future< + Output = std::result::Result< + Option<<Address::Target as subxt::metadata::DecodeWithMetadata>::Target>, + subxt::error::Error, + >, + > + 'a + where + Address: subxt::storage::StorageAddress<IsFetchable = subxt::storage::address::Yes> + 'a, + { + self.client().storage().fetch(address, None) + } + // Read storage entry with default value (on last block) + fn read_or_default<'a, Address>( + &self, + address: &'a Address, + ) -> impl std::future::Future< + Output = std::result::Result< + <Address::Target as subxt::metadata::DecodeWithMetadata>::Target, + subxt::error::Error, + >, + > + 'a + where + Address: subxt::storage::StorageAddress< + IsFetchable = subxt::storage::address::Yes, + IsDefaultable = subxt::storage::address::Yes, + > + 'a, + { + self.client().storage().fetch_or_default(address, None) + } } impl std::fmt::Debug for DuniterWorld { @@ -92,19 +118,14 @@ impl World for DuniterWorld { } struct DuniterWorldInner { - api: Api, client: Client, process: Process, } impl DuniterWorldInner { async fn new(maybe_genesis_conf_file: Option<PathBuf>) -> Self { - let (api, client, process) = spawn_node(maybe_genesis_conf_file).await; - DuniterWorldInner { - api, - client, - process, - } + let (client, process) = spawn_node(maybe_genesis_conf_file).await; + DuniterWorldInner { client, process } } fn kill(&mut self) { self.process.kill(); @@ -131,16 +152,14 @@ async fn who_have(world: &mut DuniterWorld, who: String, amount: u64, unit: Stri if is_ud { let current_ud_amount = world - .api() - .storage() - .universal_dividend() - .current_ud(None) - .await?; + .read(&gdev::storage().universal_dividend().current_ud()) + .await? + .unwrap_or_default(); amount = (amount * current_ud_amount) / 1_000; } // Create {amount} ÄžD for {who} - common::balances::set_balance(world.api(), world.client(), who, amount).await?; + common::balances::set_balance(world.client(), who, amount).await?; Ok(()) } @@ -169,9 +188,9 @@ async fn transfer( let (amount, is_ud) = parse_amount(amount, &unit); let res = if is_ud { - common::balances::transfer_ud(world.api(), world.client(), from, amount, to).await + common::balances::transfer_ud(world.client(), from, amount, to).await } else { - common::balances::transfer(world.api(), world.client(), from, amount, to).await + common::balances::transfer(world.client(), from, amount, to).await }; if world.ignore_errors() { @@ -196,7 +215,7 @@ async fn create_oneshot_account( assert!(!is_ud); - common::oneshot::create_oneshot_account(world.api(), world.client(), from, amount, to).await + common::oneshot::create_oneshot_account(world.client(), from, amount, to).await } #[when(regex = r"oneshot ([a-zA-Z]+) consumes? into (oneshot|account) ([a-zA-Z]+)")] @@ -215,7 +234,7 @@ async fn consume_oneshot_account( _ => unreachable!(), }; - common::oneshot::consume_oneshot_account(world.api(), world.client(), from, to).await + common::oneshot::consume_oneshot_account(world.client(), from, to).await } #[when( @@ -251,7 +270,6 @@ async fn consume_oneshot_account_with_remaining( assert!(!is_ud); common::oneshot::consume_oneshot_account_with_remaining( - world.api(), world.client(), from, amount, @@ -267,7 +285,7 @@ async fn send_all_to(world: &mut DuniterWorld, from: String, to: String) -> Resu let from = AccountKeyring::from_str(&from).expect("unknown from"); let to = AccountKeyring::from_str(&to).expect("unknown to"); - common::balances::transfer_all(world.api(), world.client(), from, to).await + common::balances::transfer_all(world.client(), from, to).await } #[when(regex = r"([a-zA-Z]+) certifies ([a-zA-Z]+)")] @@ -276,7 +294,7 @@ async fn certifies(world: &mut DuniterWorld, from: String, to: String) -> Result let from = AccountKeyring::from_str(&from).expect("unknown from"); let to = AccountKeyring::from_str(&to).expect("unknown to"); - common::cert::certify(world.api(), world.client(), from, to).await + common::cert::certify(world.client(), from, to).await } // ===== then ==== @@ -294,7 +312,9 @@ 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 + .read_or_default(&gdev::storage().system().account(&who)) + .await?; assert_eq!(who_account.data.free, amount); Ok(()) } @@ -313,10 +333,7 @@ async fn should_have_oneshot( let (amount, _is_ud) = parse_amount(amount, &unit); let oneshot_amount = world - .api() - .storage() - .oneshot_account() - .oneshot_accounts(&who, None) + .read(&gdev::storage().oneshot_account().oneshot_accounts(&who)) .await?; assert_eq!(oneshot_amount.unwrap_or(0), amount); Ok(()) @@ -330,10 +347,7 @@ async fn current_ud_amount_should_be( ) -> Result<()> { let expected = (amount * 100) + cents; let actual = world - .api() - .storage() - .universal_dividend() - .current_ud(None) + .read_or_default(&gdev::storage().universal_dividend().current_ud()) .await?; assert_eq!(actual, expected); Ok(()) @@ -343,10 +357,7 @@ async fn current_ud_amount_should_be( async fn monetary_mass_should_be(world: &mut DuniterWorld, amount: u64, cents: u64) -> Result<()> { let expected = (amount * 100) + cents; let actual = world - .api() - .storage() - .universal_dividend() - .monetary_mass(None) + .read_or_default(&gdev::storage().universal_dividend().monetary_mass()) .await?; assert_eq!(actual, expected); Ok(()) @@ -367,25 +378,24 @@ async fn should_be_certified_by( .to_account_id(); let issuer_index = world - .api() - .storage() - .identity() - .identity_index_of(&issuer_account, None) + .read( + &gdev::storage() + .identity() + .identity_index_of(&issuer_account), + ) .await? .unwrap(); let receiver_index = world - .api() - .storage() - .identity() - .identity_index_of(&receiver_account, None) + .read( + &gdev::storage() + .identity() + .identity_index_of(&receiver_account), + ) .await? .unwrap(); let issuers = world - .api() - .storage() - .cert() - .certs_by_receiver(&receiver_index, None) + .read_or_default(&gdev::storage().cert().certs_by_receiver(&receiver_index)) .await?; match issuers.binary_search_by(|(issuer_, _)| issuer_index.cmp(issuer_)) { diff --git a/live-tests/Cargo.toml b/live-tests/Cargo.toml index 46484cc82e79568c9a09da6f60e6bf1784248bed..a9eac55086ff66582c808bc91b78e5a253bb8cd6 100644 --- a/live-tests/Cargo.toml +++ b/live-tests/Cargo.toml @@ -12,6 +12,6 @@ version = '3.0.0' anyhow = "1.0" hex-literal = "0.3" parity-scale-codec = "3.1.5" -sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23' } -subxt = { git = 'https://github.com/duniter/subxt', branch = 'duniter-substrate-v0.9.23' } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +subxt = { git = 'https://github.com/duniter/subxt', branch = 'duniter-substrate-v0.9.26' } tokio = { version = "1.15.0", features = ["macros"] } diff --git a/live-tests/tests/sanity_gdev.rs b/live-tests/tests/sanity_gdev.rs index 6ea2b38acbb30b81ea833578433a9984a5abe71e..b460968046efc7330c33e0098d01a0cddda32df9 100644 --- a/live-tests/tests/sanity_gdev.rs +++ b/live-tests/tests/sanity_gdev.rs @@ -15,22 +15,20 @@ // along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. #[subxt::subxt(runtime_metadata_path = "../resources/metadata.scale")] -pub mod gdev_runtime {} +pub mod gdev {} use hex_literal::hex; use sp_core::crypto::AccountId32; use sp_core::{blake2_128, ByteArray, H256}; use std::collections::HashMap; -use subxt::{extrinsic::PlainTip, ClientBuilder, DefaultConfig}; +use subxt::config::SubstrateConfig as GdevConfig; const DEFAULT_ENDPOINT: &str = "wss://gdev.librelois.fr:443/ws"; const TREASURY_ACCOUNT_ID: [u8; 32] = hex!("6d6f646c70792f74727372790000000000000000000000000000000000000000"); -type Api = gdev_runtime::RuntimeApi<DefaultConfig, BaseExtrinsicParams<DefaultConfig>>; -type BaseExtrinsicParams<T> = subxt::extrinsic::BaseExtrinsicParams<T, PlainTip>; -type Client = subxt::Client<DefaultConfig>; +type Client = subxt::OnlineClient<GdevConfig>; // define gdev basic types type Balance = u64; @@ -38,18 +36,15 @@ type BlockNumber = u32; type Index = u32; // Define gdev types -type AccountInfo = gdev_runtime::runtime_types::frame_system::AccountInfo< +type AccountInfo = gdev::runtime_types::frame_system::AccountInfo< Index, - gdev_runtime::runtime_types::pallet_duniter_account::types::AccountData<Balance>, + gdev::runtime_types::pallet_duniter_account::types::AccountData<Balance>, >; -type IdtyData = gdev_runtime::runtime_types::common_runtime::entities::IdtyData; +type IdtyData = gdev::runtime_types::common_runtime::entities::IdtyData; type IdtyIndex = u32; -type IdtyValue = gdev_runtime::runtime_types::pallet_identity::types::IdtyValue< - BlockNumber, - AccountId32, - IdtyData, ->; -use gdev_runtime::runtime_types::pallet_identity::types::IdtyStatus; +type IdtyValue = + gdev::runtime_types::pallet_identity::types::IdtyValue<BlockNumber, AccountId32, IdtyData>; +use gdev::runtime_types::pallet_identity::types::IdtyStatus; struct Storage { accounts: HashMap<AccountId32, AccountInfo>, @@ -61,10 +56,7 @@ struct Storage { async fn main() -> anyhow::Result<()> { let ws_rpc_endpoint = std::env::var("WS_RPC_ENDPOINT").unwrap_or_else(|_| DEFAULT_ENDPOINT.to_owned()); - let client: Client = ClientBuilder::new() - .set_url(ws_rpc_endpoint) - .set_page_size(100) - .build() + let client = Client::from_url(ws_rpc_endpoint) .await .expect("fail to connect to node"); @@ -81,17 +73,17 @@ async fn main() -> anyhow::Result<()> { } async fn sanity_tests_at(client: Client, maybe_block_hash: Option<H256>) -> anyhow::Result<()> { - // Get API - let api = client.clone().to_runtime_api::<Api>(); - // ===== Collect storage ===== // // Collect accounts let mut accounts = HashMap::new(); - let mut account_iter = api + let mut account_iter = client .storage() - .system() - .account_iter(maybe_block_hash) + .iter( + gdev::storage().system().account_root(), + 100, + maybe_block_hash, + ) .await?; while let Some((key, account_info)) = account_iter.next().await? { let mut account_id_bytes = [0u8; 32]; @@ -102,10 +94,13 @@ async fn sanity_tests_at(client: Client, maybe_block_hash: Option<H256>) -> anyh // Collect identities let mut identities = HashMap::new(); - let mut idty_iter = api + let mut idty_iter = client .storage() - .identity() - .identities_iter(maybe_block_hash) + .iter( + gdev::storage().identity().identities_root(), + 100, + maybe_block_hash, + ) .await?; while let Some((key, idty_value)) = idty_iter.next().await? { let mut idty_index_bytes = [0u8; 4]; @@ -116,10 +111,13 @@ async fn sanity_tests_at(client: Client, maybe_block_hash: Option<H256>) -> anyh // Collect identity_index_of let mut identity_index_of = HashMap::new(); - let mut idty_index_of_iter = api + let mut idty_index_of_iter = client .storage() - .identity() - .identity_index_of_iter(maybe_block_hash) + .iter( + gdev::storage().identity().identity_index_of_root(), + 100, + maybe_block_hash, + ) .await?; while let Some((key, idty_index)) = idty_index_of_iter.next().await? { let mut blake2_128_bytes = [0u8; 16]; diff --git a/node/specs/gdev-raw.json b/node/specs/gdev-raw.json index df1201055983251724f510df1c4e8edb39d68f56..3c81832b1c441d270660a8d3e1eb75b84a95b338 100644 --- a/node/specs/gdev-raw.json +++ b/node/specs/gdev-raw.json @@ -1,6 +1,7 @@ { "bootNodes": [ - "/dns/gdev.elo.tf/tcp/30333/p2p/12D3KooWJoNxU9NKHr7y5pmWYW1LLbMrBMTnEzhm7n9mpbKrt45B" + "/dns/gdev.elo.tf/tcp/30333/p2p/12D3KooWJoNxU9NKHr7y5pmWYW1LLbMrBMTnEzhm7n9mpbKrt45B", + "/dns/gdev.librelois.fr/tcp/30334/p2p/12D3KooWMb8hmxdtBQhGLB8caokbAZQ3YokN9erMe6oAEsPDrwYf" ], "chainType": "Live", "codeSubstitutes": {}, diff --git a/pallets/authority-members/Cargo.toml b/pallets/authority-members/Cargo.toml index 42bc87d48736f12731a736ba325c71c111cd902d..46b332a7de215e6b0407a48c787a0f29b577d99d 100644 --- a/pallets/authority-members/Cargo.toml +++ b/pallets/authority-members/Cargo.toml @@ -46,23 +46,23 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.serde] version = "1.0.101" @@ -72,22 +72,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-staking] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -104,4 +104,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/certification/Cargo.toml b/pallets/certification/Cargo.toml index 4a27c25d2ff3cbab3fcd21eb97afe20bf4459987..f7aff3249b7e2ce242c6763d44f40574b3227b82 100644 --- a/pallets/certification/Cargo.toml +++ b/pallets/certification/Cargo.toml @@ -39,17 +39,17 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.serde] version = "1.0.101" @@ -59,17 +59,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -86,4 +86,4 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/duniter-account/Cargo.toml b/pallets/duniter-account/Cargo.toml index 75e07004d6f4453b8e3a1a47af9afe1095d108d1..6bc1c7dfa4806621071f8971181f9e9df4158dc3 100644 --- a/pallets/duniter-account/Cargo.toml +++ b/pallets/duniter-account/Cargo.toml @@ -42,27 +42,27 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.pallet-balances] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.pallet-treasury] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.serde] version = "1.0.101" @@ -72,22 +72,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -98,7 +98,7 @@ targets = ['x86_64-unknown-linux-gnu'] [dev-dependencies.pallet-balances] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dev-dependencies.maplit] version = '1.0.2' @@ -108,4 +108,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/duniter-test-parameters/Cargo.toml b/pallets/duniter-test-parameters/Cargo.toml index 320bab484c27c047bb2bc0a229c648a0d16112b7..0177feb5cf0b6e12ab88a150409080164c40f1c9 100644 --- a/pallets/duniter-test-parameters/Cargo.toml +++ b/pallets/duniter-test-parameters/Cargo.toml @@ -39,32 +39,32 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### diff --git a/pallets/duniter-wot/Cargo.toml b/pallets/duniter-wot/Cargo.toml index a14e0b98d39ddbe7d7e73123817f41d87ec89f79..1f631fece01a7247de2d6eef544b45becaf2014f 100644 --- a/pallets/duniter-wot/Cargo.toml +++ b/pallets/duniter-wot/Cargo.toml @@ -48,17 +48,17 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.serde] version = "1.0.101" @@ -68,22 +68,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -96,4 +96,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/identity/Cargo.toml b/pallets/identity/Cargo.toml index 4144dce3590c576a55e1c0ce69c0293d5d434f82..8c6b7d95202239cd9d1087f0b756aaef97d5fd3e 100644 --- a/pallets/identity/Cargo.toml +++ b/pallets/identity/Cargo.toml @@ -41,33 +41,33 @@ serde = { version = "1.0.101", features = ["derive"], optional = true } default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dev-dependencies] serde = '1.0.119' -sp-io = { 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.26' } diff --git a/pallets/membership/Cargo.toml b/pallets/membership/Cargo.toml index dbfc3d454a3931c96817b3986a0b17309f7d71d1..2f3ae62e5a98a49392b2c8770981b5567e13d531 100644 --- a/pallets/membership/Cargo.toml +++ b/pallets/membership/Cargo.toml @@ -41,17 +41,17 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.serde] version = "1.0.101" @@ -61,17 +61,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -88,4 +88,4 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/oneshot-account/Cargo.toml b/pallets/oneshot-account/Cargo.toml index cde1128d8733d39a5a64d90f3af6bd05fa607036..5b011dcd99696730bcbe7f443a013eb878cea615 100644 --- a/pallets/oneshot-account/Cargo.toml +++ b/pallets/oneshot-account/Cargo.toml @@ -34,49 +34,49 @@ log = { version = "0.4.14", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # benchmarks -pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', optional = true, default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true, default-features = false } # substrate [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -87,8 +87,8 @@ targets = ['x86_64-unknown-linux-gnu'] [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dev-dependencies.pallet-balances] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/oneshot-account/src/mock.rs b/pallets/oneshot-account/src/mock.rs index 35b69d7ae55d610f3db44d9b5d3b8752f64e6e00..c5d7766082c42c58b652725a45be45cfecde784b 100644 --- a/pallets/oneshot-account/src/mock.rs +++ b/pallets/oneshot-account/src/mock.rs @@ -39,7 +39,7 @@ frame_support::construct_runtime!( { System: frame_system::{Pallet, Call, Config, Storage, Event<T>}, Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>}, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>}, OneshotAccount: pallet_oneshot_account::{Pallet, Call, Storage, Event<T>}, } ); @@ -93,6 +93,7 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = [u8; 8]; } impl pallet_transaction_payment::Config for Test { + type Event = Event; type OnChargeTransaction = OneshotAccount; type OperationalFeeMultiplier = frame_support::traits::ConstU8<5>; type WeightToFee = IdentityFee<u64>; diff --git a/pallets/provide-randomness/Cargo.toml b/pallets/provide-randomness/Cargo.toml index 73b76a62b43ffd767fc0c4a55c49500ca57368ef..f076e6e513b36f775e35e78e17451081f3b9e16f 100644 --- a/pallets/provide-randomness/Cargo.toml +++ b/pallets/provide-randomness/Cargo.toml @@ -37,37 +37,37 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-core] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### diff --git a/pallets/universal-dividend/Cargo.toml b/pallets/universal-dividend/Cargo.toml index 3671e75d9ef983e2d91648df7aafe196d888062d..f6f539310420a5c75e6540708ab59c582a4cfee8 100644 --- a/pallets/universal-dividend/Cargo.toml +++ b/pallets/universal-dividend/Cargo.toml @@ -33,38 +33,38 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" serde = { version = "1.0.101", features = ["derive"], optional = true } # substrate bencharks -frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.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 } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true, default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true, default-features = false } [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### @@ -79,16 +79,16 @@ serde = { version = "1.0.101", features = ["derive"] } [dev-dependencies.pallet-balances] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dev-dependencies.sp-core] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dev-dependencies.sp-io] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dev-dependencies.sp-runtime] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' diff --git a/pallets/upgrade-origin/Cargo.toml b/pallets/upgrade-origin/Cargo.toml index 3d1dcf1c1b727b2475b99838716b74ccd29e37b7..9dd1354dc2e8235b39794c272b7677cd201d974f 100644 --- a/pallets/upgrade-origin/Cargo.toml +++ b/pallets/upgrade-origin/Cargo.toml @@ -36,32 +36,32 @@ version = "3.1.5" default-features = false git = 'https://github.com/duniter/substrate' optional = true -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.frame-system] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-io] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### diff --git a/primitives/duniter/Cargo.toml b/primitives/duniter/Cargo.toml index fddb69c8bf40f629980a1f479d5c81bdb42e8e71..2faec80d2ebde1046ed354086b9efebff6f722d9 100644 --- a/primitives/duniter/Cargo.toml +++ b/primitives/duniter/Cargo.toml @@ -33,17 +33,17 @@ version = "3.1.5" [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### diff --git a/primitives/membership/Cargo.toml b/primitives/membership/Cargo.toml index d4682b66c6f151e04b38a0dabeadc85cf23b0505..07a9662756fef19f5a58d9da668033c173b841c9 100644 --- a/primitives/membership/Cargo.toml +++ b/primitives/membership/Cargo.toml @@ -34,7 +34,7 @@ version = "3.1.5" [dependencies.frame-support] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.serde] version = "1.0.101" @@ -44,12 +44,12 @@ features = ["derive"] [dependencies.sp-runtime] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [dependencies.sp-std] default-features = false git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' ### DOC ### diff --git a/resources/metadata.scale b/resources/metadata.scale index 10f4232185e31dcb87b88cd33a9731c8efca1265..ff4c1c40a4d58bf8b3d8dc74373830583ef1ddbb 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 660fa3223c3eac2d4ee2c656df6ca823b0ed5e83..a4685b21bdeb8eefd696b83106d3ad4beb53afd9 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -84,27 +84,27 @@ serde_derive = { version = "1.0.101", optional = true } smallvec = "1.6.1" # Substrate -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 } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } # substrate benchmarks -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 } +frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } # TODO: there is a bad coupling in substrate that force to add this dependency -sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.23', default-features = false } +sp-staking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs index 10f5feb5c8acb22c21b1147501cb22d83a6f9185..45d53fa5437a9741b5b5541c9c9264fec0d5e2df 100644 --- a/runtime/common/src/pallets_config.rs +++ b/runtime/common/src/pallets_config.rs @@ -175,6 +175,7 @@ macro_rules! pallets_config { } pub struct OnChargeTransaction; impl pallet_transaction_payment::Config for Runtime { + type Event = Event; type OnChargeTransaction = OneshotAccount; type OperationalFeeMultiplier = frame_support::traits::ConstU8<5>; type WeightToFee = common_runtime::fees::WeightToFeeImpl<Balance>; @@ -387,6 +388,7 @@ macro_rules! pallets_config { type RejectOrigin = TreasuryRejectOrigin; type SpendFunds = TreasurySpendFunds<Self>; type SpendPeriod = SpendPeriod; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>; type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>; } diff --git a/runtime/g1/Cargo.toml b/runtime/g1/Cargo.toml index 2ce176950be39d8c872d6f8aac56e7f9dd0c8f06..36fab9f718f1b5c849966184a9b3047345827fd4 100644 --- a/runtime/g1/Cargo.toml +++ b/runtime/g1/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -103,10 +103,10 @@ try-runtime = [ ] [dev-dependencies] -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' } +sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } [dependencies] # local @@ -132,43 +132,43 @@ 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/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 } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-offences = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs index a944041c72c15722b42f318dd04e663316614b80..00ca24a424feacc758fefa9d72daae9e5b280d5c 100644 --- a/runtime/g1/src/lib.rs +++ b/runtime/g1/src/lib.rs @@ -214,7 +214,7 @@ construct_runtime!( // Money management Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 6, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 32, OneshotAccount: pallet_oneshot_account::{Pallet, Call, Storage, Event<T>} = 7, // Consensus support. diff --git a/runtime/gdev/Cargo.toml b/runtime/gdev/Cargo.toml index 77ff1f259b8350a6314cc04ae4da8812093863f5..6f10b69d55f6ef6d709ffcce302ea290f4f88fe5 100644 --- a/runtime/gdev/Cargo.toml +++ b/runtime/gdev/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -126,10 +126,10 @@ try-runtime = [ ] [dev-dependencies] -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' } +sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } [dependencies] # local @@ -156,45 +156,45 @@ serde = { version = "1.0.101", default-features = false } serde_derive = { version = "1.0.101", optional = true } # substrate -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 } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-offences = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } # substrate benchmarking -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 } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index 1c494414a5154922bec981e47ca84aeadc6a9445..e010fc67c60d1ca5231a3f51791c56a7553e8026 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -283,7 +283,7 @@ construct_runtime!( // Money management Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 6, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 32, OneshotAccount: pallet_oneshot_account::{Pallet, Call, Storage, Event<T>} = 7, // Consensus support diff --git a/runtime/gtest/Cargo.toml b/runtime/gtest/Cargo.toml index 4d40f3b25d5cd06ab13eb7cc12853abddfaccab9..b7a0f29b5665db666fff43efc96a9f53376c3293 100644 --- a/runtime/gtest/Cargo.toml +++ b/runtime/gtest/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/duniter/substrate' -branch = 'duniter-substrate-v0.9.23' +branch = 'duniter-substrate-v0.9.26' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -103,10 +103,10 @@ try-runtime = [ ] [dev-dependencies] -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' } +sp-consensus-vrf = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-finality-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-io = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } +sp-keyring = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26' } [dependencies] # local @@ -132,43 +132,43 @@ 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/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 } +frame-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true } +frame-try-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false, optional = true } +frame-executive = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-support = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false} +pallet-atomic-swap = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-authorship = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-balances = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-collective = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-grandpa = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-im-online = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-offences = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-multisig = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-preimage = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-proxy = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-sudo = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +pallet-utility = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-api = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-arithmetic = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-authority-discovery = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-block-builder = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-consensus-babe = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-inherents = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-offchain = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-session = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-transaction-pool = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } +sp-version = { git = 'https://github.com/duniter/substrate', branch = 'duniter-substrate-v0.9.26', default-features = false } diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs index efb4fb2f48631cea8b5bc0c820e84502275be3f1..8ea705ef6d7d853c2b439ad111afb1a5b4784dd5 100644 --- a/runtime/gtest/src/lib.rs +++ b/runtime/gtest/src/lib.rs @@ -215,7 +215,7 @@ construct_runtime!( // Money management Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 6, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 32, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 32, OneshotAccount: pallet_oneshot_account::{Pallet, Call, Storage, Event<T>} = 7, // Consensus support.