diff --git a/Cargo.lock b/Cargo.lock index d00e4ff660ceb428492319cc6bd2b3f36760fbb7..c04b39d5fe9fef814282a10e422effb945c2471d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -875,7 +875,7 @@ dependencies = [ "log", "pallet-authority-members", "pallet-babe", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-certification", "pallet-collective", "pallet-duniter-account", @@ -1578,6 +1578,7 @@ dependencies = [ "log", "maplit", "memmap2", + "num-format", "pallet-certification", "pallet-grandpa", "pallet-oneshot-account", @@ -1598,7 +1599,7 @@ dependencies = [ "sc-finality-grandpa", "sc-keystore", "sc-network", - "sc-network-common", + "sc-network-common 0.10.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "sc-rpc-api", "sc-service", "sc-telemetry", @@ -2035,7 +2036,6 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", ] @@ -2058,7 +2058,6 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "frame-support", "frame-system", @@ -2081,7 +2080,6 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "Inflector", "array-bytes", @@ -2161,7 +2159,6 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "bitflags", "frame-metadata", @@ -2193,7 +2190,6 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "Inflector", "cfg-expr", @@ -2207,7 +2203,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2219,7 +2214,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "proc-macro2", "quote", @@ -2229,7 +2223,6 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "frame-support", "log", @@ -2498,7 +2491,7 @@ dependencies = [ "pallet-authority-members", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-certification", "pallet-collective", "pallet-duniter-account", @@ -2567,7 +2560,7 @@ dependencies = [ "pallet-authority-members", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-certification", "pallet-collective", "pallet-duniter-account", @@ -2862,7 +2855,7 @@ dependencies = [ "pallet-authority-members", "pallet-authorship", "pallet-babe", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-certification", "pallet-collective", "pallet-duniter-account", @@ -5092,6 +5085,20 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-balances" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-balances" version = "4.0.0-dev" @@ -5150,7 +5157,7 @@ dependencies = [ "frame-system", "log", "maplit", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-provide-randomness", "pallet-treasury", "parity-scale-codec", @@ -5310,7 +5317,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "parity-scale-codec", "scale-info", "serde", @@ -5329,7 +5336,7 @@ dependencies = [ "frame-support", "frame-system", "log", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-transaction-payment", "parity-scale-codec", "scale-info", @@ -5363,7 +5370,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "parity-scale-codec", "scale-info", "sp-core", @@ -5432,7 +5439,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-authority-members", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "pallet-session", "pallet-timestamp", "parity-scale-codec", @@ -5523,13 +5530,12 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", - "pallet-balances", + "pallet-balances 4.0.0-dev", "parity-scale-codec", "scale-info", "serde", @@ -5544,7 +5550,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "pallet-balances", + "pallet-balances 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "parity-scale-codec", "scale-info", "serde", @@ -6700,7 +6706,6 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "log", "sp-core", @@ -6711,7 +6716,6 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "futures-timer", @@ -6734,7 +6738,6 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6750,13 +6753,12 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "impl-trait-for-tuples", "memmap2", "parity-scale-codec", "sc-chain-spec-derive", - "sc-network-common", + "sc-network-common 0.10.0-dev", "sc-telemetry", "serde", "serde_json", @@ -6767,7 +6769,6 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6778,7 +6779,6 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "chrono", @@ -6796,11 +6796,11 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", - "sc-network-common", + "sc-network-common 0.10.0-dev", "sc-service", "sc-telemetry", "sc-tracing", - "sc-utils", + "sc-utils 4.0.0-dev", "serde", "serde_json", "sp-blockchain", @@ -6818,7 +6818,6 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "fnv", "futures 0.3.25", @@ -6828,7 +6827,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-executor", "sc-transaction-pool-api", - "sc-utils", + "sc-utils 4.0.0-dev", "sp-api", "sp-blockchain", "sp-consensus", @@ -6846,7 +6845,6 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "hash-db", "kvdb", @@ -6870,7 +6868,6 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -6879,7 +6876,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "sc-client-api", - "sc-utils", + "sc-utils 4.0.0-dev", "serde", "sp-api", "sp-blockchain", @@ -6894,7 +6891,6 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -6923,7 +6919,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "fork-tree", @@ -6965,7 +6960,6 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6978,7 +6972,6 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "assert_matches", "async-trait", @@ -7012,7 +7005,6 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -7036,7 +7028,6 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "sc-client-api", "sp-authorship", @@ -7047,7 +7038,6 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "lazy_static", "lru 0.7.8", @@ -7074,7 +7064,6 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "environmental", "parity-scale-codec", @@ -7090,7 +7079,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "log", "parity-scale-codec", @@ -7105,7 +7093,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -7125,7 +7112,6 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "ahash", "array-bytes", @@ -7145,10 +7131,10 @@ dependencies = [ "sc-consensus", "sc-keystore", "sc-network", - "sc-network-common", + "sc-network-common 0.10.0-dev", "sc-network-gossip", "sc-telemetry", - "sc-utils", + "sc-utils 4.0.0-dev", "serde_json", "sp-api", "sp-application-crypto", @@ -7166,7 +7152,6 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "ansi_term", "futures 0.3.25", @@ -7174,7 +7159,7 @@ dependencies = [ "log", "parity-util-mem", "sc-client-api", - "sc-network-common", + "sc-network-common 0.10.0-dev", "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", @@ -7183,7 +7168,6 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "async-trait", @@ -7198,7 +7182,6 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "async-trait", @@ -7225,9 +7208,9 @@ dependencies = [ "sc-block-builder", "sc-client-api", "sc-consensus", - "sc-network-common", - "sc-peerset", - "sc-utils", + "sc-network-common 0.10.0-dev", + "sc-peerset 4.0.0-dev", + "sc-utils 4.0.0-dev", "serde", "serde_json", "smallvec", @@ -7245,7 +7228,6 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "cid", "futures 0.3.25", @@ -7254,7 +7236,7 @@ dependencies = [ "prost", "prost-build", "sc-client-api", - "sc-network-common", + "sc-network-common 0.10.0-dev", "sp-blockchain", "sp-runtime", "thiserror", @@ -7262,6 +7244,31 @@ dependencies = [ "void", ] +[[package]] +name = "sc-network-common" +version = "0.10.0-dev" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "futures 0.3.25", + "futures-timer", + "libp2p", + "linked_hash_set", + "parity-scale-codec", + "prost-build", + "sc-consensus", + "sc-peerset 4.0.0-dev", + "serde", + "smallvec", + "sp-blockchain", + "sp-consensus", + "sp-finality-grandpa", + "sp-runtime", + "substrate-prometheus-endpoint", + "thiserror", +] + [[package]] name = "sc-network-common" version = "0.10.0-dev" @@ -7277,7 +7284,7 @@ dependencies = [ "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", + "sc-peerset 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "serde", "smallvec", "sp-blockchain", @@ -7291,7 +7298,6 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "ahash", "futures 0.3.25", @@ -7299,8 +7305,8 @@ dependencies = [ "libp2p", "log", "lru 0.7.8", - "sc-network-common", - "sc-peerset", + "sc-network-common 0.10.0-dev", + "sc-peerset 4.0.0-dev", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -7309,7 +7315,6 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "futures 0.3.25", @@ -7319,8 +7324,8 @@ dependencies = [ "prost", "prost-build", "sc-client-api", - "sc-network-common", - "sc-peerset", + "sc-network-common 0.10.0-dev", + "sc-peerset 4.0.0-dev", "sp-blockchain", "sp-core", "sp-runtime", @@ -7330,7 +7335,6 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "fork-tree", @@ -7344,9 +7348,9 @@ dependencies = [ "prost-build", "sc-client-api", "sc-consensus", - "sc-network-common", - "sc-peerset", - "sc-utils", + "sc-network-common 0.10.0-dev", + "sc-peerset 4.0.0-dev", + "sc-utils 4.0.0-dev", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -7360,7 +7364,6 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "futures 0.3.25", @@ -7369,8 +7372,8 @@ dependencies = [ "log", "parity-scale-codec", "pin-project", - "sc-network-common", - "sc-peerset", + "sc-network-common 0.10.0-dev", + "sc-peerset 4.0.0-dev", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", @@ -7379,7 +7382,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "bytes", @@ -7395,9 +7397,9 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "sc-client-api", - "sc-network-common", - "sc-peerset", - "sc-utils", + "sc-network-common 0.10.0-dev", + "sc-peerset 4.0.0-dev", + "sc-utils 4.0.0-dev", "sp-api", "sp-core", "sp-offchain", @@ -7406,6 +7408,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "sc-peerset" +version = "4.0.0-dev" +dependencies = [ + "futures 0.3.25", + "libp2p", + "log", + "sc-utils 4.0.0-dev", + "serde_json", + "wasm-timer", +] + [[package]] name = "sc-peerset" version = "4.0.0-dev" @@ -7414,7 +7428,7 @@ dependencies = [ "futures 0.3.25", "libp2p", "log", - "sc-utils", + "sc-utils 4.0.0-dev (git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32)", "serde_json", "wasm-timer", ] @@ -7422,7 +7436,6 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7431,7 +7444,6 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "hash-db", @@ -7445,7 +7457,7 @@ dependencies = [ "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", - "sc-utils", + "sc-utils 4.0.0-dev", "serde_json", "sp-api", "sp-blockchain", @@ -7461,7 +7473,6 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "jsonrpsee 0.15.1", @@ -7484,7 +7495,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "jsonrpsee 0.15.1", @@ -7497,7 +7507,6 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "hex", @@ -7516,7 +7525,6 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "directories", @@ -7541,7 +7549,7 @@ dependencies = [ "sc-keystore", "sc-network", "sc-network-bitswap", - "sc-network-common", + "sc-network-common 0.10.0-dev", "sc-network-light", "sc-network-sync", "sc-network-transactions", @@ -7554,7 +7562,7 @@ dependencies = [ "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", - "sc-utils", + "sc-utils 4.0.0-dev", "serde", "serde_json", "sp-api", @@ -7587,7 +7595,6 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "log", "parity-scale-codec", @@ -7601,7 +7608,6 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "libc", @@ -7620,7 +7626,6 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "chrono", "futures 0.3.25", @@ -7638,7 +7643,6 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "ansi_term", "atty", @@ -7669,7 +7673,6 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7680,7 +7683,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -7692,7 +7694,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", - "sc-utils", + "sc-utils 4.0.0-dev", "serde", "sp-api", "sp-blockchain", @@ -7707,7 +7709,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -7718,6 +7719,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-utils" +version = "4.0.0-dev" +dependencies = [ + "futures 0.3.25", + "futures-timer", + "lazy_static", + "log", + "parking_lot 0.12.1", + "prometheus", +] + [[package]] name = "sc-utils" version = "4.0.0-dev" @@ -8203,7 +8216,6 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "hash-db", "log", @@ -8221,7 +8233,6 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "blake2", "proc-macro-crate", @@ -8233,7 +8244,6 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "scale-info", @@ -8246,7 +8256,6 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "integer-sqrt", "num-traits", @@ -8261,7 +8270,6 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "scale-info", @@ -8274,7 +8282,6 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "parity-scale-codec", @@ -8286,7 +8293,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8298,7 +8304,6 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures 0.3.25", "log", @@ -8316,7 +8321,6 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -8335,7 +8339,6 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "parity-scale-codec", @@ -8353,7 +8356,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "merlin", @@ -8376,7 +8378,6 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "scale-info", @@ -8390,7 +8391,6 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "scale-info", @@ -8403,7 +8403,6 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "array-bytes", "base58", @@ -8449,7 +8448,6 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "blake2", "byteorder", @@ -8463,7 +8461,6 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "proc-macro2", "quote", @@ -8474,7 +8471,6 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8483,7 +8479,6 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "proc-macro2", "quote", @@ -8493,7 +8488,6 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "environmental", "parity-scale-codec", @@ -8504,7 +8498,6 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "finality-grandpa", "log", @@ -8522,7 +8515,6 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8536,7 +8528,6 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "bytes", "futures 0.3.25", @@ -8562,7 +8553,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "lazy_static", "sp-core", @@ -8573,7 +8563,6 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures 0.3.25", @@ -8590,7 +8579,6 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "thiserror", "zstd", @@ -8611,7 +8599,6 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "sp-api", "sp-core", @@ -8621,7 +8608,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "backtrace", "lazy_static", @@ -8631,7 +8617,6 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "rustc-hash", "serde", @@ -8641,7 +8626,6 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "either", "hash256-std-hasher", @@ -8664,7 +8648,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8682,7 +8665,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "Inflector", "proc-macro-crate", @@ -8694,7 +8676,6 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "log", "parity-scale-codec", @@ -8708,7 +8689,6 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "scale-info", @@ -8722,7 +8702,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "scale-info", @@ -8733,7 +8712,6 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "hash-db", "log", @@ -8755,12 +8733,10 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8773,7 +8749,6 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "log", "sp-core", @@ -8786,7 +8761,6 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "futures-timer", @@ -8802,7 +8776,6 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "sp-std", @@ -8814,7 +8787,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "sp-api", "sp-runtime", @@ -8823,7 +8795,6 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "async-trait", "log", @@ -8839,7 +8810,6 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "ahash", "hash-db", @@ -8862,7 +8832,6 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8879,7 +8848,6 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8890,7 +8858,6 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "impl-trait-for-tuples", "log", @@ -8903,7 +8870,6 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9073,7 +9039,6 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/duniter/substrate?branch=duniter-substrate-v0.9.32#7f8b8db65b441ce1d1b2ffb26ebde314b54e117c" dependencies = [ "futures-util", "hyper", diff --git a/Cargo.toml b/Cargo.toml index 465be996531d9fd4cfbb61f00e50c8ff95ea4d5a..8379f0d61d86ba1541509469b613516cdb0f2ead 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,6 +78,7 @@ memmap2 = "0.5.0" serde = "1.0" serde_json = "1.0.64" tracing-core = "0.1.28" +num-format = "0.4.4" # substrate dependencies frame-benchmarking = { git = "https://github.com/duniter/substrate", branch = "duniter-substrate-v0.9.32" } diff --git a/node/src/chain_spec/gtest_genesis.rs b/node/src/chain_spec/gtest_genesis.rs index 004a1cc6b1c3157a55a6e28ce8ea3d76ad9d75c4..1ef3e54e682dbc1c66c4579890d280a88b15ce02 100644 --- a/node/src/chain_spec/gtest_genesis.rs +++ b/node/src/chain_spec/gtest_genesis.rs @@ -23,6 +23,7 @@ use gtest_runtime::{ SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, UniversalDividendConfig, }; +use num_format::{Locale, ToFormattedString}; use serde::Deserialize; use sp_core::{blake2_256, Decode, Encode, H256}; use std::collections::{BTreeMap, HashMap}; @@ -191,22 +192,23 @@ pub fn build_genesis( return Err(format!("Identity name '{}' is invalid", &name)); } - // check existential deposit - if identity.balance < EXISTENTIAL_DEPOSIT { - if identity.membership_expire_on != 0 { - log::warn!( - "expired identity {name} has {} cǦT which is below {EXISTENTIAL_DEPOSIT}", - identity.balance - ); - fatal = true; - } else { - // member identities can still be below existential deposit thanks to sufficient - log::info!( - "identity {name} has {} cǦT which is below {EXISTENTIAL_DEPOSIT}", - identity.balance - ); - } - } + // do not check existential deposit of identities + // // check existential deposit + // if identity.balance < EXISTENTIAL_DEPOSIT { + // if identity.membership_expire_on == 0 { + // log::warn!( + // "expired identity {name} has {} cǦT which is below {EXISTENTIAL_DEPOSIT}", + // identity.balance + // ); + // fatal = true; + // } else { + // member identities can still be below existential deposit thanks to sufficient + // log::info!( + // "identity {name} has {} cǦT which is below {EXISTENTIAL_DEPOSIT}", + // identity.balance + // ); + // } + // } // Money // check that wallet with same owner_key does not exist @@ -397,8 +399,11 @@ pub fn build_genesis( // check monetary mass if monetary_mass != genesis_data.initial_monetary_mass { log::warn!( - "actuel monetary_mass ({monetary_mass}) and initial_monetary_mass ({}) do not match", - genesis_data.initial_monetary_mass + "actual monetary_mass ({}) and initial_monetary_mass ({}) do not match", + monetary_mass.to_formatted_string(&Locale::en), + genesis_data + .initial_monetary_mass + .to_formatted_string(&Locale::en) ); fatal = true; } diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs index 86b66d53a19d638f20297d1ca95b206f09d65f6f..a91617dddf8ee699d7695f640b240aa4a581524e 100644 --- a/runtime/gtest/src/parameters.rs +++ b/runtime/gtest/src/parameters.rs @@ -72,7 +72,9 @@ parameter_types! { // Balances frame_support::parameter_types! { - pub const ExistentialDeposit: Balance = 200; + // we take 100 of existential deposit to mimic duniter v1 + // and avoid loosing too many accounts during the migration + pub const ExistentialDeposit: Balance = 100; pub const MaxLocks: u32 = 50; }