diff --git a/Cargo.lock b/Cargo.lock index f996f5fbe85a7..28276c7514ed0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,15 +114,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.14" @@ -140,9 +131,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" @@ -429,7 +420,7 @@ dependencies = [ [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" +source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d" dependencies = [ "ark-ec", "ark-ff", @@ -478,7 +469,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" +source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d" dependencies = [ "ark-ff", "ark-serialize", @@ -690,7 +681,7 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" version = "0.0.4" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" +source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d" dependencies = [ "ark-bls12-381", "ark-ec", @@ -699,8 +690,6 @@ dependencies = [ "ark-serialize", "ark-std", "dleq_vrf", - "fflonk", - "merlin", "rand_chacha", "rand_core", "ring 0.1.0", @@ -1326,9 +1315,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -1336,9 +1325,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -1349,9 +1338,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1414,7 +1403,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#96137b150288a66bc9e4df495efc64769b5d1321" +source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752" dependencies = [ "ark-ec", "ark-ff", @@ -2068,7 +2057,7 @@ dependencies = [ [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" +source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d" dependencies = [ "ark-ec", "ark-ff", @@ -2506,7 +2495,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "12.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", ] @@ -2539,7 +2528,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "frame-support", "frame-support-procedural", @@ -2563,7 +2552,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "32.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "Inflector", "array-bytes", @@ -2625,7 +2614,7 @@ dependencies = [ [[package]] name = "frame-support" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "aquamarine", "array-bytes", @@ -2666,11 +2655,12 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "23.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "docify", "expander", "frame-support-procedural-tools", "itertools 0.11.0", @@ -2685,7 +2675,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "10.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -2697,7 +2687,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "11.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "proc-macro2", "quote", @@ -2707,7 +2697,7 @@ dependencies = [ [[package]] name = "frame-system" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "cfg-if", "docify", @@ -2727,7 +2717,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "docify", "parity-scale-codec", @@ -2737,7 +2727,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.34.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "frame-support", "parity-scale-codec", @@ -3893,7 +3883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -5352,7 +5342,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-balances" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "docify", "frame-benchmarking", @@ -5407,7 +5397,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "frame-support", "frame-system", @@ -6564,13 +6554,14 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#96137b150288a66bc9e4df495efc64769b5d1321" +source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", + "arrayvec", "blake2 0.10.6", "common", "fflonk", @@ -6820,7 +6811,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "23.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "log", "sp-core", @@ -6831,7 +6822,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "sp-api", @@ -6846,7 +6837,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "docify", @@ -6873,7 +6864,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "11.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -6884,7 +6875,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.36.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "chrono", @@ -6925,7 +6916,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "fnv", "futures", @@ -6952,7 +6943,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.35.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "hash-db", "kvdb", @@ -6978,7 +6969,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "futures", @@ -7029,7 +7020,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.32.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -7052,7 +7043,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.29.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "polkavm", "sc-allocator", @@ -7065,7 +7056,7 @@ dependencies = [ [[package]] name = "sc-executor-polkavm" version = "0.29.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "log", "polkavm", @@ -7076,7 +7067,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.29.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "anyhow", "cfg-if", @@ -7109,9 +7100,9 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ - "ansi_term", + "console", "futures", "futures-timer", "log", @@ -7126,7 +7117,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "25.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "parking_lot 0.12.3", @@ -7140,7 +7131,7 @@ dependencies = [ [[package]] name = "sc-mixnet" version = "0.4.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "arrayvec", @@ -7169,7 +7160,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.34.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "async-channel", @@ -7220,7 +7211,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -7238,7 +7229,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "async-channel", @@ -7259,7 +7250,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "async-channel", @@ -7291,12 +7282,13 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", + "zstd 0.12.4", ] [[package]] name = "sc-network-transactions" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "futures", @@ -7315,7 +7307,7 @@ dependencies = [ [[package]] name = "sc-network-types" version = "0.10.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "bs58 0.5.1", "ed25519-dalek", @@ -7332,7 +7324,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "29.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "futures", "jsonrpsee", @@ -7364,7 +7356,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.33.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -7384,7 +7376,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "11.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "forwarded-header-value", "futures", @@ -7406,7 +7398,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.34.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "futures", @@ -7438,7 +7430,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.35.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "directories", @@ -7502,7 +7494,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.30.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "log", "parity-scale-codec", @@ -7513,7 +7505,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.16.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "clap", "fs4", @@ -7526,7 +7518,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "27.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "derive_more", "futures", @@ -7547,7 +7539,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "15.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "chrono", "futures", @@ -7567,17 +7559,16 @@ dependencies = [ [[package]] name = "sc-tracing" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ - "ansi_term", "chrono", + "console", "is-terminal", "lazy_static", "libc", "log", "parity-scale-codec", "parking_lot 0.12.3", - "regex", "rustc-hash", "sc-client-api", "sc-tracing-proc-macro", @@ -7597,7 +7588,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "11.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -7608,7 +7599,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "futures", @@ -7635,7 +7626,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "futures", @@ -7651,7 +7642,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "14.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-channel", "futures", @@ -7797,7 +7788,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ - "bitcoin_hashes 0.13.0", + "bitcoin_hashes 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "secp256k1-sys 0.10.0", "serde", ] @@ -7884,9 +7875,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] @@ -7902,9 +7893,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -7913,11 +7904,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -8186,7 +8178,7 @@ dependencies = [ [[package]] name = "sp-api" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "docify", "hash-db", @@ -8208,7 +8200,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "15.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "Inflector", "blake2 0.10.6", @@ -8222,7 +8214,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "30.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "scale-info", @@ -8234,7 +8226,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "23.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "docify", "integer-sqrt", @@ -8266,7 +8258,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "sp-api", "sp-inherents", @@ -8276,7 +8268,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "futures", "parity-scale-codec", @@ -8295,7 +8287,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.32.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "futures", @@ -8310,7 +8302,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "13.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "finality-grandpa", "log", @@ -8327,7 +8319,7 @@ dependencies = [ [[package]] name = "sp-core" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "array-bytes", "bandersnatch_vrfs", @@ -8374,7 +8366,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -8394,7 +8386,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" version = "0.1.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "blake2b_simd", "byteorder", @@ -8407,7 +8399,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" version = "0.1.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "quote", "sp-crypto-hashing", @@ -8417,7 +8409,7 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "kvdb", "parking_lot 0.12.3", @@ -8426,7 +8418,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "proc-macro2", "quote", @@ -8436,7 +8428,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "proc-macro2", "quote", @@ -8446,7 +8438,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "environmental", "parity-scale-codec", @@ -8456,7 +8448,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "environmental", "parity-scale-codec", @@ -8466,7 +8458,7 @@ dependencies = [ [[package]] name = "sp-genesis-builder" version = "0.8.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "scale-info", @@ -8478,7 +8470,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8491,7 +8483,7 @@ dependencies = [ [[package]] name = "sp-io" version = "30.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "bytes", "docify", @@ -8517,7 +8509,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "31.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "sp-core", "sp-runtime", @@ -8527,7 +8519,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.34.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -8538,7 +8530,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "thiserror", "zstd 0.12.4", @@ -8547,7 +8539,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.6.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -8557,7 +8549,7 @@ dependencies = [ [[package]] name = "sp-mixnet" version = "0.4.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "scale-info", @@ -8568,7 +8560,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "sp-api", "sp-core", @@ -8578,7 +8570,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "backtrace", "lazy_static", @@ -8588,7 +8580,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "rustc-hash", "serde", @@ -8598,7 +8590,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "31.0.1" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "docify", "either", @@ -8624,7 +8616,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8643,7 +8635,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8662,7 +8654,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "Inflector", "expander", @@ -8675,7 +8667,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "Inflector", "expander", @@ -8688,7 +8680,7 @@ dependencies = [ [[package]] name = "sp-session" version = "27.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "scale-info", @@ -8702,7 +8694,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8715,7 +8707,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.35.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "hash-db", "log", @@ -8735,7 +8727,7 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "10.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "aes-gcm", "curve25519-dalek", @@ -8759,17 +8751,17 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8781,7 +8773,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8793,7 +8785,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "tracing", @@ -8804,7 +8796,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "parity-scale-codec", "tracing", @@ -8815,7 +8807,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "sp-api", "sp-runtime", @@ -8824,7 +8816,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "26.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "async-trait", "parity-scale-codec", @@ -8838,7 +8830,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "29.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "ahash", "hash-db", @@ -8861,7 +8853,7 @@ dependencies = [ [[package]] name = "sp-version" version = "29.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8878,7 +8870,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "13.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8889,7 +8881,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -8901,7 +8893,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035aa4a72c1c99a262459" +source = "git+https://github.com/paritytech/polkadot-sdk#80c3c1fd712ce9f1dd0c539e384dbeab699485ed" dependencies = [ "impl-trait-for-tuples", "log", @@ -8911,7 +8903,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "27.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -9079,8 +9071,8 @@ dependencies = [ name = "subcoin-informant" version = "0.1.0" dependencies = [ - "ansi_term", "bitcoin 0.32.2", + "console", "futures", "futures-timer", "sc-client-api", @@ -9306,7 +9298,7 @@ dependencies = [ [[package]] name = "substrate-bip39" version = "0.4.7" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -9318,12 +9310,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "11.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" [[package]] name = "substrate-frame-rpc-system" version = "28.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "docify", "frame-system-rpc-runtime-api", @@ -9343,7 +9335,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "http-body-util", "hyper 1.4.1", @@ -9357,12 +9349,13 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "17.0.0" -source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#b1882a6bebba29cc8cb1e5f8e11b5a123cd0351d" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#1ba4fe79e4f9623071e02528d79ee7ffbb9eff2b" dependencies = [ "build-helper", "cargo_metadata", "console", "filetime", + "jobserver", "parity-wasm", "polkavm-linker", "sp-maybe-compressed-blob", @@ -9848,6 +9841,7 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", + "time", "tracing", "tracing-core", "tracing-log", diff --git a/Cargo.toml b/Cargo.toml index 4c93277361b91..1e5b612d5c214 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,6 @@ members = [ default-members = ["crates/subcoin-node"] [workspace.dependencies] -ansi_term = "0.12.1" async-trait = "0.1" bitcoin = { git = "https://github.com/liuchengxu/rust-bitcoin", branch = "0.32.x-subcoin", default-features = false } bitcoinconsensus = "0.105.0+25.1" @@ -35,6 +34,7 @@ bitcoin-explorer = { git = "https://github.com/liuchengxu/Rusty-Bitcoin-Explorer chrono = "0.4.37" clap = { version = "4", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +console = "0.15.8" fastrand = "2.0.2" futures = "0.3" futures-timer = "3.0.1" diff --git a/crates/sc-consensus-nakamoto/src/block_executor.rs b/crates/sc-consensus-nakamoto/src/block_executor.rs index 82bcc28321e68..74f107765f89a 100644 --- a/crates/sc-consensus-nakamoto/src/block_executor.rs +++ b/crates/sc-consensus-nakamoto/src/block_executor.rs @@ -128,13 +128,13 @@ pub trait BlockExecutor: Send + Sync { /// There are two kinds of clients for executing the block: /// /// 1) Client using the disk backend. This is the default behaviour in Substrate. The state -/// is maintained in the disk backend and pruned according to the parameters provided on startup. +/// is maintained in the disk backend and pruned according to the parameters provided on startup. /// /// 2) Client using the in memory backend. This is specifically designated for fast block execution -/// in the initial full sync stage, the in memory backend keeps the entire latest chain state in -/// the memory for executing blocks, the previous states are not stored. The block executor using -/// the in memory backend needs to import the block within the executor to update the in memory -/// chain state. +/// in the initial full sync stage, the in memory backend keeps the entire latest chain state in +/// the memory for executing blocks, the previous states are not stored. The block executor using +/// the in memory backend needs to import the block within the executor to update the in memory +/// chain state. pub enum ClientContext { Disk, InMemory(BI), diff --git a/crates/sc-fast-sync-backend/src/lib.rs b/crates/sc-fast-sync-backend/src/lib.rs index d8612639aa256..85884aa57ed50 100644 --- a/crates/sc-fast-sync-backend/src/lib.rs +++ b/crates/sc-fast-sync-backend/src/lib.rs @@ -332,6 +332,7 @@ impl Blockchain { None => storage.aux.remove(&k), }; } + println!("[write_aux] after {:?}", storage.aux); } } @@ -770,11 +771,16 @@ impl backend::Backend for Backend { .apply_transaction(*header.state_root(), state); } + println!("=============== [commit_operation] hash: {hash:?}, header: {header:?}, justification: {justification:?}, body: {body:?}"); self.blockchain .insert(hash, header, justification, body, pending_block.state)?; } if !operation.aux.is_empty() { + println!( + "=============== [commit_operation] aux: {:?}", + operation.aux + ); self.blockchain.write_aux(operation.aux); } diff --git a/crates/subcoin-informant/Cargo.toml b/crates/subcoin-informant/Cargo.toml index 78aa12d42e8e9..c6d4879f64f17 100644 --- a/crates/subcoin-informant/Cargo.toml +++ b/crates/subcoin-informant/Cargo.toml @@ -7,8 +7,8 @@ repository.workspace = true license.workspace = true [dependencies] -ansi_term = { workspace = true } bitcoin = { workspace = true } +console = { workspace = true } futures = { workspace = true } futures-timer = { workspace = true } sc-client-api = { workspace = true } diff --git a/crates/subcoin-informant/src/display.rs b/crates/subcoin-informant/src/display.rs index 7593f8fea32a4..535775bd9605e 100644 --- a/crates/subcoin-informant/src/display.rs +++ b/crates/subcoin-informant/src/display.rs @@ -16,10 +16,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use crate::{ClientInfoExt, OutputFormat}; -use ansi_term::Colour; +use crate::ClientInfoExt; use bitcoin::hashes::Hash; use bitcoin::BlockHash; +use console::style; use sp_runtime::traits::{Block as BlockT, CheckedDiv, NumberFor, Saturating, Zero}; use std::fmt::{self, Display}; use std::time::Instant; @@ -64,19 +64,16 @@ pub struct InformantDisplay { last_total_bytes_inbound: u64, /// The last seen total of bytes sent. last_total_bytes_outbound: u64, - /// The format to print output in. - format: OutputFormat, } impl InformantDisplay { /// Builds a new informant display system. - pub fn new(format: OutputFormat) -> InformantDisplay { + pub fn new() -> InformantDisplay { InformantDisplay { last_number: None, last_update: Instant::now(), last_total_bytes_inbound: 0, last_total_bytes_outbound: 0, - format, } } @@ -125,13 +122,13 @@ impl InformantDisplay { tracing::info!( target: "subcoin", - "{level} {}{target} ({} peers), best: #{} ({best_bitcoin_hash},{best_hash}), finalized #{} ({finalized_bitcoin_hash},{finalized_hash}), {} {}", - self.format.print_with_color(Colour::White.bold(), status), - self.format.print_with_color(Colour::White.bold(), num_connected_peers), - self.format.print_with_color(Colour::White.bold(), best_number), - self.format.print_with_color(Colour::White.bold(), finalized_number), - self.format.print_with_color(Colour::Green, format!("⬇ {}", TransferRateFormat(avg_bytes_per_sec_inbound))), - self.format.print_with_color(Colour::Red, format!("⬆ {}", TransferRateFormat(avg_bytes_per_sec_outbound))), + "{level} {}{target} ({} peers), best: #{} ({best_bitcoin_hash},{best_hash}), finalized #{} ({finalized_bitcoin_hash},{finalized_hash}), ⬇ {} ⬆ {}", + style(status).white().bold(), + style(num_connected_peers).white().bold(), + style(best_number).white().bold(), + style(finalized_number).white().bold(), + style(TransferRateFormat(avg_bytes_per_sec_inbound)).green(), + style(TransferRateFormat(avg_bytes_per_sec_outbound)).red(), ) } } diff --git a/crates/subcoin-informant/src/lib.rs b/crates/subcoin-informant/src/lib.rs index c8a6d0d46ab7e..ec43c90fa7951 100644 --- a/crates/subcoin-informant/src/lib.rs +++ b/crates/subcoin-informant/src/lib.rs @@ -4,8 +4,8 @@ mod display; -use ansi_term::{Colour, Style}; use bitcoin::BlockHash; +use console::style; use futures::prelude::*; use futures_timer::Delay; use sc_client_api::{AuxStore, BlockchainEvents, ClientInfo, UsageProvider}; @@ -41,69 +41,13 @@ fn interval(duration: Duration) -> impl Stream + Unpin { futures::stream::unfold((), move |_| Delay::new(duration).map(|_| Some(((), ())))).map(drop) } -/// The format to print telemetry output in. -#[derive(Clone, Debug)] -pub struct OutputFormat { - /// Enable color output in logs. - /// - /// Is enabled by default. - pub enable_color: bool, -} - -impl Default for OutputFormat { - fn default() -> Self { - Self { enable_color: true } - } -} - -enum ColorOrStyle { - Color(Colour), - Style(Style), -} - -impl From for ColorOrStyle { - fn from(value: Colour) -> Self { - Self::Color(value) - } -} - -impl From