diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 81b821c93c..b32ef6915e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,6 +18,9 @@ jobs: - name: Install stable toolchain uses: dtolnay/rust-toolchain@stable + - name: Install Machete + uses: bnjbvr/cargo-machete@main + - name: Cache uses: actions/cache@v3 with: @@ -28,6 +31,9 @@ jobs: ~/.cargo/git/db/ target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + + - name: Run cargo machete #checks for unused dependencies + run: cargo machete - name: Run cargo check run: cargo check --tests --workspace --benches diff --git a/Cargo.lock b/Cargo.lock index 45beeb50ef..8564c8248c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" [[package]] name = "approx" @@ -233,7 +233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", + "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -322,7 +322,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.1", "event-listener-strategy", "pin-project-lite", ] @@ -373,7 +373,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -384,22 +384,13 @@ checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", + "syn 2.0.43", ] [[package]] @@ -570,7 +561,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -876,9 +867,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive", @@ -886,9 +877,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -905,7 +896,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -1022,7 +1013,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.11", + "clap 4.4.12", "criterion-plot", "is-terminal", "itertools 0.10.5", @@ -1047,17 +1038,11 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - [[package]] name = "crossbeam-channel" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1076,21 +1061,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if 1.0.0", ] @@ -1133,12 +1117,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.1" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" dependencies = [ "nix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1343,9 +1327,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" dependencies = [ "concurrent-queue", "parking", @@ -1358,7 +1342,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.1", "pin-project-lite", ] @@ -1470,9 +1454,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1485,9 +1469,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1495,15 +1479,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1512,9 +1496,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1546,32 +1530,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1677,15 +1661,6 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[package]] name = "hashbrown" version = "0.11.2" @@ -1707,19 +1682,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin", - "stable_deref_trait", -] - [[package]] name = "heck" version = "0.4.1" @@ -1992,13 +1954,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi 0.3.3", "rustix 0.38.28", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2063,7 +2025,6 @@ dependencies = [ name = "kaspa-addressmanager" version = "0.13.1" dependencies = [ - "borsh", "igd-next", "itertools 0.11.0", "kaspa-consensus-core", @@ -2074,7 +2035,6 @@ dependencies = [ "log", "parking_lot", "rand 0.8.5", - "rocksdb", "serde", "statest", "statrs", @@ -2096,9 +2056,7 @@ dependencies = [ "borsh", "bs58", "faster-hex 0.6.1", - "getrandom 0.2.11", "hmac", - "js-sys", "kaspa-utils", "once_cell", "pbkdf2", @@ -2120,7 +2078,6 @@ name = "kaspa-cli" version = "0.13.1" dependencies = [ "async-trait", - "borsh", "cfg-if 1.0.0", "convert_case 0.6.0", "dashmap", @@ -2144,7 +2101,6 @@ dependencies = [ "separator", "serde", "serde_json", - "textwrap 0.16.0", "thiserror", "tokio", "wasm-bindgen", @@ -2153,7 +2109,6 @@ dependencies = [ "workflow-dom", "workflow-log", "workflow-node", - "workflow-nw", "workflow-store", "workflow-terminal", "workflow-wasm", @@ -2181,12 +2136,10 @@ name = "kaspa-consensus" version = "0.13.1" dependencies = [ "async-channel 2.1.1", - "bincode", "criterion", "crossbeam-channel", "faster-hex 0.6.1", "flate2", - "futures-util", "indexmap 2.1.0", "itertools 0.11.0", "kaspa-consensus-core", @@ -2222,18 +2175,14 @@ dependencies = [ name = "kaspa-consensus-core" version = "0.13.1" dependencies = [ - "async-trait", "bincode", "borsh", - "cfg-if 1.0.0", "criterion", "faster-hex 0.6.1", "futures-util", - "getrandom 0.2.11", "itertools 0.11.0", "js-sys", "kaspa-addresses", - "kaspa-core", "kaspa-hashes", "kaspa-math", "kaspa-merkle", @@ -2251,7 +2200,6 @@ dependencies = [ "wasm-bindgen-test", "web-sys", "workflow-core", - "workflow-log", "workflow-wasm", ] @@ -2262,7 +2210,6 @@ dependencies = [ "async-channel 2.1.1", "cfg-if 1.0.0", "derive_more", - "futures", "kaspa-consensus-core", "kaspa-core", "kaspa-hashes", @@ -2270,8 +2217,6 @@ dependencies = [ "kaspa-utils", "log", "paste", - "thiserror", - "triggered", ] [[package]] @@ -2300,17 +2245,12 @@ dependencies = [ name = "kaspa-consensusmanager" version = "0.13.1" dependencies = [ - "duration-string", - "futures", - "futures-util", "itertools 0.11.0", "kaspa-consensus-core", - "kaspa-consensus-notify", "kaspa-core", "kaspa-utils", "log", "parking_lot", - "rand 0.8.5", "tokio", ] @@ -2338,12 +2278,9 @@ version = "0.13.1" dependencies = [ "async-trait", "borsh", - "cfg-if 1.0.0", "downcast-rs", - "futures", "kaspa-addresses", "kaspa-consensus-core", - "kaspa-wallet-core", "nw-sys", "serde", "thiserror", @@ -2362,11 +2299,9 @@ dependencies = [ "enum-primitive-derive", "faster-hex 0.6.1", "indexmap 2.1.0", - "itertools 0.11.0", "kaspa-hashes", "kaspa-utils", "num-traits", - "num_cpus", "parking_lot", "rand 0.8.5", "rocksdb", @@ -2383,9 +2318,7 @@ dependencies = [ "async-channel 2.1.1", "async-stream", "async-trait", - "faster-hex 0.6.1", "futures", - "h2", "kaspa-core", "kaspa-grpc-core", "kaspa-notify", @@ -2394,26 +2327,18 @@ dependencies = [ "kaspa-utils-tower", "log", "paste", - "prost", "rand 0.8.5", "regex", "thiserror", "tokio", - "tokio-stream", "tonic", - "triggered", ] [[package]] name = "kaspa-grpc-core" version = "0.13.1" dependencies = [ - "async-channel 2.1.1", - "async-stream", - "async-trait", "faster-hex 0.6.1", - "futures", - "h2", "kaspa-consensus-core", "kaspa-core", "kaspa-notify", @@ -2422,14 +2347,8 @@ dependencies = [ "log", "paste", "prost", - "rand 0.8.5", - "regex", - "thiserror", - "tokio", - "tokio-stream", "tonic", "tonic-build", - "triggered", "workflow-core", ] @@ -2438,9 +2357,7 @@ name = "kaspa-grpc-server" version = "0.13.1" dependencies = [ "async-channel 2.1.1", - "async-stream", "async-trait", - "faster-hex 0.6.1", "futures", "h2", "itertools 0.11.0", @@ -2455,16 +2372,11 @@ dependencies = [ "kaspa-utils", "kaspa-utils-tower", "log", - "once_cell", "parking_lot", - "paste", - "prost", - "rand 0.8.5", "thiserror", "tokio", "tokio-stream", "tonic", - "triggered", "uuid 1.6.1", ] @@ -2493,19 +2405,12 @@ dependencies = [ name = "kaspa-index-core" version = "0.13.1" dependencies = [ - "async-channel 2.1.1", - "async-trait", "derive_more", - "futures", "kaspa-consensus-core", - "kaspa-hashes", "kaspa-notify", "kaspa-utils", - "log", "paste", "serde", - "thiserror", - "triggered", ] [[package]] @@ -2515,25 +2420,21 @@ dependencies = [ "async-channel 2.1.1", "async-trait", "derive_more", - "futures", "kaspa-consensus", "kaspa-consensus-core", "kaspa-consensus-notify", "kaspa-consensusmanager", "kaspa-core", "kaspa-database", - "kaspa-hashes", "kaspa-index-core", "kaspa-notify", "kaspa-utils", "kaspa-utxoindex", "log", "parking_lot", - "paste", "rand 0.8.5", "thiserror", "tokio", - "triggered", ] [[package]] @@ -2553,7 +2454,6 @@ dependencies = [ "thiserror", "wasm-bindgen", "workflow-core", - "workflow-log", "workflow-wasm", ] @@ -2568,10 +2468,8 @@ dependencies = [ name = "kaspa-metrics-core" version = "0.13.1" dependencies = [ - "async-trait", "borsh", "futures", - "kaspa-core", "kaspa-rpc-core", "separator", "serde", @@ -2585,7 +2483,6 @@ name = "kaspa-mining" version = "0.13.1" dependencies = [ "criterion", - "futures-util", "itertools 0.11.0", "kaspa-addresses", "kaspa-consensus-core", @@ -2593,16 +2490,13 @@ dependencies = [ "kaspa-core", "kaspa-hashes", "kaspa-mining-errors", - "kaspa-muhash", "kaspa-txscript", "kaspa-utils", "log", "parking_lot", "rand 0.8.5", "secp256k1", - "serde", "smallvec", - "thiserror", "tokio", ] @@ -2636,7 +2530,6 @@ dependencies = [ "borsh", "derive_more", "futures", - "futures-util", "itertools 0.11.0", "kaspa-addresses", "kaspa-consensus-core", @@ -2651,9 +2544,7 @@ dependencies = [ "serde", "thiserror", "tokio", - "triggered", "workflow-core", - "workflow-log", ] [[package]] @@ -2662,19 +2553,14 @@ version = "0.0.2" dependencies = [ "async-trait", "borsh", - "cfg-if 1.0.0", "downcast", "futures", - "js-sys", "kaspa-cli", - "kaspa-consensus-core", "kaspa-core", "kaspa-daemon", "kaspa-metrics-core", - "kaspa-rpc-core", "kaspa-wallet-core", "nw-sys", - "regex", "serde", "serde_json", "thiserror", @@ -2714,7 +2600,6 @@ dependencies = [ "log", "parking_lot", "rand 0.8.5", - "thiserror", "tokio", "tokio-stream", "uuid 1.6.1", @@ -2724,8 +2609,6 @@ dependencies = [ name = "kaspa-p2p-lib" version = "0.13.1" dependencies = [ - "borsh", - "ctrlc", "futures", "h2", "hex", @@ -2741,7 +2624,6 @@ dependencies = [ "parking_lot", "prost", "seqlock", - "serde", "thiserror", "tokio", "tokio-stream", @@ -2780,7 +2662,6 @@ dependencies = [ name = "kaspa-rpc-core" version = "0.13.1" dependencies = [ - "async-channel 2.1.1", "async-trait", "borsh", "derive_more", @@ -2793,7 +2674,6 @@ dependencies = [ "kaspa-core", "kaspa-hashes", "kaspa-index-core", - "kaspa-math", "kaspa-mining-errors", "kaspa-notify", "kaspa-txscript", @@ -2808,7 +2688,6 @@ dependencies = [ "uuid 1.6.1", "wasm-bindgen", "workflow-core", - "workflow-wasm", ] [[package]] @@ -2857,17 +2736,13 @@ name = "kaspa-testing-integration" version = "0.13.1" dependencies = [ "async-channel 2.1.1", - "bincode", "criterion", - "crossbeam-channel", "faster-hex 0.6.1", "flate2", "futures-util", - "indexmap 2.1.0", "itertools 0.11.0", "kaspa-addresses", "kaspa-alloc", - "kaspa-bip32", "kaspa-consensus", "kaspa-consensus-core", "kaspa-consensus-notify", @@ -2879,29 +2754,23 @@ dependencies = [ "kaspa-hashes", "kaspa-index-processor", "kaspa-math", - "kaspa-merkle", "kaspa-muhash", "kaspa-notify", - "kaspa-pow", "kaspa-rpc-core", "kaspa-txscript", "kaspa-txscript-errors", "kaspa-utils", "kaspa-utxoindex", - "kaspa-wrpc-server", "kaspad", "log", "parking_lot", "rand 0.8.5", "rand_distr 0.4.3", "rayon", - "rocksdb", "secp256k1", "serde", "serde_json", - "smallvec", "tempfile", - "thiserror", "tokio", ] @@ -2928,7 +2797,6 @@ dependencies = [ "sha2", "smallvec", "thiserror", - "wasm-bindgen", ] [[package]] @@ -2954,7 +2822,6 @@ dependencies = [ "futures-util", "ipnet", "itertools 0.11.0", - "log", "parking_lot", "rand 0.8.5", "rlimit", @@ -2997,7 +2864,6 @@ dependencies = [ "log", "parking_lot", "rand 0.8.5", - "rocksdb", "serde", "thiserror", ] @@ -3006,26 +2872,18 @@ dependencies = [ name = "kaspa-wallet" version = "0.13.1" dependencies = [ - "async-std", - "async-trait", "kaspa-cli", "tokio", - "workflow-log", - "workflow-terminal", ] [[package]] name = "kaspa-wallet-cli-wasm" version = "0.13.1" dependencies = [ - "async-trait", - "js-sys", "kaspa-cli", "wasm-bindgen", "wasm-bindgen-futures", - "workflow-log", "workflow-terminal", - "workflow-wasm", ] [[package]] @@ -3044,13 +2902,11 @@ dependencies = [ "cfg-if 1.0.0", "chacha20poly1305", "dashmap", - "derivative", "downcast", "evpkdf", "faster-hex 0.6.1", "fixedstr", "futures", - "heapless", "hmac", "home", "itertools 0.11.0", @@ -3059,7 +2915,6 @@ dependencies = [ "kaspa-bip32", "kaspa-consensus-core", "kaspa-consensus-wasm", - "kaspa-core", "kaspa-hashes", "kaspa-notify", "kaspa-rpc-core", @@ -3071,7 +2926,6 @@ dependencies = [ "md-5", "pad", "pbkdf2", - "rand 0.8.5", "regex", "ripemd", "secp256k1", @@ -3090,7 +2944,6 @@ dependencies = [ "web-sys", "workflow-core", "workflow-log", - "workflow-node", "workflow-rpc", "workflow-store", "workflow-wasm", @@ -3119,7 +2972,6 @@ dependencies = [ "kaspa-addresses", "kaspa-consensus-core", "kaspa-consensus-wasm", - "kaspa-core", "kaspa-math", "kaspa-pow", "kaspa-rpc-core", @@ -3128,16 +2980,13 @@ dependencies = [ "kaspa-wrpc-client", "num", "wasm-bindgen", - "workflow-log", ] [[package]] name = "kaspa-wrpc-client" version = "0.13.1" dependencies = [ - "async-std", "async-trait", - "borsh", "futures", "js-sys", "kaspa-addresses", @@ -3146,11 +2995,8 @@ dependencies = [ "kaspa-notify", "kaspa-rpc-core", "kaspa-rpc-macros", - "paste", - "regex", "serde", "serde-wasm-bindgen", - "serde_json", "thiserror", "wasm-bindgen", "wasm-bindgen-futures", @@ -3165,17 +3011,14 @@ dependencies = [ name = "kaspa-wrpc-proxy" version = "0.13.1" dependencies = [ - "async-trait", - "clap 4.4.11", + "clap 4.4.12", "kaspa-consensus-core", "kaspa-grpc-client", "kaspa-rpc-core", - "kaspa-rpc-macros", "kaspa-wrpc-server", "num_cpus", "thiserror", "tokio", - "workflow-core", "workflow-log", "workflow-rpc", ] @@ -3186,7 +3029,6 @@ version = "0.13.1" dependencies = [ "async-trait", "borsh", - "futures", "kaspa-consensus-core", "kaspa-core", "kaspa-grpc-client", @@ -3196,13 +3038,9 @@ dependencies = [ "kaspa-rpc-service", "kaspa-utils", "log", - "num_cpus", "openssl", - "paste", - "serde", "thiserror", "tokio", - "workflow-core", "workflow-log", "workflow-rpc", ] @@ -3219,10 +3057,9 @@ name = "kaspad" version = "0.13.1" dependencies = [ "async-channel 2.1.1", - "clap 4.4.11", + "clap 4.4.12", "dhat", "dirs", - "futures-util", "kaspa-addresses", "kaspa-addressmanager", "kaspa-alloc", @@ -3238,7 +3075,6 @@ dependencies = [ "kaspa-mining", "kaspa-p2p-flows", "kaspa-perf-monitor", - "kaspa-rpc-core", "kaspa-rpc-service", "kaspa-txscript", "kaspa-utils", @@ -3247,12 +3083,6 @@ dependencies = [ "kaspa-wrpc-server", "log", "num_cpus", - "rand 0.8.5", - "rayon", - "tempfile", - "thiserror", - "tokio", - "workflow-log", ] [[package]] @@ -3534,18 +3364,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "mimalloc" @@ -3860,9 +3681,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3887,9 +3708,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.4.1", "cfg-if 1.0.0", @@ -3908,7 +3729,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -3928,9 +3749,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -4009,7 +3830,7 @@ checksum = "70df726c43c645ef1dde24c7ae14692036ebe5457c92c5f0ec4cfceb99634ff6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -4078,7 +3899,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -4106,9 +3927,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "polling" @@ -4176,7 +3997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -4213,9 +4034,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -4247,7 +4068,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.41", + "syn 2.0.43", "tempfile", "which", ] @@ -4262,7 +4083,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -4494,7 +4315,7 @@ dependencies = [ name = "rothschild" version = "0.13.1" dependencies = [ - "clap 4.4.11", + "clap 4.4.12", "faster-hex 0.6.1", "itertools 0.11.0", "kaspa-addresses", @@ -4503,7 +4324,6 @@ dependencies = [ "kaspa-grpc-client", "kaspa-rpc-core", "kaspa-txscript", - "kaspa-utils", "log", "secp256k1", "tokio", @@ -4611,11 +4431,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4742,7 +4562,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -4841,10 +4661,9 @@ name = "simpa" version = "0.13.1" dependencies = [ "async-channel 2.1.1", - "clap 4.4.11", + "clap 4.4.12", "dhat", "futures", - "futures-util", "indexmap 2.1.0", "itertools 0.11.0", "kaspa-alloc", @@ -4930,15 +4749,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "statest" @@ -4992,9 +4802,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -5019,15 +4829,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", "redox_syscall", "rustix 0.38.28", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5061,22 +4871,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -5097,9 +4907,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -5119,9 +4929,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -5153,9 +4963,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -5187,7 +4997,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -5299,7 +5109,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -5372,7 +5182,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -5634,7 +5444,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", "wasm-bindgen-shared", ] @@ -5668,7 +5478,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6396,9 +6206,9 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" +checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" [[package]] name = "yaml-rust" @@ -6411,22 +6221,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 22402edf96..9ac071fac6 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -23,7 +23,6 @@ crate-type = ["cdylib", "lib"] [dependencies] async-trait.workspace = true -borsh.workspace = true cfg-if.workspace = true convert_case.workspace = true dashmap.workspace = true @@ -47,14 +46,12 @@ regex.workspace = true separator.workspace = true serde_json.workspace = true serde.workspace = true -textwrap.workspace = true thiserror.workspace = true wasm-bindgen.workspace = true workflow-core.workspace = true workflow-dom.workspace = true workflow-log.workspace = true workflow-node.workspace = true -workflow-nw.workspace = true workflow-store.workspace = true workflow-terminal.workspace = true workflow-wasm.workspace = true diff --git a/cli/src/imports.rs b/cli/src/imports.rs index 77c4fb4c52..97073230d4 100644 --- a/cli/src/imports.rs +++ b/cli/src/imports.rs @@ -6,12 +6,12 @@ pub use crate::notifier::Notification; pub use crate::result::Result; pub use crate::utils::*; pub use async_trait::async_trait; -pub use borsh::{BorshDeserialize, BorshSerialize}; + pub use cfg_if::cfg_if; pub use futures::stream::{Stream, StreamExt, TryStreamExt}; -pub use futures::{future::FutureExt, select, Future}; +pub use futures::{future::FutureExt, select}; pub use kaspa_consensus_core::network::{NetworkId, NetworkType}; -pub use kaspa_daemon::DaemonEvent; + pub use kaspa_utils::hex::*; pub use kaspa_wallet_core::derivation::gen0::import::*; pub use kaspa_wallet_core::prelude::*; @@ -22,15 +22,15 @@ pub use regex::Regex; pub use separator::Separatable; pub use serde::{Deserialize, Serialize}; pub use serde_json::{to_value, Value}; -pub use std::cmp; + pub use std::collections::HashMap; pub use std::collections::VecDeque; pub use std::ops::Deref; -pub use std::path::{Path, PathBuf}; -pub use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; -pub use std::sync::{Arc, Mutex, MutexGuard}; + +pub use std::sync::atomic::{AtomicBool, Ordering}; +pub use std::sync::{Arc, Mutex}; pub use workflow_core::prelude::*; pub use workflow_core::runtime as application_runtime; pub use workflow_log::*; -pub use workflow_nw::ipc::result::Result as IpcResult; + pub use workflow_terminal::prelude::*; diff --git a/components/addressmanager/Cargo.toml b/components/addressmanager/Cargo.toml index e8d80cb333..aefc2ccb81 100644 --- a/components/addressmanager/Cargo.toml +++ b/components/addressmanager/Cargo.toml @@ -8,7 +8,6 @@ include.workspace = true license.workspace = true [dependencies] -borsh.workspace = true igd-next.workspace = true itertools.workspace = true kaspa-consensus-core.workspace = true @@ -19,7 +18,6 @@ local-ip-address.workspace = true log.workspace = true parking_lot.workspace = true rand.workspace = true -rocksdb.workspace = true serde.workspace = true thiserror.workspace = true tokio.workspace = true diff --git a/components/connectionmanager/Cargo.toml b/components/connectionmanager/Cargo.toml index 7c4e4dd135..67f8b7357f 100644 --- a/components/connectionmanager/Cargo.toml +++ b/components/connectionmanager/Cargo.toml @@ -18,4 +18,7 @@ kaspa-utils.workspace = true log.workspace = true parking_lot.workspace = true rand.workspace = true -tokio.workspace = true \ No newline at end of file +tokio.workspace = true + +[package.metadata.cargo-machete] +ignored = ["log"] diff --git a/components/consensusmanager/Cargo.toml b/components/consensusmanager/Cargo.toml index 4eabb33831..7ad4233c5e 100644 --- a/components/consensusmanager/Cargo.toml +++ b/components/consensusmanager/Cargo.toml @@ -8,15 +8,13 @@ include.workspace = true license.workspace = true [dependencies] -duration-string.workspace = true -futures-util.workspace = true -futures.workspace = true itertools.workspace = true kaspa-consensus-core.workspace = true -kaspa-consensus-notify.workspace = true kaspa-core.workspace = true kaspa-utils.workspace = true log.workspace = true parking_lot.workspace = true -rand.workspace = true tokio.workspace = true + +[package.metadata.cargo-machete] +ignored = ["log"] diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index fe75ca6cfb..72857f376f 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -9,10 +9,8 @@ license.workspace = true [dependencies] async-channel.workspace = true -bincode.workspace = true crossbeam-channel.workspace = true faster-hex.workspace = true -futures-util.workspace = true indexmap.workspace = true itertools.workspace = true kaspa-consensus-core.workspace = true diff --git a/consensus/core/Cargo.toml b/consensus/core/Cargo.toml index e7c7dadaee..10e999744e 100644 --- a/consensus/core/Cargo.toml +++ b/consensus/core/Cargo.toml @@ -8,16 +8,12 @@ include.workspace = true license.workspace = true [dependencies] -async-trait.workspace = true borsh.workspace = true -cfg-if.workspace = true faster-hex.workspace = true futures-util.workspace = true -getrandom.workspace = true itertools.workspace = true js-sys.workspace = true kaspa-addresses.workspace = true -kaspa-core.workspace = true kaspa-hashes.workspace = true kaspa-math.workspace = true kaspa-merkle.workspace = true @@ -33,7 +29,6 @@ smallvec.workspace = true thiserror.workspace = true wasm-bindgen.workspace = true workflow-core.workspace = true -workflow-log.workspace = true workflow-wasm.workspace = true [dev-dependencies] diff --git a/consensus/notify/Cargo.toml b/consensus/notify/Cargo.toml index 6ffb291eb3..e9eb95fc5c 100644 --- a/consensus/notify/Cargo.toml +++ b/consensus/notify/Cargo.toml @@ -11,7 +11,6 @@ license.workspace = true async-channel.workspace = true cfg-if.workspace = true derive_more.workspace = true -futures.workspace = true kaspa-consensus-core.workspace = true kaspa-core.workspace = true kaspa-hashes.workspace = true @@ -19,5 +18,6 @@ kaspa-notify.workspace = true kaspa-utils.workspace = true log.workspace = true paste.workspace = true -thiserror.workspace = true -triggered.workspace = true + +[package.metadata.cargo-machete] +ignored = ["log", "paste"] diff --git a/consensus/src/processes/transaction_validator/mod.rs b/consensus/src/processes/transaction_validator/mod.rs index 8839af2047..5dff7f84ee 100644 --- a/consensus/src/processes/transaction_validator/mod.rs +++ b/consensus/src/processes/transaction_validator/mod.rs @@ -10,7 +10,6 @@ use kaspa_txscript::{ caches::{Cache, TxScriptCacheCounters}, SigCacheKey, }; -pub use tx_validation_in_isolation::*; #[derive(Clone)] pub struct TransactionValidator { diff --git a/crypto/hashes/Cargo.toml b/crypto/hashes/Cargo.toml index 147b36740a..7edc9ab6b6 100644 --- a/crypto/hashes/Cargo.toml +++ b/crypto/hashes/Cargo.toml @@ -37,3 +37,6 @@ cc.workspace = true [[bench]] name = "bench" harness = false + +[package.metadata.cargo-machete] +ignored = ["serde"] diff --git a/crypto/txscript/Cargo.toml b/crypto/txscript/Cargo.toml index 318482bcd2..190d7ef01a 100644 --- a/crypto/txscript/Cargo.toml +++ b/crypto/txscript/Cargo.toml @@ -24,7 +24,6 @@ serde.workspace = true sha2.workspace = true smallvec.workspace = true thiserror.workspace = true -wasm-bindgen.workspace = true [dev-dependencies] criterion.workspace = true diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index b8c586465f..e9a716e1b3 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -10,12 +10,9 @@ license.workspace = true [dependencies] async-trait.workspace = true borsh.workspace = true -cfg-if.workspace = true downcast-rs.workspace = true -futures.workspace = true kaspa-addresses.workspace = true kaspa-consensus-core.workspace = true -kaspa-wallet-core.workspace = true nw-sys.workspace = true serde.workspace = true thiserror.workspace = true diff --git a/database/Cargo.toml b/database/Cargo.toml index 23d8deef63..e9169d1435 100644 --- a/database/Cargo.toml +++ b/database/Cargo.toml @@ -12,10 +12,8 @@ bincode.workspace = true enum-primitive-derive.workspace = true faster-hex.workspace = true indexmap.workspace = true -itertools.workspace = true kaspa-hashes.workspace = true kaspa-utils.workspace = true -num_cpus.workspace = true num-traits.workspace = true parking_lot.workspace = true rand.workspace = true @@ -24,3 +22,6 @@ serde.workspace = true smallvec.workspace = true tempfile.workspace = true thiserror.workspace = true + +[package.metadata.cargo-machete] +ignored = ["num-traits"] diff --git a/indexes/core/Cargo.toml b/indexes/core/Cargo.toml index c80bcbe1f2..3cdec936b9 100644 --- a/indexes/core/Cargo.toml +++ b/indexes/core/Cargo.toml @@ -8,21 +8,17 @@ include.workspace = true license.workspace = true [dependencies] -async-channel.workspace = true -async-trait.workspace = true derive_more.workspace = true -futures.workspace = true kaspa-consensus-core.workspace = true -kaspa-hashes.workspace = true kaspa-notify.workspace = true kaspa-utils.workspace = true -log.workspace = true paste.workspace = true serde.workspace = true -thiserror.workspace = true -triggered.workspace = true [dev-dependencies] # parking_lot.workspace = true # tokio = { workspace = true, features = ["rt", "macros"] } -# rand = {workspace = true, features = [ "small_rng" ]} \ No newline at end of file +# rand = {workspace = true, features = [ "small_rng" ]} + +[package.metadata.cargo-machete] +ignored = ["paste"] \ No newline at end of file diff --git a/indexes/processor/Cargo.toml b/indexes/processor/Cargo.toml index 1cf60bc7fe..0cb080d8e6 100644 --- a/indexes/processor/Cargo.toml +++ b/indexes/processor/Cargo.toml @@ -13,7 +13,6 @@ kaspa-consensus-notify.workspace = true kaspa-consensusmanager.workspace = true kaspa-core.workspace = true kaspa-database.workspace = true -kaspa-hashes.workspace = true kaspa-index-core.workspace = true kaspa-notify.workspace = true kaspa-utils.workspace = true @@ -22,15 +21,15 @@ kaspa-utxoindex.workspace = true async-channel.workspace = true async-trait.workspace = true derive_more.workspace = true -futures.workspace = true log.workspace = true -paste.workspace = true thiserror.workspace = true tokio = { workspace = true, features = [ "rt-multi-thread", "macros", "signal" ]} -triggered.workspace = true [dev-dependencies] kaspa-consensus.workspace = true parking_lot.workspace = true tokio = { workspace = true, features = ["rt", "macros"] } -rand = {workspace = true, features = [ "small_rng" ]} \ No newline at end of file +rand = {workspace = true, features = [ "small_rng" ]} + +[package.metadata.cargo-machete] +ignored = ["log"] \ No newline at end of file diff --git a/indexes/utxoindex/Cargo.toml b/indexes/utxoindex/Cargo.toml index a3b771d73b..f6ab4ac1fd 100644 --- a/indexes/utxoindex/Cargo.toml +++ b/indexes/utxoindex/Cargo.toml @@ -18,7 +18,6 @@ kaspa-index-core.workspace = true kaspa-utils.workspace = true log.workspace = true parking_lot.workspace = true -rocksdb.workspace = true serde.workspace = true thiserror.workspace = true diff --git a/kaspad/Cargo.toml b/kaspad/Cargo.toml index 377485065d..81e74d9fda 100644 --- a/kaspad/Cargo.toml +++ b/kaspad/Cargo.toml @@ -1,56 +1,48 @@ -[package] -name = "kaspad" -description = "Kaspa full node daemon" -version.workspace = true -edition.workspace = true -authors.workspace = true -include.workspace = true -license.workspace = true -repository.workspace = true - -[lib] -name = "kaspad_lib" -crate-type = ["cdylib", "lib"] - -[dependencies] -kaspa-alloc.workspace = true # This changes the global allocator for all of the next dependencies so should be kept first - -kaspa-addresses.workspace = true -kaspa-addressmanager.workspace = true -kaspa-consensus-core.workspace = true -kaspa-consensus-notify.workspace = true -kaspa-consensus.workspace = true -kaspa-consensusmanager.workspace = true -kaspa-core.workspace = true -kaspa-database.workspace = true -kaspa-grpc-server.workspace = true -kaspa-hashes.workspace = true -kaspa-index-processor.workspace = true -kaspa-mining.workspace = true -kaspa-p2p-flows.workspace = true -kaspa-perf-monitor.workspace = true -kaspa-rpc-core.workspace = true -kaspa-rpc-service.workspace = true -kaspa-txscript.workspace = true -kaspa-utils.workspace = true -kaspa-utils-tower.workspace = true -kaspa-utxoindex.workspace = true -kaspa-wrpc-server.workspace = true - -async-channel.workspace = true -clap.workspace = true -dhat = { workspace = true, optional = true } -dirs.workspace = true -futures-util.workspace = true -log.workspace = true -num_cpus.workspace = true -rand.workspace = true -rayon.workspace = true -tempfile.workspace = true -thiserror.workspace = true -tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] } -workflow-log.workspace = true - -[features] -heap = ["dhat", "kaspa-alloc/heap"] -devnet-prealloc = ["kaspa-consensus/devnet-prealloc"] +[package] +name = "kaspad" +description = "Kaspa full node daemon" +version.workspace = true +edition.workspace = true +authors.workspace = true +include.workspace = true +license.workspace = true +repository.workspace = true + +[lib] +name = "kaspad_lib" +crate-type = ["cdylib", "lib"] + +[dependencies] +kaspa-alloc.workspace = true # This changes the global allocator for all of the next dependencies so should be kept first + +kaspa-addresses.workspace = true +kaspa-addressmanager.workspace = true +kaspa-consensus-core.workspace = true +kaspa-consensus-notify.workspace = true +kaspa-consensus.workspace = true +kaspa-consensusmanager.workspace = true +kaspa-core.workspace = true +kaspa-database.workspace = true +kaspa-grpc-server.workspace = true +kaspa-hashes.workspace = true +kaspa-index-processor.workspace = true +kaspa-mining.workspace = true +kaspa-p2p-flows.workspace = true +kaspa-perf-monitor.workspace = true +kaspa-rpc-service.workspace = true +kaspa-txscript.workspace = true +kaspa-utils.workspace = true +kaspa-utils-tower.workspace = true +kaspa-utxoindex.workspace = true +kaspa-wrpc-server.workspace = true + +async-channel.workspace = true +clap.workspace = true +dhat = { workspace = true, optional = true } +dirs.workspace = true +log.workspace = true +num_cpus.workspace = true + +[features] +heap = ["dhat", "kaspa-alloc/heap"] +devnet-prealloc = ["kaspa-consensus/devnet-prealloc"] diff --git a/kos/Cargo.toml b/kos/Cargo.toml index 99562e05a4..86f9b1e6ef 100644 --- a/kos/Cargo.toml +++ b/kos/Cargo.toml @@ -26,19 +26,14 @@ crate-type = ["cdylib", "rlib"] [dependencies] async-trait.workspace = true borsh.workspace = true -cfg-if.workspace = true downcast.workspace = true futures.workspace = true -js-sys.workspace = true kaspa-cli.workspace = true -kaspa-consensus-core.workspace = true kaspa-core.workspace = true kaspa-daemon.workspace = true kaspa-metrics-core.workspace = true -kaspa-rpc-core.workspace = true kaspa-wallet-core.workspace = true nw-sys.workspace = true -regex.workspace = true serde_json.workspace = true serde.workspace = true thiserror.workspace = true @@ -66,3 +61,6 @@ features = [ # 'CanvasRenderingContext2d' ] +[package.metadata.cargo-machete] +ignored = ["kaspa-cli", "wasm-bindgen-futures"] + diff --git a/kos/src/core/mod.rs b/kos/src/core/mod.rs index 2822bb399d..26f1efbd9f 100644 --- a/kos/src/core/mod.rs +++ b/kos/src/core/mod.rs @@ -1,6 +1,6 @@ #[allow(clippy::module_inception)] mod core; -pub use self::core::*; + mod ipc; pub use ipc::*; mod settings; diff --git a/kos/src/error.rs b/kos/src/error.rs index 5abec1b630..d56897ae95 100644 --- a/kos/src/error.rs +++ b/kos/src/error.rs @@ -7,6 +7,7 @@ use workflow_nw::ipc::ResponseError; use workflow_wasm::printable::Printable; #[derive(Error, Debug)] +#[allow(clippy::enum_variant_names)] pub enum Error { #[error("{0}")] Custom(String), diff --git a/kos/src/imports.rs b/kos/src/imports.rs index dff26fcbe3..d34720bd3d 100644 --- a/kos/src/imports.rs +++ b/kos/src/imports.rs @@ -1,6 +1,6 @@ pub use crate::core::MetricsCtl; pub use crate::core::*; -pub use crate::error::Error; + pub use crate::ipc::*; pub use crate::layout::Layout; pub use crate::metrics::*; @@ -8,31 +8,30 @@ pub use crate::result::Result; pub use crate::terminal::*; pub use async_trait::async_trait; pub use borsh::{BorshDeserialize, BorshSerialize}; -pub use futures::{future::join_all, select, select_biased, stream::StreamExt, FutureExt, Stream}; +pub use futures::{select, stream::StreamExt, FutureExt}; pub use kaspa_cli_lib::{KaspaCli, Options as KaspaCliOptions}; -pub use kaspa_consensus_core::network::NetworkType; + pub use kaspa_daemon::{ CpuMiner, CpuMinerConfig, CpuMinerCtl, DaemonEvent, DaemonKind, DaemonStatus, Daemons, Kaspad, KaspadConfig, KaspadCtl, Result as DaemonResult, }; pub use kaspa_wallet_core::settings::{DefaultSettings, SettingsStore, SettingsStoreT}; pub use nw_sys::prelude::*; -pub use regex::Regex; + pub use serde::{Deserialize, Serialize}; -pub use serde_json::{to_value, Value}; -pub use std::path::{Path, PathBuf}; -pub use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; +pub use serde_json::Value; + pub use wasm_bindgen::prelude::*; pub use workflow_core::channel::*; -pub use workflow_core::enums::Describe; + pub use workflow_core::runtime::*; pub use workflow_core::task::*; pub use workflow_core::time::*; -pub use workflow_d3::*; + pub use workflow_log::*; -pub use workflow_nw::ipc::result::Result as IpcResult; + pub use workflow_nw::ipc::*; pub use workflow_nw::prelude::*; pub use workflow_terminal::prelude::*; -pub use workflow_terminal::{CrLf, Modifiers, Options as TerminalOptions}; -pub use workflow_wasm::callback::{callback, AsCallback, Callback, CallbackMap}; +pub use workflow_terminal::{CrLf, Options as TerminalOptions}; +pub use workflow_wasm::callback::{callback, AsCallback, CallbackMap}; diff --git a/kos/src/metrics/mod.rs b/kos/src/metrics/mod.rs index b3e169e0f9..132d4257b1 100644 --- a/kos/src/metrics/mod.rs +++ b/kos/src/metrics/mod.rs @@ -1,6 +1,6 @@ #[allow(clippy::module_inception)] mod metrics; -pub use metrics::*; + mod ipc; pub use ipc::*; mod settings; diff --git a/kos/src/terminal/mod.rs b/kos/src/terminal/mod.rs index ac5c74b7fd..fa3ae8cd1f 100644 --- a/kos/src/terminal/mod.rs +++ b/kos/src/terminal/mod.rs @@ -1,6 +1,6 @@ #[allow(clippy::module_inception)] mod terminal; -pub use terminal::*; + mod ipc; pub use ipc::*; mod settings; diff --git a/math/Cargo.toml b/math/Cargo.toml index 947e6bbe86..a11bc84d4b 100644 --- a/math/Cargo.toml +++ b/math/Cargo.toml @@ -19,7 +19,6 @@ serde.workspace = true thiserror.workspace = true wasm-bindgen.workspace = true workflow-core.workspace = true -workflow-log.workspace = true workflow-wasm.workspace = true [dev-dependencies] diff --git a/metrics/core/Cargo.toml b/metrics/core/Cargo.toml index 5e8bba7741..ad81f2ad23 100644 --- a/metrics/core/Cargo.toml +++ b/metrics/core/Cargo.toml @@ -7,10 +7,8 @@ edition.workspace = true include.workspace = true [dependencies] -async-trait.workspace = true borsh.workspace = true futures.workspace = true -kaspa-core.workspace = true kaspa-rpc-core.workspace = true separator.workspace = true serde.workspace = true diff --git a/mining/Cargo.toml b/mining/Cargo.toml index 6f8a8d84ce..5d30f988a9 100644 --- a/mining/Cargo.toml +++ b/mining/Cargo.toml @@ -14,18 +14,13 @@ kaspa-consensusmanager.workspace = true kaspa-core.workspace = true kaspa-hashes.workspace = true kaspa-mining-errors.workspace = true -kaspa-muhash.workspace = true kaspa-txscript.workspace = true kaspa-utils.workspace = true - -futures-util.workspace = true itertools.workspace = true log.workspace = true parking_lot.workspace = true rand.workspace = true -serde.workspace = true smallvec.workspace = true -thiserror.workspace = true tokio = { workspace = true, features = [ "rt-multi-thread", "macros", "signal" ] } [dev-dependencies] @@ -36,3 +31,6 @@ secp256k1.workspace = true [[bench]] name = "bench" harness = false + +[package.metadata.cargo-machete] +ignored = ["log"] \ No newline at end of file diff --git a/notify/Cargo.toml b/notify/Cargo.toml index 40b76d5dd7..c960498cf7 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -12,7 +12,6 @@ async-channel.workspace = true async-trait.workspace = true borsh.workspace = true derive_more.workspace = true -futures-util.workspace = true futures.workspace = true itertools.workspace = true kaspa-addresses.workspace = true @@ -27,9 +26,7 @@ paste.workspace = true rand.workspace = true serde.workspace = true thiserror.workspace = true -triggered.workspace = true workflow-core.workspace = true -workflow-log.workspace = true [dev-dependencies] tokio = { workspace = true, features = ["rt", "macros"] } diff --git a/protocol/flows/Cargo.toml b/protocol/flows/Cargo.toml index 2c651ee6ca..9114098650 100644 --- a/protocol/flows/Cargo.toml +++ b/protocol/flows/Cargo.toml @@ -29,7 +29,6 @@ itertools.workspace = true log.workspace = true parking_lot.workspace = true rand.workspace = true -thiserror.workspace = true tokio = { workspace = true, features = [ "rt-multi-thread", "macros", "signal" ] } tokio-stream = { workspace = true, features = ["net"] } uuid = { workspace = true, features = ["v4", "fast-rng"] } diff --git a/protocol/p2p/Cargo.toml b/protocol/p2p/Cargo.toml index 7ea7893ae7..5af75dbe47 100644 --- a/protocol/p2p/Cargo.toml +++ b/protocol/p2p/Cargo.toml @@ -26,9 +26,6 @@ kaspa-hashes.workspace = true kaspa-math.workspace = true kaspa-utils.workspace = true kaspa-utils-tower.workspace = true - -borsh.workspace = true -ctrlc.workspace = true futures = { workspace = true, features = ["alloc"] } h2.workspace = true itertools.workspace = true @@ -36,7 +33,6 @@ log.workspace = true parking_lot.workspace = true prost.workspace = true seqlock.workspace = true -serde.workspace = true thiserror.workspace = true tokio = { workspace = true, features = [ "rt-multi-thread", "macros", "signal" ] } tokio-stream = { workspace = true, features = ["net"] } @@ -48,3 +44,6 @@ tonic-build = { workspace = true, features = ["prost"] } [dev-dependencies] hex.workspace = true + +[package.metadata.cargo-machete] +ignored = ["prost"] diff --git a/rothschild/Cargo.toml b/rothschild/Cargo.toml index 48abc45c9d..ec2c3bb645 100644 --- a/rothschild/Cargo.toml +++ b/rothschild/Cargo.toml @@ -14,7 +14,6 @@ kaspa-grpc-client.workspace = true kaspa-rpc-core.workspace = true kaspa-addresses.workspace = true kaspa-txscript.workspace = true -kaspa-utils.workspace = true clap.workspace = true faster-hex.workspace = true diff --git a/rpc/core/Cargo.toml b/rpc/core/Cargo.toml index 6afade05df..afedb9d77d 100644 --- a/rpc/core/Cargo.toml +++ b/rpc/core/Cargo.toml @@ -15,13 +15,10 @@ kaspa-consensus-wasm.workspace = true kaspa-core.workspace = true kaspa-hashes.workspace = true kaspa-index-core.workspace = true -kaspa-math.workspace = true kaspa-mining-errors.workspace = true kaspa-notify.workspace = true kaspa-txscript.workspace = true kaspa-utils.workspace = true - -async-channel.workspace = true async-trait.workspace = true borsh.workspace = true derive_more.workspace = true @@ -36,7 +33,9 @@ thiserror.workspace = true uuid.workspace = true wasm-bindgen.workspace = true workflow-core.workspace = true -workflow-wasm.workspace = true [dev-dependencies] serde_json.workspace = true + +[package.metadata.cargo-machete] +ignored = ["log"] diff --git a/rpc/core/src/lib.rs b/rpc/core/src/lib.rs index 2db9dc85a1..66e4ece3a8 100644 --- a/rpc/core/src/lib.rs +++ b/rpc/core/src/lib.rs @@ -15,7 +15,7 @@ pub mod prelude { } pub use api::notifications::*; -pub use convert::{block::*, notification::*, tx::*, utxo::*}; +pub use convert::utxo::*; pub use error::*; pub use model::script_class::*; pub use model::*; diff --git a/rpc/grpc/client/Cargo.toml b/rpc/grpc/client/Cargo.toml index 7d7ac5b328..15f1cb398e 100644 --- a/rpc/grpc/client/Cargo.toml +++ b/rpc/grpc/client/Cargo.toml @@ -18,16 +18,14 @@ kaspa-utils-tower.workspace = true async-channel.workspace = true async-stream.workspace = true async-trait.workspace = true -faster-hex.workspace = true futures.workspace = true -h2.workspace = true log.workspace = true paste.workspace = true -prost.workspace = true rand.workspace = true regex.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "macros", "sync", "time"] } -tokio-stream.workspace = true tonic = { workspace = true, features = ["gzip"] } -triggered.workspace = true + +[package.metadata.cargo-machete] +ignored = ["log"] \ No newline at end of file diff --git a/rpc/grpc/core/Cargo.toml b/rpc/grpc/core/Cargo.toml index 2895ead167..40a6b5f33a 100644 --- a/rpc/grpc/core/Cargo.toml +++ b/rpc/grpc/core/Cargo.toml @@ -13,24 +13,15 @@ kaspa-core.workspace = true kaspa-notify.workspace = true kaspa-rpc-core.workspace = true kaspa-utils.workspace = true - -async-channel.workspace = true -async-stream.workspace = true -async-trait.workspace = true -faster-hex.workspace = true -futures.workspace = true -h2.workspace = true log.workspace = true +faster-hex.workspace = true paste.workspace = true prost.workspace = true -rand.workspace = true -regex.workspace = true -thiserror.workspace = true -tokio = { workspace = true, features = ["rt-multi-thread", "macros", "sync", "time"] } -tokio-stream.workspace = true tonic = { workspace = true, features = ["tls", "gzip"] } -triggered.workspace = true workflow-core.workspace = true [build-dependencies] tonic-build = { workspace = true, features = ["prost"] } + +[package.metadata.cargo-machete] +ignored = ["prost", "log"] \ No newline at end of file diff --git a/rpc/grpc/server/Cargo.toml b/rpc/grpc/server/Cargo.toml index f37016b655..7762e2693f 100644 --- a/rpc/grpc/server/Cargo.toml +++ b/rpc/grpc/server/Cargo.toml @@ -19,23 +19,16 @@ kaspa-utils-tower.workspace = true kaspa-utils.workspace = true async-channel.workspace = true -async-stream.workspace = true async-trait.workspace = true -faster-hex.workspace = true futures.workspace = true h2.workspace = true itertools.workspace = true log.workspace = true -once_cell.workspace = true parking_lot.workspace = true -paste.workspace = true -prost.workspace = true -rand.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "macros", "sync", "time"] } tokio-stream.workspace = true tonic = { workspace = true, features = ["gzip"] } -triggered.workspace = true uuid.workspace = true [dev-dependencies] diff --git a/rpc/service/Cargo.toml b/rpc/service/Cargo.toml index faeaebc4bb..8ab1467a61 100644 --- a/rpc/service/Cargo.toml +++ b/rpc/service/Cargo.toml @@ -31,4 +31,7 @@ kaspa-utxoindex.workspace = true async-trait.workspace = true log.workspace = true tokio.workspace = true -workflow-rpc.workspace = true \ No newline at end of file +workflow-rpc.workspace = true + +[package.metadata.cargo-machete] +ignored = ["log"] \ No newline at end of file diff --git a/rpc/wrpc/client/Cargo.toml b/rpc/wrpc/client/Cargo.toml index f1d8b5dff3..cdc2258ea3 100644 --- a/rpc/wrpc/client/Cargo.toml +++ b/rpc/wrpc/client/Cargo.toml @@ -15,9 +15,7 @@ default = [] crate-type = ["cdylib", "lib"] [dependencies] -async-std.workspace = true async-trait.workspace = true -borsh.workspace = true futures.workspace = true js-sys.workspace = true kaspa-addresses.workspace = true @@ -26,9 +24,6 @@ kaspa-consensus-wasm.workspace = true kaspa-notify.workspace = true kaspa-rpc-core.workspace = true kaspa-rpc-macros.workspace = true -paste.workspace = true -regex.workspace = true -serde_json.workspace = true serde-wasm-bindgen.workspace = true serde.workspace = true thiserror.workspace = true @@ -38,4 +33,7 @@ workflow-core.workspace = true workflow-dom.workspace = true workflow-log.workspace = true workflow-rpc.workspace = true -workflow-wasm.workspace = true \ No newline at end of file +workflow-wasm.workspace = true + +[package.metadata.cargo-machete] +ignored = ["wasm-bindgen-futures"] diff --git a/rpc/wrpc/client/src/imports.rs b/rpc/wrpc/client/src/imports.rs index 100b6aaa31..f00a7630e7 100644 --- a/rpc/wrpc/client/src/imports.rs +++ b/rpc/wrpc/client/src/imports.rs @@ -15,10 +15,10 @@ pub use kaspa_rpc_core::{ api::ops::RpcApiOps, api::rpc::RpcApi, error::RpcResult, - notify::{collector::RpcCoreCollector, connection::ChannelConnection, mode::NotificationMode}, + notify::{connection::ChannelConnection, mode::NotificationMode}, prelude::*, }; -pub use regex::Regex; + pub use std::sync::{ atomic::{AtomicBool, Ordering}, Arc, Mutex, @@ -27,7 +27,6 @@ pub use wasm_bindgen::prelude::*; pub use workflow_core::{ channel::{Channel, DuplexChannel, Receiver}, task::spawn, - trigger::Listener, }; pub use workflow_log::*; pub use workflow_rpc::client::prelude::{Encoding as WrpcEncoding, *}; diff --git a/rpc/wrpc/proxy/Cargo.toml b/rpc/wrpc/proxy/Cargo.toml index ff3036ea62..4014de318c 100644 --- a/rpc/wrpc/proxy/Cargo.toml +++ b/rpc/wrpc/proxy/Cargo.toml @@ -8,17 +8,14 @@ include.workspace = true license.workspace = true [dependencies] -async-trait.workspace = true clap.workspace = true kaspa-consensus-core.workspace = true kaspa-grpc-client.workspace = true kaspa-rpc-core.workspace = true -kaspa-rpc-macros.workspace = true kaspa-wrpc-server.workspace = true num_cpus.workspace = true thiserror.workspace = true tokio.workspace = true -workflow-core.workspace = true workflow-log.workspace = true workflow-rpc.workspace = true diff --git a/rpc/wrpc/proxy/src/error.rs b/rpc/wrpc/proxy/src/error.rs index cafac5700e..0ce74d208f 100644 --- a/rpc/wrpc/proxy/src/error.rs +++ b/rpc/wrpc/proxy/src/error.rs @@ -1,4 +1,5 @@ #[derive(thiserror::Error, Debug)] +#[allow(clippy::enum_variant_names)] pub enum Error { #[error("{0}")] Other(String), diff --git a/rpc/wrpc/server/Cargo.toml b/rpc/wrpc/server/Cargo.toml index b76530fc4b..21e0a4f913 100644 --- a/rpc/wrpc/server/Cargo.toml +++ b/rpc/wrpc/server/Cargo.toml @@ -13,7 +13,6 @@ crate-type = ["cdylib", "lib"] [dependencies] async-trait.workspace = true borsh = { workspace = true, features = ["rc"] } -futures.workspace = true kaspa-consensus-core.workspace = true kaspa-core.workspace = true kaspa-grpc-client.workspace = true @@ -23,12 +22,8 @@ kaspa-rpc-macros.workspace = true kaspa-rpc-service.workspace = true kaspa-utils.workspace = true log.workspace = true -num_cpus.workspace = true -paste.workspace = true -serde = { workspace = true, features = ["rc"] } thiserror.workspace = true tokio.workspace = true -workflow-core.workspace = true workflow-log.workspace = true workflow-rpc.workspace = true @@ -37,3 +32,6 @@ workflow-rpc.workspace = true # as used in the release deployment in GitHub CI # see: https://github.com/rust-cross/cargo-zigbuild/issues/127 openssl = { version = "0.10", features = ["vendored"] } + +[package.metadata.cargo-machete] +ignored = ["log"] diff --git a/simpa/Cargo.toml b/simpa/Cargo.toml index 12e70d43c8..a10fb5d20c 100644 --- a/simpa/Cargo.toml +++ b/simpa/Cargo.toml @@ -22,7 +22,6 @@ kaspa-utils.workspace = true async-channel.workspace = true clap.workspace = true dhat = { workspace = true, optional = true } -futures-util.workspace = true futures.workspace = true indexmap.workspace = true itertools.workspace = true diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml index 8d0c3c01ab..a3de0592e5 100644 --- a/testing/integration/Cargo.toml +++ b/testing/integration/Cargo.toml @@ -19,40 +19,30 @@ kaspa-grpc-client.workspace = true kaspa-grpc-core.workspace = true kaspa-hashes.workspace = true kaspa-math.workspace = true -kaspa-merkle.workspace = true kaspa-notify.workspace = true -kaspa-pow.workspace = true kaspa-rpc-core.workspace = true -kaspad.workspace = true async-channel.workspace = true -bincode.workspace = true -crossbeam-channel.workspace = true +kaspad.workspace = true faster-hex.workspace = true flate2.workspace = true futures-util.workspace = true -indexmap.workspace = true itertools.workspace = true -kaspa-bip32.workspace = true kaspa-database.workspace = true kaspa-index-processor.workspace = true kaspa-muhash.workspace = true kaspa-txscript.workspace = true kaspa-utils.workspace = true kaspa-utxoindex.workspace = true -kaspa-wrpc-server.workspace = true log.workspace = true parking_lot.workspace = true rand_distr.workspace = true rand.workspace = true rayon.workspace = true -rocksdb.workspace = true secp256k1.workspace = true serde_json.workspace = true serde.workspace = true -smallvec.workspace = true tempfile.workspace = true -thiserror.workspace = true tokio.workspace = true [dev-dependencies] @@ -64,3 +54,6 @@ kaspa-txscript-errors.workspace = true [features] html_reports = [] devnet-prealloc = ["kaspad/devnet-prealloc"] + +[package.metadata.cargo-machete] +ignored = ["kaspad"] \ No newline at end of file diff --git a/utils/Cargo.toml b/utils/Cargo.toml index d2f71011c9..abaffcb7e5 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -21,7 +21,6 @@ smallvec.workspace = true thiserror.workspace = true triggered.workspace = true uuid.workspace = true -log.workspace = true [target.'cfg(not(target_arch = "wasm32"))'.dependencies] rlimit.workspace = true diff --git a/wallet/bip32/Cargo.toml b/wallet/bip32/Cargo.toml index 50c97edd1b..ad819c8e39 100644 --- a/wallet/bip32/Cargo.toml +++ b/wallet/bip32/Cargo.toml @@ -12,9 +12,7 @@ include = ["src/**/*.rs", "Cargo.toml", "src/**/*.txt"] [dependencies] borsh.workspace = true bs58.workspace = true -getrandom = { workspace = true, features = ["js"] } hmac.workspace = true -js-sys.workspace = true kaspa-utils.workspace = true once_cell.workspace = true pbkdf2.workspace = true @@ -31,4 +29,4 @@ workflow-wasm.workspace = true zeroize.workspace = true [dev-dependencies] -faster-hex.workspace = true \ No newline at end of file +faster-hex.workspace = true diff --git a/wallet/bip32/src/mnemonic/mod.rs b/wallet/bip32/src/mnemonic/mod.rs index ef793b5a74..611d88b050 100644 --- a/wallet/bip32/src/mnemonic/mod.rs +++ b/wallet/bip32/src/mnemonic/mod.rs @@ -11,6 +11,3 @@ mod phrase; pub(crate) mod seed; pub use self::{language::Language, phrase::Mnemonic, phrase::WordCount}; - -//#[cfg(feature = "bip39")] -pub use self::seed::Seed; diff --git a/wallet/core/Cargo.toml b/wallet/core/Cargo.toml index ad7ba6e74c..4db97659cb 100644 --- a/wallet/core/Cargo.toml +++ b/wallet/core/Cargo.toml @@ -29,13 +29,11 @@ cfb-mode.workspace = true cfg-if.workspace = true chacha20poly1305.workspace = true dashmap.workspace = true -derivative.workspace = true downcast.workspace = true evpkdf.workspace = true faster-hex.workspace = true fixedstr.workspace = true futures.workspace = true -heapless.workspace = true hmac.workspace = true itertools.workspace = true js-sys.workspace = true @@ -43,7 +41,6 @@ kaspa-addresses.workspace = true kaspa-bip32.workspace = true kaspa-consensus-core.workspace = true kaspa-consensus-wasm.workspace = true -kaspa-core.workspace = true kaspa-hashes.workspace = true kaspa-notify.workspace = true kaspa-rpc-core.workspace = true @@ -55,7 +52,6 @@ kaspa-wrpc-client.workspace = true md-5.workspace = true pad.workspace = true pbkdf2.workspace = true -rand.workspace = true regex.workspace = true ripemd.workspace = true secp256k1.workspace = true @@ -72,7 +68,6 @@ wasm-bindgen-futures.workspace = true wasm-bindgen.workspace = true workflow-core.workspace = true workflow-log.workspace = true -workflow-node.workspace = true workflow-rpc.workspace = true workflow-store.workspace = true workflow-wasm.workspace = true @@ -97,3 +92,6 @@ home.workspace = true [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] tokio.workspace = true + +[package.metadata.cargo-machete] +ignored = ["md-5", "wasm-bindgen-futures"] diff --git a/wallet/core/src/imports.rs b/wallet/core/src/imports.rs index 997e48e7d2..d6a32143de 100644 --- a/wallet/core/src/imports.rs +++ b/wallet/core/src/imports.rs @@ -3,7 +3,7 @@ //! are used internally in the wallet framework core. //! -pub use crate::account::descriptor::{AccountDescriptor, AccountDescriptorProperty, AccountDescriptorValue}; +pub use crate::account::descriptor::{AccountDescriptor, AccountDescriptorProperty}; pub use crate::account::variants::*; pub use crate::account::{Account, AccountKind, DerivationCapableAccount}; pub use crate::deterministic::*; @@ -22,7 +22,7 @@ pub use crate::utxo::balance::Balance; pub use crate::utxo::scan::{Scan, ScanExtent}; pub use crate::utxo::{Maturity, OutgoingTransaction, UtxoContext, UtxoEntryReference, UtxoProcessor}; pub use crate::wallet::*; -pub use crate::{storage, utils, utxo}; +pub use crate::{storage, utils}; pub use ahash::{AHashMap, AHashSet}; pub use async_trait::async_trait; @@ -31,13 +31,11 @@ pub use cfg_if::cfg_if; pub use dashmap::{DashMap, DashSet}; pub use downcast::{downcast_sync, AnySync}; pub use futures::future::join_all; -pub use futures::{select, select_biased, stream, FutureExt, Stream, StreamExt, TryStreamExt}; +pub use futures::{select, select_biased, FutureExt, Stream, StreamExt, TryStreamExt}; pub use js_sys::{Array, BigInt, Object}; pub use kaspa_addresses::{Address, Prefix}; pub use kaspa_consensus_core::network::{NetworkId, NetworkType}; -pub use kaspa_consensus_core::subnets; -pub use kaspa_consensus_core::subnets::SubnetworkId; -pub use kaspa_consensus_core::tx as cctx; + pub use kaspa_consensus_core::tx::{ScriptPublicKey, TransactionId, TransactionIndexType}; pub use kaspa_utils::hashmap::*; pub use kaspa_utils::hex::{FromHex, ToHex}; @@ -48,7 +46,7 @@ pub use std::collections::{HashMap, HashSet}; pub use std::pin::Pin; pub use std::str::FromStr; pub use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; -pub use std::sync::{Arc, Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard}; +pub use std::sync::{Arc, Mutex, MutexGuard, RwLock}; pub use std::task::{Context, Poll}; pub use wasm_bindgen::prelude::*; pub use workflow_core::prelude::*; @@ -56,5 +54,5 @@ pub use workflow_core::seal; pub use workflow_log::prelude::*; pub use workflow_wasm::prelude::*; pub use workflow_wasm::stream::AsyncStream; -pub use xxhash_rust::xxh3::xxh3_64; + pub use zeroize::*; diff --git a/wallet/core/src/wallet/mod.rs b/wallet/core/src/wallet/mod.rs index dddf08801e..2a7178de48 100644 --- a/wallet/core/src/wallet/mod.rs +++ b/wallet/core/src/wallet/mod.rs @@ -23,7 +23,7 @@ use workflow_core::task::spawn; pub mod api; pub mod args; pub mod maps; -pub use api::*; + pub use args::*; #[derive(Clone)] diff --git a/wallet/native/Cargo.toml b/wallet/native/Cargo.toml index ba6a54a873..95fe785cc1 100644 --- a/wallet/native/Cargo.toml +++ b/wallet/native/Cargo.toml @@ -12,9 +12,8 @@ legacy-rpc = ["kaspa-cli/legacy-rpc"] default = [] [dependencies] -async-std.workspace = true -async-trait.workspace = true kaspa-cli.workspace = true tokio.workspace = true -workflow-log.workspace = true -workflow-terminal.workspace = true + +[package.metadata.cargo-machete] +ignored = ["kaspa-cli"] diff --git a/wallet/wasm/Cargo.toml b/wallet/wasm/Cargo.toml index 38708e7bb2..668d67cfa1 100644 --- a/wallet/wasm/Cargo.toml +++ b/wallet/wasm/Cargo.toml @@ -15,11 +15,10 @@ default = [] crate-type = ["cdylib", "lib"] [dependencies] -async-trait.workspace = true -js-sys.workspace = true kaspa-cli.workspace = true wasm-bindgen-futures.workspace = true wasm-bindgen.workspace = true -workflow-log.workspace = true workflow-terminal.workspace = true -workflow-wasm.workspace = true + +[package.metadata.cargo-machete] +ignored = ["kaspa-cli", "wasm-bindgen-futures"] \ No newline at end of file diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index 457c3bdaa8..3c8b79828c 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -17,7 +17,6 @@ js-sys.workspace = true kaspa-addresses.workspace = true kaspa-consensus-core.workspace = true kaspa-consensus-wasm.workspace = true -kaspa-core.workspace = true kaspa-math.workspace = true kaspa-pow.workspace = true kaspa-rpc-core.workspace = true @@ -26,7 +25,6 @@ kaspa-wallet-core.workspace = true kaspa-wrpc-client.workspace = true num.workspace = true wasm-bindgen.workspace = true -workflow-log.workspace = true [features] wallet = []