From bdf85827d503b8c666175c54bc861287d8383b88 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Mon, 22 Jul 2024 01:40:12 +0800 Subject: [PATCH] Upgrade polkadot sdk (#25) * Tiny refactoring * Upgrade polkadot-sdk * Make the log consistent with upstream * Nit * Add import_params to Run * Add profiling profile * Nit * Add rocksdb feature into subcoin-node * Avoid cloning the payload using into_payload() * Update Cargo.lock * Nit --- Cargo.lock | 1169 ++++++++++------- Cargo.toml | 100 +- .../sc-consensus-nakamoto/src/import_queue.rs | 2 +- crates/subcoin-informant/src/display.rs | 2 +- .../subcoin-network/src/block_downloader.rs | 4 +- crates/subcoin-network/src/connection.rs | 5 +- crates/subcoin-network/src/peer_manager.rs | 9 +- crates/subcoin-node/Cargo.toml | 1 + crates/subcoin-node/src/commands/run.rs | 12 +- crates/subcoin-runtime/src/lib.rs | 1 - crates/subcoin-service/src/lib.rs | 2 +- 11 files changed, 783 insertions(+), 524 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 215812a0..e7223359 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.15", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -471,7 +471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", "rayon", ] @@ -484,7 +484,7 @@ dependencies = [ "ark-serialize", "ark-std", "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", "sha3", ] @@ -512,8 +512,24 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +dependencies = [ + "asn1-rs-derive 0.5.0", + "asn1-rs-impl 0.2.0", "displaydoc", "nom", "num-traits", @@ -531,7 +547,19 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure 0.13.1", ] [[package]] @@ -545,6 +573,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -610,13 +649,19 @@ dependencies = [ "pin-project-lite 0.2.14", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "attohttpc" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.12", "log", "url", ] @@ -656,8 +701,8 @@ dependencies = [ "dleq_vrf", "fflonk", "merlin", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand_chacha", + "rand_core", "ring 0.1.0", "sha2 0.10.8", "sp-ark-bls12-381", @@ -708,6 +753,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -738,6 +789,27 @@ dependencies = [ "serde", ] +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "prettyplease 0.2.20", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", +] + [[package]] name = "bitcoin" version = "0.31.0" @@ -758,7 +830,7 @@ dependencies = [ [[package]] name = "bitcoin" version = "0.32.2" -source = "git+https://github.com/liuchengxu/rust-bitcoin?branch=0.32.x-subcoin#166db88bf1de0a3908e99c05d0acb8b0a9d4e58a" +source = "git+https://github.com/liuchengxu/rust-bitcoin?branch=0.32.x-subcoin#3415d99a9e9fab7b214152c6900b6b745d5d6125" dependencies = [ "base58ck 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bech32", @@ -1052,6 +1124,17 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "c2-chacha" version = "0.3.3" @@ -1105,6 +1188,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-expr" version = "0.15.8" @@ -1184,7 +1276,7 @@ dependencies = [ "multibase", "multihash 0.17.0", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -1197,7 +1289,7 @@ dependencies = [ "multibase", "multihash 0.18.1", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -1220,11 +1312,22 @@ dependencies = [ "zeroize", ] +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + [[package]] name = "clap" -version = "4.5.8" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -1232,9 +1335,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.8" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -1320,7 +1423,7 @@ dependencies = [ "fflonk", "getrandom_or_panic", "merlin", - "rand_chacha 0.3.1", + "rand_chacha", ] [[package]] @@ -1372,7 +1475,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.15", + "getrandom", "once_cell", "tiny-keccak", ] @@ -1629,7 +1732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "subtle 2.6.1", "zeroize", ] @@ -1641,7 +1744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -1674,19 +1777,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle 2.6.1", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1819,7 +1909,21 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.1", "displaydoc", "nom", "num-bigint", @@ -1847,17 +1951,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-syn-parse" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive-syn-parse" version = "0.2.0" @@ -2003,7 +2096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "once_cell", "proc-macro2", "quote", @@ -2064,19 +2157,10 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature 2.2.0", + "signature", "spki", ] -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -2084,21 +2168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", + "signature", ] [[package]] @@ -2107,9 +2177,9 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519 2.2.3", - "rand_core 0.6.4", + "curve25519-dalek", + "ed25519", + "rand_core", "serde", "sha2 0.10.8", "subtle 2.6.1", @@ -2122,11 +2192,11 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519 2.2.3", + "curve25519-dalek", + "ed25519", "hashbrown 0.14.5", "hex", - "rand_core 0.6.4", + "rand_core", "sha2 0.10.8", "zeroize", ] @@ -2150,7 +2220,7 @@ dependencies = [ "generic-array 0.14.7", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "serdect", "subtle 2.6.1", @@ -2307,7 +2377,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle 2.6.1", ] @@ -2391,7 +2461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -2435,7 +2505,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "12.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", ] @@ -2468,7 +2538,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "frame-support", "frame-support-procedural", @@ -2484,16 +2554,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" version = "32.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "Inflector", "array-bytes", @@ -2510,7 +2579,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_pcg", "sc-block-builder", "sc-chain-spec", @@ -2526,16 +2595,16 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-database", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-trie", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "thiserror", "thousands", ] @@ -2555,7 +2624,7 @@ dependencies = [ [[package]] name = "frame-support" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "aquamarine", "array-bytes", @@ -2578,7 +2647,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-crypto-hashing-proc-macro", - "sp-debug-derive 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-debug-derive 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -2586,8 +2655,8 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-weights", "static_assertions", "tt-call", @@ -2596,11 +2665,11 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "23.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "expander", "frame-support-procedural-tools", "itertools 0.11.0", @@ -2615,7 +2684,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "10.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -2627,7 +2696,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "11.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "proc-macro2", "quote", @@ -2637,7 +2706,7 @@ dependencies = [ [[package]] name = "frame-system" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "cfg-if", "docify", @@ -2649,7 +2718,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-version", "sp-weights", ] @@ -2657,7 +2726,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "docify", "parity-scale-codec", @@ -2667,13 +2736,12 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.34.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", ] [[package]] @@ -2876,17 +2944,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -2895,7 +2952,7 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -2904,8 +2961,8 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", ] [[package]] @@ -2945,6 +3002,12 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "governor" version = "0.6.3" @@ -2960,7 +3023,7 @@ dependencies = [ "parking_lot 0.12.3", "portable-atomic", "quanta", - "rand 0.8.5", + "rand", "smallvec", "spinning_top", ] @@ -2972,7 +3035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle 2.6.1", ] @@ -2987,7 +3050,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -3191,6 +3273,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -3198,15 +3291,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", "pin-project-lite 0.2.14", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite 0.2.14", +] [[package]] name = "httparse" @@ -3236,9 +3346,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3250,6 +3360,43 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite 0.2.14", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite 0.2.14", + "tokio", + "tower", + "tower-service", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -3343,10 +3490,10 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.29", "log", - "rand 0.8.5", + "rand", "tokio", "url", "xmltree", @@ -3544,9 +3691,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" dependencies = [ "jsonrpsee-core", "jsonrpsee-proc-macros", @@ -3558,18 +3705,21 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" +checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" dependencies = [ "anyhow", "async-trait", "beef", + "bytes", "futures-util", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "jsonrpsee-types", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "rustc-hash", "serde", "serde_json", @@ -3580,11 +3730,11 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0" +checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -3593,20 +3743,24 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" +checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" dependencies = [ + "anyhow", "futures-util", - "http", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", "pin-project", "route-recognizer", "serde", "serde_json", - "soketto", + "soketto 0.8.0", "thiserror", "tokio", "tokio-stream", @@ -3617,12 +3771,12 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" +checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ - "anyhow", "beef", + "http 1.1.0", "serde", "serde_json", "thiserror", @@ -3676,12 +3830,32 @@ dependencies = [ "parking_lot 0.12.3", ] +[[package]] +name = "kvdb-rocksdb" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6" +dependencies = [ + "kvdb", + "num_cpus", + "parking_lot 0.12.3", + "regex", + "rocksdb", + "smallvec", +] + [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "leveldb" version = "0.8.6" @@ -3711,6 +3885,16 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.48.5", +] + [[package]] name = "libm" version = "0.2.8" @@ -3727,7 +3911,7 @@ dependencies = [ "either", "futures", "futures-timer", - "getrandom 0.2.15", + "getrandom", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -3798,11 +3982,11 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand 0.8.5", + "rand", "rw-stream-sink", "smallvec", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] @@ -3852,11 +4036,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" dependencies = [ "bs58 0.5.1", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "hkdf", "multihash 0.19.1", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "thiserror", "tracing", @@ -3883,12 +4067,12 @@ dependencies = [ "log", "quick-protobuf", "quick-protobuf-codec", - "rand 0.8.5", + "rand", "sha2 0.10.8", "smallvec", "thiserror", "uint", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] @@ -3905,7 +4089,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.5.7", "tokio", @@ -3937,7 +4121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921" dependencies = [ "bytes", - "curve25519-dalek 4.1.3", + "curve25519-dalek", "futures", "libp2p-core", "libp2p-identity", @@ -3946,7 +4130,7 @@ dependencies = [ "multihash 0.19.1", "once_cell", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "snow", "static_assertions", @@ -3969,7 +4153,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "void", ] @@ -3989,7 +4173,7 @@ dependencies = [ "log", "parking_lot 0.12.3", "quinn 0.10.2", - "rand 0.8.5", + "rand", "ring 0.16.20", "rustls 0.21.12", "socket2 0.5.7", @@ -4010,7 +4194,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "smallvec", "void", ] @@ -4032,7 +4216,7 @@ dependencies = [ "log", "multistream-select", "once_cell", - "rand 0.8.5", + "rand", "smallvec", "tokio", "void", @@ -4083,7 +4267,7 @@ dependencies = [ "rustls 0.21.12", "rustls-webpki", "thiserror", - "x509-parser", + "x509-parser 0.15.1", "yasna", ] @@ -4132,7 +4316,7 @@ dependencies = [ "parking_lot 0.12.3", "quicksink", "rw-stream-sink", - "soketto", + "soketto 0.7.1", "url", "webpki-roots", ] @@ -4160,6 +4344,21 @@ dependencies = [ "libc", ] +[[package]] +name = "librocksdb-sys" +version = "0.11.0+8.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" +dependencies = [ + "bindgen", + "bzip2-sys", + "cc", + "glob", + "libc", + "libz-sys", + "tikv-jemalloc-sys", +] + [[package]] name = "libsecp256k1" version = "0.7.1" @@ -4173,7 +4372,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -4208,6 +4407,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "libz-sys" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "link-cplusplus" version = "1.0.9" @@ -4267,15 +4477,15 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" +checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9" dependencies = [ "async-trait", "bs58 0.4.0", "bytes", "cid 0.10.1", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "futures", "futures-timer", "hex-literal", @@ -4288,10 +4498,10 @@ dependencies = [ "nohash-hasher", "parking_lot 0.12.3", "pin-project", - "prost 0.11.9", + "prost 0.12.6", "prost-build 0.11.9", "quinn 0.9.4", - "rand 0.8.5", + "rand", "rcgen", "ring 0.16.20", "rustls 0.20.9", @@ -4311,11 +4521,11 @@ dependencies = [ "tracing", "trust-dns-resolver", "uint", - "unsigned-varint", + "unsigned-varint 0.8.0", "url", "webpki", "x25519-dalek", - "x509-parser", + "x509-parser 0.16.0", "yasna", "zeroize", ] @@ -4385,9 +4595,9 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", @@ -4397,12 +4607,12 @@ dependencies = [ [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", - "derive-syn-parse 0.1.5", + "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", @@ -4411,9 +4621,9 @@ dependencies = [ [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2", "quote", @@ -4422,9 +4632,9 @@ dependencies = [ [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote", @@ -4521,7 +4731,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.4", + "rand_core", "zeroize", ] @@ -4547,7 +4757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -4562,14 +4772,14 @@ dependencies = [ "bitflags 1.3.2", "blake2 0.10.6", "c2-chacha", - "curve25519-dalek 4.1.3", + "curve25519-dalek", "either", "hashlink", "lioness", "log", "parking_lot 0.12.3", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_distr", "subtle 2.6.1", "thiserror", @@ -4645,7 +4855,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", "url", ] @@ -4664,7 +4874,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", "url", ] @@ -4693,7 +4903,7 @@ dependencies = [ "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -4710,7 +4920,7 @@ dependencies = [ "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -4720,7 +4930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -4734,7 +4944,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -4754,7 +4964,7 @@ dependencies = [ "log", "pin-project", "smallvec", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -4790,7 +5000,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -5042,7 +5252,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", +] + +[[package]] +name = "oid-registry" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" +dependencies = [ + "asn1-rs 0.6.1", ] [[package]] @@ -5132,7 +5351,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-balances" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "docify", "frame-benchmarking", @@ -5142,7 +5361,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", ] [[package]] @@ -5158,7 +5376,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "subcoin-runtime-primitives", ] @@ -5180,15 +5398,15 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-version", ] [[package]] name = "pallet-transaction-payment" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "frame-support", "frame-system", @@ -5198,7 +5416,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", ] [[package]] @@ -5218,8 +5435,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes 0.13.0", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "serde", "unicode-normalization", ] @@ -5239,7 +5456,7 @@ dependencies = [ "lz4", "memmap2 0.5.10", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "siphasher", "snap", "winapi", @@ -5345,7 +5562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle 2.6.1", ] @@ -5365,6 +5582,12 @@ dependencies = [ "password-hash", ] +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "pem" version = "1.1.1" @@ -5938,7 +6161,7 @@ dependencies = [ "libc", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -5968,7 +6191,7 @@ dependencies = [ "bytes", "quick-protobuf", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -6025,7 +6248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring 0.16.20", "rustc-hash", "rustls 0.20.9", @@ -6043,7 +6266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring 0.16.20", "rustc-hash", "rustls 0.21.12", @@ -6094,19 +6317,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -6114,18 +6324,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -6135,16 +6335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -6153,7 +6344,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] @@ -6163,16 +6354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -6181,7 +6363,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -6264,7 +6446,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.15", + "getrandom", "libredox", "thiserror", ] @@ -6417,13 +6599,23 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.15", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", "windows-sys 0.52.0", ] +[[package]] +name = "rocksdb" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +dependencies = [ + "libc", + "librocksdb-sys", +] + [[package]] name = "route-recognizer" version = "0.3.1" @@ -6627,18 +6819,18 @@ dependencies = [ [[package]] name = "sc-allocator" version = "23.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "log", "sp-core", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "thiserror", ] [[package]] name = "sc-block-builder" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "sp-api", @@ -6653,7 +6845,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "docify", @@ -6674,13 +6866,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] name = "sc-chain-spec-derive" version = "11.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -6691,7 +6883,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.36.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "chrono", @@ -6704,7 +6896,7 @@ dependencies = [ "names", "parity-bip39", "parity-scale-codec", - "rand 0.8.5", + "rand", "regex", "rpassword", "sc-client-api", @@ -6732,7 +6924,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "fnv", "futures", @@ -6747,11 +6939,11 @@ dependencies = [ "sp-consensus", "sp-core", "sp-database", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-runtime", "sp-state-machine", "sp-statement-store", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-trie", "substrate-prometheus-endpoint", ] @@ -6759,11 +6951,12 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.35.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "hash-db", "kvdb", "kvdb-memorydb", + "kvdb-rocksdb", "linked-hash-map", "log", "parity-db", @@ -6784,7 +6977,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "futures", @@ -6834,7 +7027,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.32.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -6844,25 +7037,25 @@ dependencies = [ "schnellru", "sp-api", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-io", "sp-panic-handler", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-trie", "sp-version", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "tracing", ] [[package]] name = "sc-executor-common" version = "0.29.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "polkavm", "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "thiserror", "wasm-instrument", ] @@ -6870,18 +7063,18 @@ dependencies = [ [[package]] name = "sc-executor-polkavm" version = "0.29.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "log", "polkavm", "sc-executor-common", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] name = "sc-executor-wasmtime" version = "0.29.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "anyhow", "cfg-if", @@ -6891,8 +7084,8 @@ dependencies = [ "rustix 0.36.17", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "wasmtime", ] @@ -6914,7 +7107,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "ansi_term", "futures", @@ -6931,7 +7124,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "25.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "parking_lot 0.12.3", @@ -6945,7 +7138,7 @@ dependencies = [ [[package]] name = "sc-mixnet" version = "0.4.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "arrayvec", @@ -6974,7 +7167,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.34.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "async-channel", @@ -6999,7 +7192,7 @@ dependencies = [ "pin-project", "prost 0.12.6", "prost-build 0.12.6", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network-common", "sc-network-types", @@ -7016,7 +7209,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", "wasm-timer", "zeroize", @@ -7025,7 +7218,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -7043,7 +7236,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "async-channel", @@ -7064,7 +7257,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "async-channel", @@ -7101,7 +7294,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "futures", @@ -7120,16 +7313,16 @@ dependencies = [ [[package]] name = "sc-network-types" version = "0.10.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "bs58 0.5.1", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "libp2p-identity", "litep2p", "log", "multiaddr 0.18.1", "multihash 0.19.1", - "rand 0.8.5", + "rand", "thiserror", "zeroize", ] @@ -7137,7 +7330,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "29.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "futures", "jsonrpsee", @@ -7169,7 +7362,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.33.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -7189,13 +7382,14 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "11.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "forwarded-header-value", "futures", "governor", - "http", - "hyper", + "http 1.1.0", + "http-body-util", + "hyper 1.4.1", "ip_network", "jsonrpsee", "log", @@ -7210,7 +7404,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.34.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "futures", @@ -7220,7 +7414,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "sc-chain-spec", "sc-client-api", "sc-rpc", @@ -7242,7 +7436,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.35.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "directories", @@ -7254,7 +7448,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -7284,12 +7478,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -7306,7 +7500,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.30.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "log", "parity-scale-codec", @@ -7317,7 +7511,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.16.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "clap", "fs4", @@ -7330,13 +7524,13 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "27.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "derive_more", "futures", "libc", "log", - "rand 0.8.5", + "rand", "rand_pcg", "regex", "sc-telemetry", @@ -7345,13 +7539,13 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-io", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] name = "sc-telemetry" version = "15.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "chrono", "futures", @@ -7359,7 +7553,7 @@ dependencies = [ "log", "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "sc-network", "sc-utils", "serde", @@ -7371,7 +7565,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "ansi_term", "chrono", @@ -7391,7 +7585,7 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "thiserror", "tracing", "tracing-log", @@ -7401,7 +7595,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "11.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -7412,7 +7606,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "futures", @@ -7430,7 +7624,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-runtime", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -7439,7 +7633,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "futures", @@ -7455,7 +7649,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "14.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-channel", "futures", @@ -7522,10 +7716,10 @@ dependencies = [ "aead", "arrayref", "arrayvec", - "curve25519-dalek 4.1.3", + "curve25519-dalek", "getrandom_or_panic", "merlin", - "rand_core 0.6.4", + "rand_core", "serde_bytes", "sha2 0.10.8", "subtle 2.6.1", @@ -7564,7 +7758,7 @@ dependencies = [ "crc", "fxhash", "log", - "rand 0.8.5", + "rand", "slab", "thiserror", ] @@ -7601,7 +7795,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ - "bitcoin_hashes 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitcoin_hashes 0.13.0", "secp256k1-sys 0.10.0", "serde", ] @@ -7688,9 +7882,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -7706,9 +7900,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -7833,6 +8027,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -7842,12 +8042,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.2.0" @@ -7855,7 +8049,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -7928,8 +8122,8 @@ dependencies = [ "aes-gcm", "blake2 0.10.6", "chacha20poly1305", - "curve25519-dalek 4.1.3", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "ring 0.17.8", "rustc_version", "sha2 0.10.8", @@ -7965,17 +8159,32 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1 0.9.8", ] +[[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", +] + [[package]] name = "sp-api" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "docify", "hash-db", @@ -7984,12 +8193,11 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-metadata-ir", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", "sp-trie", "sp-version", "thiserror", @@ -7998,7 +8206,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "15.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "Inflector", "blake2 0.10.6", @@ -8012,20 +8220,19 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "30.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", ] [[package]] name = "sp-arithmetic" version = "23.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "docify", "integer-sqrt", @@ -8033,7 +8240,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", "static_assertions", ] @@ -8058,7 +8264,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "sp-api", "sp-inherents", @@ -8068,25 +8274,26 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "futures", - "log", "parity-scale-codec", "parking_lot 0.12.3", "schnellru", "sp-api", "sp-consensus", + "sp-core", "sp-database", "sp-runtime", "sp-state-machine", "thiserror", + "tracing", ] [[package]] name = "sp-consensus" version = "0.32.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "futures", @@ -8101,7 +8308,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "13.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "finality-grandpa", "log", @@ -8118,7 +8325,7 @@ dependencies = [ [[package]] name = "sp-core" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "array-bytes", "bandersnatch_vrfs", @@ -8142,18 +8349,18 @@ dependencies = [ "parking_lot 0.12.3", "paste", "primitive-types", - "rand 0.8.5", + "rand", "scale-info", "schnorrkel", "secp256k1 0.28.2", "secrecy", "serde", "sp-crypto-hashing", - "sp-debug-derive 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-debug-derive 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "ss58-registry", "substrate-bip39", "thiserror", @@ -8185,7 +8392,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" version = "0.1.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "blake2b_simd", "byteorder", @@ -8198,7 +8405,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" version = "0.1.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "quote", "sp-crypto-hashing", @@ -8208,7 +8415,7 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "kvdb", "parking_lot 0.12.3", @@ -8217,7 +8424,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "proc-macro2", "quote", @@ -8237,11 +8444,11 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] @@ -8257,7 +8464,7 @@ dependencies = [ [[package]] name = "sp-genesis-builder" version = "0.8.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "scale-info", @@ -8269,7 +8476,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8282,11 +8489,11 @@ dependencies = [ [[package]] name = "sp-io" version = "30.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "bytes", "docify", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", @@ -8295,12 +8502,11 @@ dependencies = [ "secp256k1 0.28.2", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-keystore", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-trie", "tracing", "tracing-core", @@ -8309,7 +8515,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "31.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "sp-core", "sp-runtime", @@ -8319,18 +8525,18 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.34.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "thiserror", "zstd 0.12.4", @@ -8339,7 +8545,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.6.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -8349,7 +8555,7 @@ dependencies = [ [[package]] name = "sp-mixnet" version = "0.4.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "scale-info", @@ -8360,7 +8566,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "sp-api", "sp-core", @@ -8370,7 +8576,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "backtrace", "lazy_static", @@ -8380,7 +8586,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "rustc-hash", "serde", @@ -8390,7 +8596,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "31.0.1" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "docify", "either", @@ -8400,7 +8606,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "simple-mermaid", @@ -8408,26 +8614,27 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-io", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-weights", + "tracing", ] [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "polkavm-derive", "primitive-types", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-wasm-interface 20.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-wasm-interface 20.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "static_assertions", ] @@ -8453,7 +8660,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "Inflector", "expander", @@ -8479,7 +8686,7 @@ dependencies = [ [[package]] name = "sp-session" version = "27.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "scale-info", @@ -8493,7 +8700,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8506,16 +8713,16 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.35.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "smallvec", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-panic-handler", "sp-trie", "thiserror", @@ -8526,23 +8733,23 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "10.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "aes-gcm", - "curve25519-dalek 4.1.3", - "ed25519-dalek 2.1.1", + "curve25519-dalek", + "ed25519-dalek", "hkdf", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-runtime-interface 24.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "thiserror", "x25519-dalek", ] @@ -8550,7 +8757,7 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" [[package]] name = "sp-std" @@ -8560,13 +8767,13 @@ source = "git+https://github.com/paritytech/polkadot-sdk#e1460b5ee5f4490b428035a [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-debug-derive 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] @@ -8584,7 +8791,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "tracing", @@ -8606,7 +8813,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "sp-api", "sp-runtime", @@ -8615,7 +8822,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "26.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "async-trait", "parity-scale-codec", @@ -8629,7 +8836,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "29.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "ahash", "hash-db", @@ -8638,11 +8845,11 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "scale-info", "schnellru", "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-externalities 0.25.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "thiserror", "tracing", "trie-db", @@ -8652,7 +8859,7 @@ dependencies = [ [[package]] name = "sp-version" version = "29.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8661,7 +8868,7 @@ dependencies = [ "serde", "sp-crypto-hashing-proc-macro", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-version-proc-macro", "thiserror", ] @@ -8669,7 +8876,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "13.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8680,7 +8887,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -8702,7 +8909,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "27.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -8710,7 +8917,7 @@ dependencies = [ "serde", "smallvec", "sp-arithmetic", - "sp-debug-derive 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-debug-derive 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] @@ -8906,7 +9113,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "subcoin-primitives", "subcoin-service", "subcoin-test-service", @@ -9012,7 +9219,7 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-session", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-transaction-pool", "sp-version", "subcoin-runtime-primitives", @@ -9027,7 +9234,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-std 14.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", ] [[package]] @@ -9060,8 +9267,8 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", - "sp-tracing 16.0.0 (git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin)", + "sp-storage 19.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", + "sp-tracing 16.0.0 (git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1)", "sp-trie", "subcoin-primitives", "subcoin-runtime", @@ -9088,7 +9295,7 @@ dependencies = [ [[package]] name = "substrate-bip39" version = "0.4.7" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -9100,12 +9307,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "11.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" [[package]] name = "substrate-frame-rpc-system" version = "28.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "docify", "frame-system-rpc-runtime-api", @@ -9125,9 +9332,11 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ - "hyper", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "log", "prometheus", "thiserror", @@ -9137,7 +9346,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "17.0.0" -source = "git+https://github.com/liuchengxu/polkadot-sdk?branch=subcoin#c4a04f05a2d1c5e463385e74014d36a867d73adf" +source = "git+https://github.com/subcoin-project/polkadot-sdk?branch=subcoin-v1#e0646686468ca13cbf79ac1f00aa19384ded06b5" dependencies = [ "build-helper", "cargo_metadata", @@ -9199,6 +9408,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -9305,6 +9525,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "time" version = "0.3.36" @@ -9505,6 +9735,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite 0.2.14", + "tokio", "tower-layer", "tower-service", "tracing", @@ -9512,17 +9743,15 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "bitflags 2.6.0", "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "pin-project-lite 0.2.14", "tower-layer", "tower-service", @@ -9650,7 +9879,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.10", "thiserror", @@ -9676,7 +9905,7 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand 0.8.5", + "rand", "smallvec", "thiserror", "tinyvec", @@ -9697,7 +9926,7 @@ dependencies = [ "lru-cache", "once_cell", "parking_lot 0.12.3", - "rand 0.8.5", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -9727,10 +9956,10 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", - "rand 0.8.5", + "rand", "rustls 0.21.12", "sha1", "thiserror", @@ -9746,7 +9975,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -9827,6 +10056,15 @@ dependencies = [ "bytes", "futures-io", "futures-util", +] + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +dependencies = [ + "bytes", "tokio-util", ] @@ -9904,9 +10142,9 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "sha2 0.10.8", "sha3", "thiserror", @@ -9932,12 +10170,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -10259,7 +10491,7 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", @@ -10655,8 +10887,8 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.3", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "serde", "zeroize", ] @@ -10667,12 +10899,29 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", + "data-encoding", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs 0.6.1", "data-encoding", - "der-parser", + "der-parser 9.0.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.7.0", "rusticata-macros", "thiserror", "time", @@ -10704,7 +10953,7 @@ dependencies = [ "nohash-hasher", "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 9f495e37..7b89b6f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = fastrand = "2.0.2" futures = "0.3" futures-timer = "3.0.1" -jsonrpsee = { version = "0.22", features = ["server"] } +jsonrpsee = { version = "0.23", features = ["server"] } hex = "0.4" hex-literal = "0.4.1" indexmap = "2.2.6" @@ -47,7 +47,7 @@ log = { version = "0.4", default-features = false } once_cell = "1.19.0" parking_lot = "0.12" scale-info = { version = "2.6.0", default-features = false } -serde = "1" +serde = "1.0.204" serde_json = "1" tempfile = "3.10.1" thiserror = "1.0" @@ -55,54 +55,54 @@ tokio = "1.37.0" tracing = "0.1" # Disable the default `rocksdb` feature -frame-benchmarking-cli = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -frame-support = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -frame-system = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -frame-try-runtime = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -pallet-balances = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -pallet-transaction-payment = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } +frame-benchmarking-cli = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +frame-support = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +frame-system = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +frame-try-runtime = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +pallet-balances = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +pallet-transaction-payment = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } # Disable the default `rocksdb` feature -sc-cli = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sc-client-api = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-consensus = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-executor = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-informant = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-network = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-network-sync = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-rpc = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } +sc-cli = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sc-client-api = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-consensus = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-executor = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-informant = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-network = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-network-sync = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-rpc = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } # Disable the default `rocksdb` feature -sc-service = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sc-storage-monitor = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-sysinfo = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-telemetry = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-transaction-pool = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-transaction-pool-api = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sc-utils = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sp-api = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-blockchain = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-block-builder = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-consensus = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-core = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-database = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-genesis-builder = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-keyring = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sp-keystore = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sp-inherents = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-io = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-rpc = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sp-runtime = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-session = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-state-machine = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -sp-std = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-storage = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-tracing = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-transaction-pool = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-trie = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -sp-version = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin", default-features = false } -substrate-build-script-utils = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -substrate-frame-rpc-system = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } -substrate-wasm-builder = { git = "https://github.com/liuchengxu/polkadot-sdk", branch = "subcoin" } +sc-service = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sc-storage-monitor = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-sysinfo = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-telemetry = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-transaction-pool = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-transaction-pool-api = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sc-utils = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sp-api = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-blockchain = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-block-builder = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-consensus = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-core = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-database = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-genesis-builder = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-keyring = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sp-keystore = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sp-inherents = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-io = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-rpc = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sp-runtime = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-session = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-state-machine = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +sp-std = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-storage = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-tracing = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-transaction-pool = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-trie = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +sp-version = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1", default-features = false } +substrate-build-script-utils = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +substrate-frame-rpc-system = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } +substrate-wasm-builder = { git = "https://github.com/subcoin-project/polkadot-sdk", branch = "subcoin-v1" } pallet-bitcoin = { path = "crates/pallet-bitcoin", default-features = false } pallet-executive = { path = "crates/pallet-executive", default-features = false } @@ -126,3 +126,7 @@ inherits = "release" # Sacrifice compile speed for execution speed by using optimization flags: lto = "fat" # https://doc.rust-lang.org/rustc/linker-plugin-lto.html codegen-units = 1 # https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units + +[profile.profiling] +inherits = "release" +debug = true diff --git a/crates/sc-consensus-nakamoto/src/import_queue.rs b/crates/sc-consensus-nakamoto/src/import_queue.rs index 7aadb576..feef266b 100644 --- a/crates/sc-consensus-nakamoto/src/import_queue.rs +++ b/crates/sc-consensus-nakamoto/src/import_queue.rs @@ -95,7 +95,7 @@ pub struct VerifyNothing; #[async_trait::async_trait] impl sc_consensus::Verifier for VerifyNothing { async fn verify( - &mut self, + &self, block: BlockImportParams, ) -> Result, String> { Ok(BlockImportParams::new(block.origin, block.header)) diff --git a/crates/subcoin-informant/src/display.rs b/crates/subcoin-informant/src/display.rs index cdef9f2b..7593f8fe 100644 --- a/crates/subcoin-informant/src/display.rs +++ b/crates/subcoin-informant/src/display.rs @@ -125,7 +125,7 @@ impl InformantDisplay { tracing::info!( target: "subcoin", - "{level} {}{target} ({} peers), best: #{} ({best_bitcoin_hash},{best_hash}), confirmed #{} ({finalized_bitcoin_hash},{finalized_hash}), {} {}", + "{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), diff --git a/crates/subcoin-network/src/block_downloader.rs b/crates/subcoin-network/src/block_downloader.rs index 3ede91f3..d40c0d3e 100644 --- a/crates/subcoin-network/src/block_downloader.rs +++ b/crates/subcoin-network/src/block_downloader.rs @@ -149,8 +149,8 @@ impl BlockDownloadManager { { tracing::debug!( best_number, - self.best_queued_number, - "Too many blocks in the queue, pausing download", + best_queued_number = self.best_queued_number, + "⏸️ Pausing download: too many blocks in the queue", ); self.last_overloaded_queue_log_time.replace(Instant::now()); } diff --git a/crates/subcoin-network/src/connection.rs b/crates/subcoin-network/src/connection.rs index d41bf753..9f438cef 100644 --- a/crates/subcoin-network/src/connection.rs +++ b/crates/subcoin-network/src/connection.rs @@ -274,14 +274,11 @@ async fn read_peer_messages( decoder.input(&read_buffer[..n]); while let Some(msg) = decoder.decode_next::()? { - // TODO: patch upstream to avoid the clone? - let payload = msg.payload().clone(); - network_event_sender .send(Event::PeerMessage { from: peer, direction, - payload, + payload: msg.into_payload(), }) .map_err(|_| Error::NetworkEventStreamError)?; } diff --git a/crates/subcoin-network/src/peer_manager.rs b/crates/subcoin-network/src/peer_manager.rs index 869beb94..fe09e078 100644 --- a/crates/subcoin-network/src/peer_manager.rs +++ b/crates/subcoin-network/src/peer_manager.rs @@ -622,11 +622,10 @@ where last_pong_at: Instant::now(), }; - tracing::debug!( - "Received pong from {peer_id}, average latency: {}ms", - peer_info.ping_latency.average() - ); + let average_latency = peer_info.ping_latency.average(); + + tracing::debug!("Received pong from {peer_id} (Avg. Latency: {average_latency}ms)"); - Ok(peer_info.ping_latency.average()) + Ok(average_latency) } } diff --git a/crates/subcoin-node/Cargo.toml b/crates/subcoin-node/Cargo.toml index 7e9af949..2a7feeea 100644 --- a/crates/subcoin-node/Cargo.toml +++ b/crates/subcoin-node/Cargo.toml @@ -59,3 +59,4 @@ substrate-build-script-utils = { workspace = true } runtime-benchmarks = [ "sc-service/runtime-benchmarks", ] +rocksdb = ["sc-cli/rocksdb"] diff --git a/crates/subcoin-node/src/commands/run.rs b/crates/subcoin-node/src/commands/run.rs index a071a2de..7816d3e6 100644 --- a/crates/subcoin-node/src/commands/run.rs +++ b/crates/subcoin-node/src/commands/run.rs @@ -1,6 +1,6 @@ use crate::cli::params::{CommonParams, NetworkParams}; use clap::Parser; -use sc_cli::{DatabasePruningMode, NodeKeyParams, PruningParams, Role, SharedParams}; +use sc_cli::{DatabasePruningMode, ImportParams, NodeKeyParams, PruningParams, Role, SharedParams}; use sc_client_api::UsageProvider; use sc_consensus_nakamoto::{BitcoinBlockImporter, BlockVerification, ImportConfig}; use sc_service::{BlocksPruning, Configuration, TaskManager}; @@ -37,6 +37,10 @@ pub struct Run { #[allow(missing_docs)] #[clap(flatten)] pub network_params: NetworkParams, + + #[allow(missing_docs)] + #[clap(flatten)] + pub import_params: ImportParams, } impl Run { @@ -58,6 +62,7 @@ impl Run { pub struct RunCmd { shared_params: SharedParams, pruning_params: PruningParams, + import_params: ImportParams, } impl RunCmd { @@ -70,6 +75,7 @@ impl RunCmd { Self { shared_params, pruning_params, + import_params: run.import_params.clone(), } } @@ -195,6 +201,10 @@ impl sc_cli::CliConfiguration for RunCmd { &self.shared_params } + fn import_params(&self) -> Option<&ImportParams> { + Some(&self.import_params) + } + fn pruning_params(&self) -> Option<&PruningParams> { Some(&self.pruning_params) } diff --git a/crates/subcoin-runtime/src/lib.rs b/crates/subcoin-runtime/src/lib.rs index 58791663..3aefb3c5 100644 --- a/crates/subcoin-runtime/src/lib.rs +++ b/crates/subcoin-runtime/src/lib.rs @@ -34,7 +34,6 @@ use sp_core::{ConstU32, OpaqueMetadata}; use sp_inherents::{CheckInherentsResult, InherentData}; use sp_runtime::transaction_validity::{TransactionSource, TransactionValidity}; use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode}; -use sp_std::boxed::Box; use sp_std::vec; use sp_std::vec::Vec; #[cfg(feature = "std")] diff --git a/crates/subcoin-service/src/lib.rs b/crates/subcoin-service/src/lib.rs index a123346f..15628ae8 100644 --- a/crates/subcoin-service/src/lib.rs +++ b/crates/subcoin-service/src/lib.rs @@ -576,7 +576,7 @@ pub struct VerifyNothing; #[async_trait::async_trait] impl Verifier for VerifyNothing { async fn verify( - &mut self, + &self, block: BlockImportParams, ) -> Result, String> { Ok(BlockImportParams::new(block.origin, block.header))