From 3a3150b1e687c1f38ed4fa3322859c84fca7d1fe Mon Sep 17 00:00:00 2001 From: librelois <c@elo.tf> Date: Sat, 5 Feb 2022 22:28:21 +0100 Subject: [PATCH] deps: upgrade substrate to monthly-2022-02 --- Cargo.lock | 560 +++++++++++---------- Cargo.toml | 88 ++-- end2end-tests/Cargo.toml | 4 +- node/build.rs | 64 ++- node/src/chain_spec/gdev.rs | 6 + node/src/chain_spec/gtest.rs | 4 + node/src/cli.rs | 45 +- node/src/command.rs | 10 +- node/src/{cli => command}/key.rs | 13 +- node/src/{cli => command}/utils.rs | 9 +- node/src/lib.rs | 1 + node/src/main.rs | 3 +- node/src/service.rs | 17 +- pallets/authority-members/Cargo.toml | 18 +- pallets/authority-members/src/lib.rs | 1 + pallets/certification/Cargo.toml | 14 +- pallets/certification/src/lib.rs | 1 + pallets/duniter-test-parameters/Cargo.toml | 12 +- pallets/duniter-test-parameters/src/lib.rs | 1 + pallets/duniter-wot/Cargo.toml | 16 +- pallets/duniter-wot/src/lib.rs | 1 + pallets/identity/Cargo.toml | 14 +- pallets/identity/src/lib.rs | 1 + pallets/membership/Cargo.toml | 14 +- pallets/membership/src/lib.rs | 1 + pallets/ud-accounts-storage/Cargo.toml | 16 +- pallets/ud-accounts-storage/src/lib.rs | 33 +- pallets/universal-dividend/Cargo.toml | 22 +- pallets/universal-dividend/src/lib.rs | 32 +- primitives/membership/Cargo.toml | 6 +- runtime/common/Cargo.toml | 20 +- runtime/g1/Cargo.toml | 74 +-- runtime/gdev/Cargo.toml | 74 +-- runtime/gtest/Cargo.toml | 74 +-- rust-toolchain | 2 +- 35 files changed, 676 insertions(+), 595 deletions(-) rename node/src/{cli => command}/key.rs (95%) rename node/src/{cli => command}/utils.rs (93%) diff --git a/Cargo.lock b/Cargo.lock index a66e22157..208e3b243 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,15 +82,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ansi_term" version = "0.12.1" @@ -543,6 +534,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03588e54c62ae6d763e2a80090d50353b785795361b4ff5b3bf0a5097fc31c0b" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -793,21 +793,6 @@ dependencies = [ "libloading 0.7.0", ] -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term 0.11.0", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - [[package]] name = "clap" version = "3.0.6" @@ -820,7 +805,7 @@ dependencies = [ "indexmap", "lazy_static", "os_str_bytes", - "strsim 0.10.0", + "strsim", "termcolor", "textwrap 0.14.2", ] @@ -960,6 +945,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -1027,7 +1021,7 @@ checksum = "684af0e63387e834c0dd72f6e9dabc387c215e36b7528f8b0467ad08904344ce" dependencies = [ "async-trait", "atty", - "clap 3.0.6", + "clap", "console", "cucumber-codegen", "cucumber-expressions", @@ -1119,7 +1113,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn", ] @@ -1202,6 +1196,17 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.1", + "crypto-common", + "generic-array 0.14.4", +] + [[package]] name = "directories" version = "4.0.1" @@ -1249,6 +1254,7 @@ name = "duniter" version = "3.0.0" dependencies = [ "async-io", + "clap", "common-runtime", "frame-benchmarking", "frame-benchmarking-cli", @@ -1304,7 +1310,6 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "sp-trie", - "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", ] @@ -1487,7 +1492,7 @@ checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "num-traits", "parity-scale-codec", @@ -1535,7 +1540,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", ] @@ -1553,7 +1558,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -1574,10 +1579,11 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "Inflector", "chrono", + "clap", "frame-benchmarking", "frame-support", "handlebars", @@ -1594,13 +1600,12 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", - "structopt", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -1628,7 +1633,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "bitflags", "frame-metadata", @@ -1657,7 +1662,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1669,7 +1674,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -1681,7 +1686,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "proc-macro2", "quote", @@ -1691,7 +1696,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "log", @@ -1708,7 +1713,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-benchmarking", "frame-support", @@ -1723,7 +1728,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "sp-api", @@ -1902,12 +1907,6 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" -[[package]] -name = "futures-timer" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" - [[package]] name = "futures-timer" version = "3.0.2" @@ -2647,16 +2646,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "intervalier" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" -dependencies = [ - "futures 0.3.19", - "futures-timer 2.0.2", -] - [[package]] name = "inventory" version = "0.2.1" @@ -2874,7 +2863,7 @@ dependencies = [ [[package]] name = "jsonrpsee" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -2887,7 +2876,7 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "futures 0.3.19", "http", @@ -2907,7 +2896,7 @@ dependencies = [ [[package]] name = "jsonrpsee-core" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "anyhow", "arrayvec 0.7.1", @@ -2929,7 +2918,7 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "async-trait", "hyper", @@ -2947,7 +2936,7 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -2958,7 +2947,7 @@ dependencies = [ [[package]] name = "jsonrpsee-types" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "anyhow", "beef", @@ -2971,7 +2960,7 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" version = "0.8.0" -source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-01#b038aa331e0cd10723512eeb22c8049357606866" +source = "git+https://github.com/librelois/jsonrpsee/?branch=duniter-monthly-2022-02#b038aa331e0cd10723512eeb22c8049357606866" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -3139,7 +3128,7 @@ dependencies = [ "either", "fnv", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "lazy_static", "libsecp256k1", "log", @@ -3403,7 +3392,7 @@ dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", @@ -3492,7 +3481,7 @@ checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" dependencies = [ "async-io", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "if-watch", "ipnet", "libc", @@ -4284,7 +4273,7 @@ dependencies = [ [[package]] name = "pallet-atomic-swap" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4299,7 +4288,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4335,7 +4324,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4350,7 +4339,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-benchmarking", "frame-support", @@ -4374,7 +4363,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-benchmarking", "frame-support", @@ -4452,7 +4441,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-benchmarking", "frame-support", @@ -4492,7 +4481,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4529,7 +4518,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4543,7 +4532,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4559,7 +4548,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4573,7 +4562,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4588,7 +4577,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4609,7 +4598,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4623,7 +4612,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-benchmarking", "frame-support", @@ -4641,7 +4630,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -4658,7 +4647,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4675,7 +4664,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4721,7 +4710,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-support", "frame-system", @@ -5013,18 +5002,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -5170,9 +5159,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -5244,17 +5233,6 @@ dependencies = [ "prost", ] -[[package]] -name = "pwasm-utils" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c" -dependencies = [ - "byteorder", - "log", - "parity-wasm 0.42.2", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -5625,6 +5603,12 @@ dependencies = [ "base64", ] +[[package]] +name = "rustversion" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" + [[package]] name = "rusty-hook" version = "0.11.2" @@ -5674,7 +5658,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "log", "sp-core", @@ -5685,10 +5669,10 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sc-block-builder", @@ -5708,7 +5692,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5724,7 +5708,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -5741,7 +5725,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5752,9 +5736,10 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "chrono", + "clap", "fdlimit", "futures 0.3.19", "hex", @@ -5781,7 +5766,6 @@ dependencies = [ "sp-panic-handler", "sp-runtime", "sp-version", - "structopt", "thiserror", "tiny-bip39", "tokio", @@ -5790,7 +5774,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "fnv", "futures 0.3.19", @@ -5818,7 +5802,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "hash-db", "kvdb", @@ -5843,11 +5827,11 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "libp2p", "log", "parking_lot", @@ -5864,13 +5848,41 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-consensus-aura" +version = "0.10.0-dev" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" +dependencies = [ + "async-trait", + "futures 0.3.19", + "log", + "parity-scale-codec", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-consensus-slots", + "sc-telemetry", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "substrate-prometheus-endpoint", + "thiserror", +] + [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", - "derive_more", "fork-tree", "futures 0.3.19", "log", @@ -5905,12 +5917,13 @@ dependencies = [ "sp-runtime", "sp-version", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "fork-tree", "parity-scale-codec", @@ -5923,11 +5936,10 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "assert_matches", "async-trait", - "derive_more", "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", @@ -5936,6 +5948,7 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-consensus", + "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-epochs", "sc-transaction-pool", @@ -5944,6 +5957,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-slots", "sp-core", @@ -5952,16 +5966,17 @@ dependencies = [ "sp-runtime", "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sc-client-api", @@ -5982,7 +5997,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "sc-client-api", "sp-authorship", @@ -5993,7 +6008,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "lazy_static", "libsecp256k1", @@ -6020,25 +6035,24 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ - "derive_more", "environmental", "parity-scale-codec", - "pwasm-utils", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", "sp-serializer", "sp-wasm-interface", "thiserror", + "wasm-instrument", "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "log", "parity-scale-codec", @@ -6054,20 +6068,20 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", - "derive_more", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "parking_lot", "rand 0.8.4", "sc-block-builder", + "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-keystore", @@ -6086,16 +6100,17 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-util-mem", "sc-client-api", @@ -6108,22 +6123,22 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", - "derive_more", "hex", "parking_lot", "serde_json", "sp-application-crypto", "sp-core", "sp-keystore", + "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-std", "async-trait", @@ -6131,12 +6146,11 @@ dependencies = [ "bitflags", "bytes 1.1.0", "cid", - "derive_more", "either", "fnv", "fork-tree", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "hex", "ip_network", "libp2p", @@ -6174,10 +6188,10 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "libp2p", "log", "lru 0.7.2", @@ -6190,12 +6204,12 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "bytes 1.1.0", "fnv", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "hex", "hyper", "hyper-rustls 0.22.1", @@ -6218,7 +6232,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", "libp2p", @@ -6231,7 +6245,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6240,7 +6254,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", "hash-db", @@ -6271,7 +6285,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -6296,7 +6310,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -6313,13 +6327,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "directories", "exit-future", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -6377,7 +6391,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "log", "parity-scale-codec", @@ -6391,7 +6405,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "chrono", "futures 0.3.19", @@ -6409,9 +6423,9 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "atty", "chrono", "lazy_static", @@ -6440,7 +6454,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -6451,10 +6465,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", - "intervalier", + "futures-timer", "linked-hash-map", "log", "parity-scale-codec", @@ -6478,9 +6492,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ - "derive_more", "futures 0.3.19", "log", "serde", @@ -6492,11 +6505,12 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "lazy_static", + "parking_lot", "prometheus", ] @@ -6753,6 +6767,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.1", + "digest 0.10.1", +] + [[package]] name = "sha3" version = "0.9.1" @@ -6893,7 +6918,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "hash-db", "log", @@ -6910,7 +6935,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -6922,7 +6947,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "scale-info", @@ -6935,7 +6960,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "integer-sqrt", "num-traits", @@ -6950,7 +6975,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "scale-info", @@ -6963,7 +6988,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "parity-scale-codec", @@ -6975,7 +7000,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "sp-api", @@ -6987,7 +7012,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", "log", @@ -7005,11 +7030,11 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -7021,10 +7046,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sp-consensus-aura" +version = "0.10.0-dev" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-consensus", + "sp-consensus-slots", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-timestamp", +] + [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "merlin", @@ -7047,7 +7090,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "scale-info", @@ -7059,7 +7102,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7071,7 +7114,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "base58", "bitflags", @@ -7099,7 +7142,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.9", + "sha2 0.10.1", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -7119,11 +7162,11 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "blake2-rfc", "byteorder", - "sha2 0.9.9", + "sha2 0.10.1", "sp-std", "tiny-keccak", "twox-hash", @@ -7132,7 +7175,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "proc-macro2", "quote", @@ -7143,7 +7186,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "kvdb", "parking_lot", @@ -7152,7 +7195,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "proc-macro2", "quote", @@ -7162,7 +7205,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "environmental", "parity-scale-codec", @@ -7173,7 +7216,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "finality-grandpa", "log", @@ -7191,7 +7234,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -7205,7 +7248,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "futures 0.3.19", "hash-db", @@ -7228,8 +7271,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +version = "4.1.0-dev" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "lazy_static", "sp-core", @@ -7240,10 +7283,9 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", - "derive_more", "futures 0.3.19", "merlin", "parity-scale-codec", @@ -7252,12 +7294,13 @@ dependencies = [ "serde", "sp-core", "sp-externalities", + "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "zstd", ] @@ -7277,7 +7320,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "sp-api", "sp-core", @@ -7287,7 +7330,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "backtrace", "lazy_static", @@ -7297,7 +7340,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "rustc-hash", "serde", @@ -7306,8 +7349,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +version = "4.1.0-dev" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "either", "hash256-std-hasher", @@ -7316,7 +7359,6 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "paste", - "primitive-types", "rand 0.7.3", "scale-info", "serde", @@ -7330,7 +7372,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7347,7 +7389,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -7359,7 +7401,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "serde", "serde_json", @@ -7368,7 +7410,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "scale-info", @@ -7382,7 +7424,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "scale-info", @@ -7393,7 +7435,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "hash-db", "log", @@ -7416,12 +7458,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" [[package]] name = "sp-storage" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7434,7 +7476,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "log", "sp-core", @@ -7447,10 +7489,10 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-api", @@ -7463,7 +7505,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "sp-std", @@ -7475,7 +7517,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "sp-api", "sp-runtime", @@ -7484,7 +7526,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-trait", "log", @@ -7500,7 +7542,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "hash-db", "memory-db", @@ -7515,7 +7557,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7531,7 +7573,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -7542,7 +7584,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.1.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "impl-trait-for-tuples", "log", @@ -7559,9 +7601,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83f0afe7e571565ef9aae7b0e4fb30fcaec4ebb9aea2f00489b772782aa03a4" +checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" dependencies = [ "Inflector", "proc-macro2", @@ -7596,60 +7638,31 @@ dependencies = [ "rand 0.8.4", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "structopt" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" -dependencies = [ - "clap 2.33.3", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "strum" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" +checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.22.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" +checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ "heck 0.3.3", "proc-macro2", "quote", + "rustversion", "syn", ] @@ -7669,7 +7682,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "platforms", ] @@ -7677,7 +7690,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.19", @@ -7699,26 +7712,27 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ "async-std", - "derive_more", "futures-util", "hyper", "log", "prometheus", + "thiserror", "tokio", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#d74d13695860746fac62a5c203a8b71f89acdcd6" +source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-02#7a6dc6ef9991e3a2ac17f30da64c9c80b42f8090" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "build-helper", "cargo_metadata", "sp-maybe-compressed-blob", + "strum", "tempfile", "toml", "walkdir", @@ -7734,7 +7748,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" version = "0.17.0" -source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-01#c292286e868dcac23315ec0fd4baeec2ef41edcc" +source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-02#42166f6bc3762e8e4aa873542f0d3f59c119fb49" dependencies = [ "async-trait", "bitvec 0.20.4", @@ -7760,7 +7774,7 @@ dependencies = [ [[package]] name = "subxt-codegen" version = "0.17.0" -source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-01#c292286e868dcac23315ec0fd4baeec2ef41edcc" +source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-02#42166f6bc3762e8e4aa873542f0d3f59c119fb49" dependencies = [ "async-trait", "darling", @@ -7778,7 +7792,7 @@ dependencies = [ [[package]] name = "subxt-macro" version = "0.17.0" -source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-01#c292286e868dcac23315ec0fd4baeec2ef41edcc" +source = "git+https://github.com/librelois/subxt.git?branch=duniter-monthly-2022-02#42166f6bc3762e8e4aa873542f0d3f59c119fb49" dependencies = [ "async-trait", "darling", @@ -7889,15 +7903,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "textwrap" version = "0.12.1" @@ -8166,7 +8171,7 @@ version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "chrono", "lazy_static", "matchers", @@ -8262,9 +8267,9 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" [[package]] name = "twox-hash" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", "rand 0.8.4", @@ -8433,12 +8438,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.3" @@ -8567,6 +8566,15 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "wasm-instrument" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +dependencies = [ + "parity-wasm 0.42.2", +] + [[package]] name = "wasm-timer" version = "0.2.5" diff --git a/Cargo.toml b/Cargo.toml index c64f85dc5..9505e8c50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,9 @@ runtime-benchmarks = [ ] [build-dependencies] -substrate-build-script-utils = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-01' } +clap = { version = "3.0" } +#clap_complete = { version = "3.0" } +substrate-build-script-utils = { git = 'https://github.com/librelois/substrate.git', branch = 'duniter-monthly-2022-02' } [dev-dependencies] rusty-hook = "^0.11.2" @@ -49,6 +51,7 @@ sp-membership = { path = 'primitives/membership' } # crates.io dependencies async-io = "1.3" +clap = { version = "3.0", features = ["derive"] } futures = { version = "0.3.1", features = ["compat"] } hex = "0.4.3" jsonrpc-core = '18.0.0' @@ -57,50 +60,49 @@ maplit = '1.0.2' memmap2 = "0.5.0" serde = "1.0" serde_json = "1.0.64" -structopt = '0.3.8' # substrate dependencies -frame-benchmarking = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -frame-benchmarking-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -pallet-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -pallet-transaction-payment-rpc = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-basic-authorship = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-chain-spec = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-client-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-consensus = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -babe = { package = "sc-consensus-babe", git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -manual-seal = { package = "sc-consensus-manual-seal", git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-consensus-uncles = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-executor = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-finality-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-keystore = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-network = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-rpc-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-service = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-telemetry = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-transaction-pool = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sc-transaction-pool-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-authority-discovery = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-block-builder = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-blockchain = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-consensus = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-consensus-babe = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-core = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-finality-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-io = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-offchain = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-keyring = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-keystore = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-runtime = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-session = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-storage = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-timestamp = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-transaction-pool = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -sp-trie = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -substrate-frame-rpc-system = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } +frame-benchmarking = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +frame-benchmarking-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +pallet-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +pallet-transaction-payment-rpc = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-basic-authorship = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-chain-spec = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-cli = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-client-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-consensus = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +babe = { package = "sc-consensus-babe", git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +manual-seal = { package = "sc-consensus-manual-seal", git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-consensus-uncles = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-executor = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-finality-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-keystore = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-network = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-rpc-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-service = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-telemetry = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-transaction-pool = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sc-transaction-pool-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-api = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-authority-discovery = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-block-builder = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-blockchain = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-consensus = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-consensus-babe = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-core = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-finality-grandpa = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-io = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-offchain = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-keyring = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-keystore = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-runtime = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-session = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-storage = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-timestamp = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-transaction-pool = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +sp-trie = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +substrate-frame-rpc-system = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } [workspace] resolver = "2" diff --git a/end2end-tests/Cargo.toml b/end2end-tests/Cargo.toml index 5fbd68ae0..8f31c4d3d 100644 --- a/end2end-tests/Cargo.toml +++ b/end2end-tests/Cargo.toml @@ -16,8 +16,8 @@ notify = "4.0" parity-scale-codec = "2.3.1" portpicker = "0.1.1" serde_json = "1.0.64" -sp-keyring = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-01" } -subxt = { git = 'https://github.com/librelois/subxt.git', branch = 'duniter-monthly-2022-01' } +sp-keyring = { git = "https://github.com/librelois/substrate.git", branch = "duniter-monthly-2022-02" } +subxt = { git = 'https://github.com/librelois/subxt.git', branch = 'duniter-monthly-2022-02' } tokio = { version = "1.15.0", features = ["macros"] } [[test]] diff --git a/node/build.rs b/node/build.rs index f9d839f9b..934af5280 100644 --- a/node/build.rs +++ b/node/build.rs @@ -1,7 +1,65 @@ -use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed}; +// Copyright 2021 Axiom-Team +// +// This file is part of Substrate-Libre-Currency. +// +// Substrate-Libre-Currency is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// Substrate-Libre-Currency is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>. fn main() { - generate_cargo_keys(); + //cli::main(); - rerun_if_git_head_changed(); + substrate_build_script_utils::generate_cargo_keys(); + substrate_build_script_utils::rerun_if_git_head_changed(); } +/* +mod cli { + include!("src/cli.rs"); + + use clap::{ArgEnum, IntoApp}; + use clap_complete::{generate_to, Shell}; + use std::{env, fs, path::Path}; + use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed}; + + pub fn main() { + build_shell_completion(); + generate_cargo_keys(); + + rerun_if_git_head_changed(); + } + + /// Build shell completion scripts for all known shells + fn build_shell_completion() { + for shell in Shell::value_variants() { + build_completion(shell); + } + } + + /// Build the shell auto-completion for a given Shell + fn build_completion(shell: &Shell) { + let outdir = match env::var_os("OUT_DIR") { + None => return, + Some(dir) => dir, + }; + let path = Path::new(&outdir) + .parent() + .unwrap() + .parent() + .unwrap() + .parent() + .unwrap() + .join("completion-scripts"); + + fs::create_dir(&path).ok(); + + let _ = generate_to(*shell, &mut Cli::into_app(), "substrate-node", &path); + } +}*/ diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs index 64c7b1be1..f20dd367b 100644 --- a/node/src/chain_spec/gdev.rs +++ b/node/src/chain_spec/gdev.rs @@ -88,6 +88,8 @@ pub fn development_chain_spec() -> Result<ChainSpec, String> { None, // Protocol ID None, + //Fork ID + None, // Properties Some( serde_json::json!({ @@ -121,6 +123,8 @@ pub fn gen_live_conf() -> Result<ChainSpec, String> { None, // Protocol ID None, + //Fork ID + None, // Properties Some( serde_json::json!({ @@ -179,6 +183,8 @@ pub fn local_testnet_config( None, // Protocol ID None, + //Fork ID + None, // Properties Some( serde_json::json!({ diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs index 895ae68b6..c9d2a52b9 100644 --- a/node/src/chain_spec/gtest.rs +++ b/node/src/chain_spec/gtest.rs @@ -84,6 +84,8 @@ pub fn development_chain_spec() -> Result<ChainSpec, String> { None, // Protocol ID None, + //Fork ID + None, // Properties Some( serde_json::json!({ @@ -129,6 +131,8 @@ pub fn local_testnet_config( None, // Protocol ID None, + //Fork ID + None, // Properties Some( serde_json::json!({ diff --git a/node/src/cli.rs b/node/src/cli.rs index a77a01830..5ddfb644c 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -14,32 +14,23 @@ // You should have received a copy of the GNU Affero General Public License // along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>. -pub mod key; -pub mod utils; - -use sc_cli::RunCmd; -use std::str::FromStr; -use structopt::StructOpt; - -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Parser)] pub struct Cli { - #[structopt(subcommand)] + #[clap(subcommand)] pub subcommand: Option<Subcommand>, - #[structopt(flatten)] - pub run: RunCmd, + #[clap(flatten)] + pub run: sc_cli::RunCmd, /// How blocks should be sealed /// /// Options are "production", "instant", "manual", or timer interval in milliseconds - #[structopt(long, default_value = "production")] - pub sealing: Sealing, + #[clap(long, default_value = "production")] + pub sealing: crate::cli::Sealing, } -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Subcommand)] pub enum Subcommand { - /// Key management cli utilities - Key(key::KeySubcommand), /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), @@ -52,6 +43,10 @@ pub enum Subcommand { /// Export the state of a given block into a chain spec. ExportState(sc_cli::ExportStateCmd), + /// Key management cli utilities + #[clap(subcommand)] + Key(crate::command::key::KeySubcommand), + /// Import blocks. ImportBlocks(sc_cli::ImportBlocksCmd), @@ -61,16 +56,26 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), + /// Sign a message, with a given (secret) key. + Sign(sc_cli::SignCmd), + /// Some tools for developers and advanced testers - Utils(utils::UtilsSubCommand), + #[clap(subcommand)] + Utils(crate::command::utils::UtilsSubCommand), + + /// Generate a seed that provides a vanity address. + Vanity(sc_cli::VanityCmd), + + /// Verify a signature for a message, provided on STDIN, with a given (public or secret) key. + Verify(sc_cli::VerifyCmd), /// The custom benchmark subcommmand benchmarking runtime pallets. - #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] + #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] Benchmark(frame_benchmarking_cli::BenchmarkCmd), } /// Block authoring scheme to be used by the node -#[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, clap::ArgEnum)] pub enum Sealing { /// Author a block using normal runtime behavior (mandatory for production networks) Production, @@ -88,7 +93,7 @@ impl Sealing { } } -impl FromStr for Sealing { +impl std::str::FromStr for Sealing { type Err = String; fn from_str(s: &str) -> Result<Self, Self::Err> { diff --git a/node/src/command.rs b/node/src/command.rs index d5a0a8b6b..e2280216a 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -15,6 +15,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +pub mod key; +pub mod utils; + use crate::cli::{Cli, Subcommand}; #[cfg(feature = "g1")] use crate::service::G1Executor; @@ -151,8 +154,6 @@ pub fn run() -> sc_cli::Result<()> { force_cli_options(&mut cli); match &cli.subcommand { - Some(Subcommand::Key(cmd)) => cmd.run(&cli), - Some(Subcommand::Utils(cmd)) => cmd.run(&cli), Some(Subcommand::BuildSpec(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| { @@ -204,6 +205,7 @@ pub fn run() -> sc_cli::Result<()> { Ok((cmd.run(client, config.chain_spec), task_manager)) }) } + Some(Subcommand::Key(cmd)) => cmd.run(&cli), Some(Subcommand::ImportBlocks(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|mut config| { @@ -230,6 +232,10 @@ pub fn run() -> sc_cli::Result<()> { Ok((cmd.run(client, backend), task_manager)) }) } + Some(Subcommand::Sign(cmd)) => cmd.run(), + Some(Subcommand::Utils(cmd)) => cmd.run(&cli), + Some(Subcommand::Vanity(cmd)) => cmd.run(), + Some(Subcommand::Verify(cmd)) => cmd.run(), Some(Subcommand::Benchmark(cmd)) => { if cfg!(feature = "runtime-benchmarks") { let runner = cli.create_runner(cmd)?; diff --git a/node/src/cli/key.rs b/node/src/command/key.rs similarity index 95% rename from node/src/cli/key.rs rename to node/src/command/key.rs index b5072ebd1..e09436326 100644 --- a/node/src/cli/key.rs +++ b/node/src/command/key.rs @@ -22,15 +22,14 @@ use sc_service::config::{BasePath, KeystoreConfig}; use sp_core::crypto::{AccountId32, KeyTypeId, SecretString}; use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr}; use std::sync::Arc; -use structopt::StructOpt; -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Subcommand)] pub enum KeySubcommand { /// Generate session keys and store them in the keystore GenerateSessionKeys(GenSessionKeysCmd), #[allow(missing_docs)] - #[structopt(flatten)] + #[clap(flatten)] Key(sc_cli::KeySubcommand), } @@ -44,20 +43,20 @@ impl KeySubcommand { } } -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Args)] pub struct GenSessionKeysCmd { /// The secret key URI. /// If the value is a file, the file content is used as URI. /// If not given, you will be prompted for the URI. - #[structopt(long)] + #[clap(long)] suri: Option<String>, #[allow(missing_docs)] - #[structopt(flatten)] + #[clap(flatten)] pub shared_params: SharedParams, #[allow(missing_docs)] - #[structopt(flatten)] + #[clap(flatten)] pub keystore_params: KeystoreParams, } diff --git a/node/src/cli/utils.rs b/node/src/command/utils.rs similarity index 93% rename from node/src/cli/utils.rs rename to node/src/command/utils.rs index cd872564f..4c4c67494 100644 --- a/node/src/cli/utils.rs +++ b/node/src/command/utils.rs @@ -16,9 +16,8 @@ use sc_cli::{Error, SubstrateCli}; use sp_io::hashing::twox_128; -use structopt::StructOpt; -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Subcommand)] pub enum UtilsSubCommand { /// Compute the raw storage key prefix StorageKeyPrefix(StorageKeyPrefixCmd), @@ -33,13 +32,13 @@ impl UtilsSubCommand { } } -#[derive(Debug, StructOpt)] +#[derive(Debug, clap::Parser)] pub struct StorageKeyPrefixCmd { /// Pallet name - #[structopt(short = "p", long)] + #[clap(short = 'p', long)] pallet_name: Option<String>, /// Storage item name - #[structopt(short = "i", long)] + #[clap(short = 'i', long)] item_name: Option<String>, } diff --git a/node/src/lib.rs b/node/src/lib.rs index c40443396..25f475257 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -16,5 +16,6 @@ pub mod chain_spec; pub mod cli; +pub mod command; pub mod rpc; pub mod service; diff --git a/node/src/main.rs b/node/src/main.rs index 5cbb934c9..98cc72d6b 100644 --- a/node/src/main.rs +++ b/node/src/main.rs @@ -14,7 +14,8 @@ // 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/>. -//! duniter CLI library. +//! Duniter Node CLI. + #![warn(missing_docs)] mod chain_spec; diff --git a/node/src/service.rs b/node/src/service.rs index 9125e0e56..65e0e0da3 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -23,7 +23,7 @@ use async_io::Timer; use common_runtime::Block; use futures::{Stream, StreamExt}; use manual_seal::{run_manual_seal, EngineCommand, ManualSealParams}; -use sc_client_api::ExecutorProvider; +use sc_client_api::{BlockBackend, ExecutorProvider}; pub use sc_executor::NativeElseWasmExecutor; use sc_finality_grandpa::SharedVoterState; use sc_keystore::LocalKeystore; @@ -384,10 +384,20 @@ where }; } + let grandpa_protocol_name = sc_finality_grandpa::protocol_standard_name( + &client + .block_hash(0) + .ok() + .flatten() + .expect("Genesis block exists; qed"), + &config.chain_spec, + ); config .network .extra_sets - .push(sc_finality_grandpa::grandpa_peers_set_config()); + .push(sc_finality_grandpa::grandpa_peers_set_config( + grandpa_protocol_name.clone(), + )); let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new( backend.clone(), grandpa_link.shared_authority_set().clone(), @@ -497,7 +507,7 @@ where let client = client_clone.clone(); async move { let timestamp = - manual_seal::consensus::babe::SlotTimestampProvider::new( + manual_seal::consensus::timestamp::SlotTimestampProvider::new_babe( client.clone(), ) .map_err(|err| format!("{:?}", err))?; @@ -619,6 +629,7 @@ where keystore, local_role: role, telemetry: telemetry.as_ref().map(|x| x.handle()), + protocol_name: grandpa_protocol_name, }; if enable_grandpa { diff --git a/pallets/authority-members/Cargo.toml b/pallets/authority-members/Cargo.toml index 26b80e4cb..7bf31c0ce 100644 --- a/pallets/authority-members/Cargo.toml +++ b/pallets/authority-members/Cargo.toml @@ -43,23 +43,23 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -69,22 +69,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-staking] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -101,4 +101,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/authority-members/src/lib.rs b/pallets/authority-members/src/lib.rs index 7ae48e6f4..9a115df46 100644 --- a/pallets/authority-members/src/lib.rs +++ b/pallets/authority-members/src/lib.rs @@ -54,6 +54,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T>(_); // CONFIG // diff --git a/pallets/certification/Cargo.toml b/pallets/certification/Cargo.toml index c327cd281..8e821d9ac 100644 --- a/pallets/certification/Cargo.toml +++ b/pallets/certification/Cargo.toml @@ -39,17 +39,17 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -59,17 +59,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -86,4 +86,4 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/certification/src/lib.rs b/pallets/certification/src/lib.rs index a1d6063bb..9801d83e9 100644 --- a/pallets/certification/src/lib.rs +++ b/pallets/certification/src/lib.rs @@ -48,6 +48,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T, I = ()>(PhantomData<(T, I)>); #[pallet::config] diff --git a/pallets/duniter-test-parameters/Cargo.toml b/pallets/duniter-test-parameters/Cargo.toml index 66193adea..3e80d9453 100644 --- a/pallets/duniter-test-parameters/Cargo.toml +++ b/pallets/duniter-test-parameters/Cargo.toml @@ -39,32 +39,32 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### diff --git a/pallets/duniter-test-parameters/src/lib.rs b/pallets/duniter-test-parameters/src/lib.rs index 4f5df4b75..b6f413851 100644 --- a/pallets/duniter-test-parameters/src/lib.rs +++ b/pallets/duniter-test-parameters/src/lib.rs @@ -80,6 +80,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T>(_); // CONFIG // diff --git a/pallets/duniter-wot/Cargo.toml b/pallets/duniter-wot/Cargo.toml index 43a8cb644..4851ee2b1 100644 --- a/pallets/duniter-wot/Cargo.toml +++ b/pallets/duniter-wot/Cargo.toml @@ -48,17 +48,17 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -68,22 +68,22 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -96,4 +96,4 @@ version = '1.0.119' [dev-dependencies.sp-io] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs index 2f1d90fb3..3637a0ca3 100644 --- a/pallets/duniter-wot/src/lib.rs +++ b/pallets/duniter-wot/src/lib.rs @@ -55,6 +55,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T, I = ()>(_); // CONFIG // diff --git a/pallets/identity/Cargo.toml b/pallets/identity/Cargo.toml index 8a206f695..d5eac3102 100644 --- a/pallets/identity/Cargo.toml +++ b/pallets/identity/Cargo.toml @@ -39,17 +39,17 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -59,17 +59,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -85,4 +85,4 @@ version = '1.0.2' [dev-dependencies.sp-io] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs index 9e3b7f54b..3870558f9 100644 --- a/pallets/identity/src/lib.rs +++ b/pallets/identity/src/lib.rs @@ -52,6 +52,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T>(_); // CONFIG // diff --git a/pallets/membership/Cargo.toml b/pallets/membership/Cargo.toml index acdec3a96..8fa13e2b8 100644 --- a/pallets/membership/Cargo.toml +++ b/pallets/membership/Cargo.toml @@ -41,17 +41,17 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -61,17 +61,17 @@ features = ["derive"] [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -88,4 +88,4 @@ version = '1.0.2' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs index 505fb1fc1..6bbd93241 100644 --- a/pallets/membership/src/lib.rs +++ b/pallets/membership/src/lib.rs @@ -52,6 +52,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T, I = ()>(_); // CONFIG // diff --git a/pallets/ud-accounts-storage/Cargo.toml b/pallets/ud-accounts-storage/Cargo.toml index 4bf8ce942..c0591fc74 100644 --- a/pallets/ud-accounts-storage/Cargo.toml +++ b/pallets/ud-accounts-storage/Cargo.toml @@ -36,22 +36,22 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -65,19 +65,19 @@ version = '1.0.119' [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/ud-accounts-storage/src/lib.rs b/pallets/ud-accounts-storage/src/lib.rs index cd479353e..b77bfa161 100644 --- a/pallets/ud-accounts-storage/src/lib.rs +++ b/pallets/ud-accounts-storage/src/lib.rs @@ -34,35 +34,23 @@ use sp_std::prelude::*; pub mod pallet { use super::*; use frame_support::pallet_prelude::*; - use scale_info::TypeInfo; + use frame_support::traits::StorageVersion; - // CONFIG // - - #[pallet::config] - pub trait Config: frame_system::Config {} - - // STORAGE // + /// The current storage version. + const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] + #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] pub struct Pallet<T>(_); - // A value placed in storage that represents the current version of the Balances storage. - // This value is used by the `on_runtime_upgrade` logic to determine whether we run - // storage migration logic. This should match directly with the semantic versions of the Rust crate. - #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)] - pub enum Releases { - V1_0_0, - } - impl Default for Releases { - fn default() -> Self { - Releases::V1_0_0 - } - } + // CONFIG // - /// Storage version of the pallet. - #[pallet::storage] - pub(super) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>; + #[pallet::config] + pub trait Config: frame_system::Config {} + + // STORAGE // #[pallet::storage] #[pallet::getter(fn ud_accounts)] @@ -94,7 +82,6 @@ pub mod pallet { #[pallet::genesis_build] impl<T: Config> GenesisBuild<T> for GenesisConfig<T> { fn build(&self) { - <StorageVersion<T>>::put(Releases::V1_0_0); <UdAccountsCounter<T>>::put(self.ud_accounts.len() as u64); for (account, index) in &self.ud_accounts { <UdAccounts<T>>::insert(account, index); diff --git a/pallets/universal-dividend/Cargo.toml b/pallets/universal-dividend/Cargo.toml index 9fc29a57e..f81235f99 100644 --- a/pallets/universal-dividend/Cargo.toml +++ b/pallets/universal-dividend/Cargo.toml @@ -37,37 +37,37 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### @@ -80,7 +80,7 @@ targets = ['x86_64-unknown-linux-gnu'] [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dev-dependencies.serde] features = ["derive"] @@ -89,14 +89,14 @@ version = '1.0.119' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/pallets/universal-dividend/src/lib.rs b/pallets/universal-dividend/src/lib.rs index 1969f6550..34e55787f 100644 --- a/pallets/universal-dividend/src/lib.rs +++ b/pallets/universal-dividend/src/lib.rs @@ -41,12 +41,22 @@ const OFFCHAIN_PREFIX_UD_HISTORY: &[u8] = b"ud::history::"; pub mod pallet { use super::*; use frame_support::pallet_prelude::*; + use frame_support::traits::StorageVersion; use frame_system::pallet_prelude::*; use scale_info::TypeInfo; pub type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance; + /// The current storage version. + const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); + + #[pallet::pallet] + #[pallet::generate_store(pub(super) trait Store)] + #[pallet::storage_version(STORAGE_VERSION)] + #[pallet::without_storage_info] + pub struct Pallet<T>(_); + #[pallet::config] pub trait Config: frame_system::Config { // The currency @@ -83,27 +93,6 @@ pub mod pallet { // STORAGE // - #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] - pub struct Pallet<T>(_); - - // A value placed in storage that represents the current version of the Balances storage. - // This value is used by the `on_runtime_upgrade` logic to determine whether we run - // storage migration logic. This should match directly with the semantic versions of the Rust crate. - #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)] - pub enum Releases { - V1_0_0, - } - impl Default for Releases { - fn default() -> Self { - Releases::V1_0_0 - } - } - - /// Storage version of the pallet. - #[pallet::storage] - pub(super) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>; - #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)] pub struct LastReeval<T: Config> { members_count: BalanceOf<T>, @@ -154,7 +143,6 @@ pub mod pallet { assert!(!self.first_ud.is_zero()); assert!(self.initial_monetary_mass >= T::Currency::total_issuance()); - <StorageVersion<T>>::put(Releases::V1_0_0); <CurrentUdStorage<T>>::put(self.first_ud); <MonetaryMassStorage<T>>::put(self.initial_monetary_mass); } diff --git a/primitives/membership/Cargo.toml b/primitives/membership/Cargo.toml index 716ad19ae..88755880e 100644 --- a/primitives/membership/Cargo.toml +++ b/primitives/membership/Cargo.toml @@ -34,7 +34,7 @@ version = '2.3.1' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -44,12 +44,12 @@ features = ["derive"] [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' ### DOC ### diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 65099cd38..9a4aa1328 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -60,23 +60,23 @@ version = '2.3.1' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-balances] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -86,29 +86,29 @@ features = ["derive"] [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-consensus-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-staking] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/runtime/g1/Cargo.toml b/runtime/g1/Cargo.toml index 06d0a4fca..b219a04e7 100644 --- a/runtime/g1/Cargo.toml +++ b/runtime/g1/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -93,33 +93,33 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-executive] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.hex-literal] optional = true @@ -128,88 +128,88 @@ version = '0.3.1' [dependencies.pallet-atomic-swap] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-authority-discovery] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-authorship] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-balances] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-grandpa] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-im-online] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-offences] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-proxy] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-multisig] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-scheduler] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-utility] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] @@ -223,64 +223,64 @@ version = "1.6.1" [dependencies.sp-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-authority-discovery] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-consensus-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-inherents] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-offchain] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-session] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-version] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/runtime/gdev/Cargo.toml b/runtime/gdev/Cargo.toml index 96e93f929..412d7fa56 100644 --- a/runtime/gdev/Cargo.toml +++ b/runtime/gdev/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -96,33 +96,33 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-executive] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.hex-literal] optional = true @@ -131,88 +131,88 @@ version = '0.3.1' [dependencies.pallet-atomic-swap] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-authority-discovery] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-authorship] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-balances] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-grandpa] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-im-online] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-offences] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-multisig] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-proxy] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-scheduler] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-utility] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] version = "1.0.101" @@ -222,64 +222,64 @@ features = ["derive"] [dependencies.sp-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-authority-discovery] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-consensus-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-inherents] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-offchain] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-session] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-version] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/runtime/gtest/Cargo.toml b/runtime/gtest/Cargo.toml index 4e559b825..ba64f544e 100644 --- a/runtime/gtest/Cargo.toml +++ b/runtime/gtest/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [package] authors = ['Axiom-Team Developers <https://axiom-team.fr>'] @@ -93,33 +93,33 @@ version = '2.3.1' default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-executive] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-support] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/librelois/substrate.git' optional = true -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.hex-literal] optional = true @@ -128,88 +128,88 @@ version = '0.3.1' [dependencies.pallet-atomic-swap] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-authority-discovery] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-authorship] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-balances] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-grandpa] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-im-online] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-offences] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-proxy] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-multisig] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-scheduler] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-session] default-features = false features = ["historical"] git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.pallet-utility] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.serde] @@ -223,64 +223,64 @@ version = "1.6.1" [dependencies.sp-api] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-arithmetic] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-authority-discovery] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-consensus-babe] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-core] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-inherents] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-offchain] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-runtime] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-session] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-std] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' [dependencies.sp-version] default-features = false git = 'https://github.com/librelois/substrate.git' -branch = 'duniter-monthly-2022-01' +branch = 'duniter-monthly-2022-02' diff --git a/rust-toolchain b/rust-toolchain index 0f5159104..c2815e44d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2021-09-10" +channel = "nightly-2021-11-12" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ] profile = "minimal" -- GitLab