diff --git a/Cargo.lock b/Cargo.lock index bdc049a..e284546 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -17,24 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb" -dependencies = [ - "const-random", -] - -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr 2.5.0", -] - [[package]] name = "aho-corasick" version = "0.7.19" @@ -50,7 +32,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "libc 0.2.137", + "libc", ] [[package]] @@ -62,12 +44,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "array-macro" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e97b4e522f9e55523001238ac59d13a8603af57f69980de5d8de4bbbe8ada6" - [[package]] name = "arrayref" version = "0.3.6" @@ -96,19 +72,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", - "libc 0.2.137", + "libc", "winapi 0.3.9", ] -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -124,7 +91,7 @@ dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", - "libc 0.2.137", + "libc", "miniz_oxide", "object", "rustc-demangle", @@ -143,7 +110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0e8c8a600052b52482eff2cf4d810e462fdff1f656ac1ecb6232132a1ed7def" dependencies = [ "byteorder 1.4.3", - "crunchy 0.1.6", + "crunchy", ] [[package]] @@ -162,7 +129,7 @@ dependencies = [ "peeking_take_while", "proc-macro2 0.3.5", "quote 0.5.2", - "regex 1.6.0", + "regex", "which", ] @@ -221,9 +188,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "228f798edaa90084bf383b0584e7a50654f2732014a7101321c4ea496743c0c9" dependencies = [ "git2", - "semver 0.9.0", - "time 0.1.44", - "toml 0.4.10", + "semver", + "time", + "toml", ] [[package]] @@ -280,21 +247,12 @@ dependencies = [ "iana-time-zone", "js-sys", "num-integer", - "num-traits 0.2.15", - "time 0.1.44", + "num-traits", + "time", "wasm-bindgen", "winapi 0.3.9", ] -[[package]] -name = "cl-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8573fa3ff8acd6c49e8e113296c54277e82376b96c6ca6307848632cce38e44" -dependencies = [ - "libc 0.2.137", -] - [[package]] name = "clang-sys" version = "0.23.0" @@ -302,8 +260,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7f7c04e52c35222fffcc3a115b5daf5f7e2bfb71c13c4e2321afe1fc71859c2" dependencies = [ "glob", - "libc 0.2.137", - "libloading 0.5.2", + "libc", + "libloading", ] [[package]] @@ -315,22 +273,13 @@ dependencies = [ "ansi_term", "atty", "bitflags 1.3.2", - "strsim 0.8.0", + "strsim", "textwrap 0.11.0", "unicode-width", "vec_map", "yaml-rust", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "cmake" version = "0.1.49" @@ -350,37 +299,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "const-cstr" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e950b379a7f9c5a83d43257fa1df616689141f326b4fc3bfb7aa7f3c7bc44d2" -dependencies = [ - "libc 0.1.12", -] - -[[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom 0.2.8", - "once_cell", - "proc-macro-hack", - "tiny-keccak 2.0.2", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -394,7 +312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", - "libc 0.2.137", + "libc", ] [[package]] @@ -403,29 +321,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel 0.5.6", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils 0.8.12", -] - -[[package]] -name = "crossbeam-channel" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -dependencies = [ - "crossbeam-utils 0.6.6", -] - [[package]] name = "crossbeam-channel" version = "0.4.4" @@ -436,67 +331,13 @@ dependencies = [ "maybe-uninit", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils 0.8.12", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", - "memoffset", - "scopeguard 1.1.0", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", -] - -[[package]] -name = "crossbeam-utils" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -dependencies = [ - "cfg-if 0.1.10", - "lazy_static 1.4.0", -] - [[package]] name = "crossbeam-utils" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if 0.1.10", "lazy_static 1.4.0", ] @@ -516,38 +357,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda" -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "cuckoo_miner" -version = "1.0.2" -dependencies = [ - "blake2-rfc", - "byteorder 0.5.3", - "cmake", - "const-cstr", - "epic_miner_core", - "epic_miner_plugin", - "epic_miner_util", - "fs_extra", - "glob", - "libc 0.2.137", - "libloading 0.4.3", - "log 0.3.9", - "rand 0.3.23", - "regex 0.2.11", - "rust-crypto", - "serde", - "serde_derive", - "serde_json", - "slog", - "time 0.1.44", -] - [[package]] name = "cucumber_rust" version = "0.5.1" @@ -558,64 +367,11 @@ dependencies = [ "gherkin_rust", "globwalk", "pathdiff", - "regex 1.6.0", + "regex", "termcolor 0.3.6", "textwrap 0.10.0", ] -[[package]] -name = "cursive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ecc7282b5361471b607c26f44148205607e26d48a2fc65bd16e7619b1ebb78" -dependencies = [ - "cfg-if 0.1.10", - "chrono", - "crossbeam-channel 0.3.9", - "enum-map 0.5.0", - "enumset", - "hashbrown 0.3.1", - "lazy_static 1.4.0", - "libc 0.2.137", - "log 0.4.17", - "maplit", - "ncurses", - "num", - "owning_ref", - "signal-hook", - "term_size", - "toml 0.5.9", - "unicode-segmentation", - "unicode-width", - "xi-unicode 0.1.0", -] - -[[package]] -name = "cursive" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d62b2fdb98a428e33442612fba04fc7f5a5b67989f0cd3abcfd754dbbec88a85" -dependencies = [ - "ahash", - "cfg-if 0.1.10", - "chrono", - "crossbeam-channel 0.4.4", - "enum-map 0.6.6", - "enumset", - "lazy_static 1.4.0", - "libc 0.2.137", - "log 0.4.17", - "maplit", - "num", - "owning_ref", - "pancurses", - "signal-hook", - "term_size", - "unicode-segmentation", - "unicode-width", - "xi-unicode 0.2.1", -] - [[package]] name = "cxx" version = "1.0.80" @@ -660,41 +416,6 @@ dependencies = [ "syn 1.0.103", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.47", - "quote 1.0.21", - "strsim 0.9.3", - "syn 1.0.103", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote 1.0.21", - "syn 1.0.103", -] - [[package]] name = "derive_builder" version = "0.5.1" @@ -722,109 +443,32 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" dependencies = [ - "libc 0.2.137", + "libc", "redox_users 0.3.5", "winapi 0.3.9", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", + "cfg-if 0.1.10", + "dirs-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ - "libc 0.2.137", + "libc", "redox_users 0.4.3", "winapi 0.3.9", ] -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "enum-map" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd9b2d5e0eb5c2ff851791e2af90ab4531b1168cfc239d1c0bf467e60ba3c89" -dependencies = [ - "enum-map-derive", - "enum-map-internals", -] - -[[package]] -name = "enum-map" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23595c55d463536d70a0cc71a521d4c1040a2e03816e455c38e8bb1f0981de98" -dependencies = [ - "array-macro", - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c450cf304c9e18d45db562025a14fb1ca0f5c769b6f609309f81d4c31de455" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.103", -] - -[[package]] -name = "enum-map-internals" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0bacf3ea7aba18ce84032efc3f0fa29f5c814048b742ab3e64d07d83ac3e8" -dependencies = [ - "array-macro", -] - -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - -[[package]] -name = "enumset" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93182dcb6530c757e5879b22ebc5cfbd034861585b442819389614e223ac1c47" -dependencies = [ - "enumset_derive", - "num-traits 0.2.15", -] - -[[package]] -name = "enumset_derive" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751a786cfcc7d5ceb9e0fe06f0e911da6ce3a3044633e029df4c370193c86a62" -dependencies = [ - "darling", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.103", -] - [[package]] name = "env_logger" version = "0.5.13" @@ -834,7 +478,7 @@ dependencies = [ "atty", "humantime", "log 0.4.17", - "regex 1.6.0", + "regex", "termcolor 1.1.3", ] @@ -846,20 +490,12 @@ dependencies = [ "bufstream", "built", "clap", - "cuckoo_miner", "cucumber_rust", - "cursive 0.12.0", - "cursive 0.14.1", "epic_miner_config", "epic_miner_core", "epic_miner_plugin", "epic_miner_util", "native-tls", - "ocl_cuckatoo", - "openssl", - "pancurses", - "progpow", - "progpow_miner", "rand 0.3.23", "randomx", "randomx_miner", @@ -868,21 +504,20 @@ dependencies = [ "serde_json", "slog", "term 0.4.6", - "time 0.1.44", + "time", ] [[package]] name = "epic_miner_config" version = "1.0.2" dependencies = [ - "cuckoo_miner", - "dirs", + "dirs 1.0.5", "epic_miner_core", "epic_miner_util", "serde", "serde_derive", "slog", - "toml 0.4.10", + "toml", ] [[package]] @@ -901,7 +536,7 @@ version = "1.0.2" dependencies = [ "blake2-rfc", "byteorder 0.5.3", - "libc 0.2.137", + "libc", "serde", "serde_derive", "serde_json", @@ -938,23 +573,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ "cfg-if 1.0.0", - "libc 0.2.137", + "libc", "redox_syscall 0.2.16", "windows-sys 0.42.0", ] -[[package]] -name = "fixed-hash" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a683d1234507e4f3bf2736eeddf0de1dc65996dc0164d57eba0a74bcf29489" -dependencies = [ - "byteorder 1.4.3", - "rand 0.5.6", - "rustc-hex", - "static_assertions", -] - [[package]] name = "fnv" version = "1.0.7" @@ -976,30 +599,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "fuchsia-cprng" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "getrandom" version = "0.1.16" @@ -1007,7 +612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", - "libc 0.2.137", + "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -1018,7 +623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", - "libc 0.2.137", + "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -1046,7 +651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee5b4bb7cd2a44e6e5ee3a26ba6a9ca10d4ce2771cdc3839bbc54b47b7d1be84" dependencies = [ "bitflags 0.9.1", - "libc 0.2.137", + "libc", "libgit2-sys", "url", ] @@ -1063,11 +668,11 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ - "aho-corasick 0.7.19", + "aho-corasick", "bstr", "fnv", "log 0.4.17", - "regex 1.6.0", + "regex", ] [[package]] @@ -1080,35 +685,13 @@ dependencies = [ "walkdir", ] -[[package]] -name = "hamming" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1" - -[[package]] -name = "hashbrown" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" -dependencies = [ - "byteorder 1.4.3", - "scopeguard 0.3.3", -] - -[[package]] -name = "hashbrown" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29fba9abe4742d586dfd0c06ae4f7e73a1c2d86b856933509b269d82cdf06e18" - [[package]] name = "hermit-abi" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "libc 0.2.137", + "libc", ] [[package]] @@ -1144,12 +727,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.1.5" @@ -1172,22 +749,13 @@ dependencies = [ "lazy_static 1.4.0", "log 0.4.17", "memchr 2.5.0", - "regex 1.6.0", + "regex", "same-file", - "thread_local 1.1.4", + "thread_local", "walkdir", "winapi-util", ] -[[package]] -name = "impl-codec" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2050d823639fbeae26b2b5ba09aca8907793117324858070ade0673c49f793b" -dependencies = [ - "parity-codec", -] - [[package]] name = "instant" version = "0.1.12" @@ -1212,16 +780,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "keccak-hash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e8ee697b9aa6dcc34d7657565fa5052763a1627a5b59e4c3c0ae3ed0d70a65" -dependencies = [ - "primitive-types", - "tiny-keccak 1.5.0", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -1244,12 +802,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "libc" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" - [[package]] name = "libc" version = "0.2.137" @@ -1264,22 +816,11 @@ checksum = "6eeae66e7b1c995de45cb4e65c5ab438a96a7b4077e448645d4048dc753ad357" dependencies = [ "cc", "cmake", - "libc 0.2.137", + "libc", "libz-sys", "pkg-config", ] -[[package]] -name = "libloading" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" -dependencies = [ - "kernel32-sys", - "lazy_static 1.4.0", - "winapi 0.2.8", -] - [[package]] name = "libloading" version = "0.5.2" @@ -1297,7 +838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", - "libc 0.2.137", + "libc", "pkg-config", "vcpkg", ] @@ -1311,15 +852,6 @@ dependencies = [ "cc", ] -[[package]] -name = "lock_api" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" -dependencies = [ - "scopeguard 1.1.0", -] - [[package]] name = "log" version = "0.3.9" @@ -1338,12 +870,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "matches" version = "0.1.9" @@ -1362,7 +888,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" dependencies = [ - "libc 0.2.137", + "libc", ] [[package]] @@ -1371,25 +897,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc 0.2.137", - "winapi 0.3.9", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "miniz_oxide" version = "0.5.4" @@ -1406,7 +913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static 1.4.0", - "libc 0.2.137", + "libc", "log 0.4.17", "openssl", "openssl-probe", @@ -1417,17 +924,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "ncurses" -version = "5.101.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2c5d34d72657dc4b638a1c25d40aae81e4f1c699062f72f467237920752032" -dependencies = [ - "cc", - "libc 0.2.137", - "pkg-config", -] - [[package]] name = "nodrop" version = "0.1.14" @@ -1443,77 +939,14 @@ dependencies = [ "memchr 1.0.2", ] -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-complex 0.2.4", - "num-integer", - "num-iter", - "num-rational", - "num-traits 0.2.15", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.15", -] - -[[package]] -name = "num-complex" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" -dependencies = [ - "num-traits 0.2.15", -] - [[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.15", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.15", + "autocfg", + "num-traits", ] [[package]] @@ -1522,16 +955,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc 0.2.137", + "autocfg", ] [[package]] @@ -1543,57 +967,6 @@ dependencies = [ "memchr 2.5.0", ] -[[package]] -name = "ocl" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b2e511640775a4d2f0f408501ffdd8813d6c6bcceafdb4e3867d2c98471c6" -dependencies = [ - "futures", - "nodrop", - "num-traits 0.2.15", - "ocl-core", - "qutex", - "thiserror", -] - -[[package]] -name = "ocl-core" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d46a57dfd1bb6fbee28986e92d39db9b941719dcf6b539c64242006d3c030d" -dependencies = [ - "bitflags 1.3.2", - "cl-sys", - "enum_primitive", - "num-complex 0.4.2", - "num-traits 0.2.15", - "ocl-core-vector", - "rustc_version 0.4.0", - "thiserror", -] - -[[package]] -name = "ocl-core-vector" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f562279e046ca160aeed5eaf6f7c4eb9fa56cb8fd9d038dbdbf56225caeb8074" -dependencies = [ - "num-traits 0.2.15", -] - -[[package]] -name = "ocl_cuckatoo" -version = "1.0.2" -dependencies = [ - "blake2-rfc", - "byteorder 1.4.3", - "epic_miner_plugin", - "hashbrown 0.1.8", - "libc 0.2.137", - "ocl", -] - [[package]] name = "once_cell" version = "1.16.0" @@ -1609,7 +982,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", - "libc 0.2.137", + "libc", "once_cell", "openssl-macros", "openssl-sys", @@ -1632,104 +1005,25 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "111.24.0+1.1.1s" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.77" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cc", - "libc 0.2.137", - "openssl-src", + "libc", "pkg-config", "vcpkg", ] -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "pancurses" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3058bc37c433096b2ac7afef1c5cdfae49ede0a4ffec3dfc1df1df0959d0ff0" -dependencies = [ - "libc 0.2.137", - "log 0.4.17", - "ncurses", - "pdcurses-sys", - "winreg", -] - -[[package]] -name = "parity-codec" -version = "3.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b9df1283109f542d8852cd6b30e9341acc2137481eb6157d2e62af68b0afec9" -dependencies = [ - "arrayvec 0.4.12", - "serde", -] - -[[package]] -name = "parking_lot" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" -dependencies = [ - "lock_api", - "parking_lot_core", - "rustc_version 0.2.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc 0.2.137", - "rand 0.6.5", - "redox_syscall 0.1.57", - "rustc_version 0.2.3", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "pathdiff" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3bf70094d203e07844da868b634207e71bfab254fe713171fae9a6e751ccf31" -[[package]] -name = "pdcurses-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084dd22796ff60f1225d4eb6329f33afaf4c85419d51d440ab6b8c6f4529166b" -dependencies = [ - "cc", - "libc 0.2.137", -] - [[package]] name = "peeking_take_while" version = "0.1.2" @@ -1765,142 +1059,22 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -[[package]] -name = "primal" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e31b86efadeaeb1235452171a66689682783149a6249ff334a2c5d8218d00a4" -dependencies = [ - "primal-check", - "primal-estimate", - "primal-sieve", -] - -[[package]] -name = "primal-bit" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686a64e2f50194c64942992af5799e6b6e8775b8f88c607d72ed0a2fd58b9b21" -dependencies = [ - "hamming", -] - -[[package]] -name = "primal-check" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e65f96c0a171f887198c274392c99a116ef65aa7f53f3b6d4902f493965c2d1" -dependencies = [ - "num-integer", -] - -[[package]] -name = "primal-estimate" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea4531dde757b56906493c8604641da14607bf9cdaa80fb9c9cabd2429f8d5" - -[[package]] -name = "primal-sieve" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2d6ed369bb4b0273aeeb43f07c105c0117717cbae827b20719438eb2eb798c" -dependencies = [ - "hamming", - "primal-bit", - "primal-estimate", - "smallvec", -] - -[[package]] -name = "primitive-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2288eb2a39386c4bc817974cc413afe173010dc80e470fcb1e9a35580869f024" -dependencies = [ - "fixed-hash", - "impl-codec", - "uint", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "progpow" -version = "0.1.0" -dependencies = [ - "bigint", - "bindgen", - "byteorder 0.5.3", - "cmake", - "dirs", - "filetime", - "lazy_static 1.4.0", - "libc 0.2.137", - "progpow_cpu", - "progpow_gpu", -] - -[[package]] -name = "progpow_cpu" -version = "0.1.0" -dependencies = [ - "crunchy 0.2.2", - "either", - "keccak-hash", - "log 0.4.17", - "memmap", - "parking_lot", - "primal", - "rustc-hex", - "serde_json", - "tempdir", -] - -[[package]] -name = "progpow_gpu" -version = "0.1.0" -dependencies = [ - "bigint", - "bindgen", - "cmake", - "filetime", - "libc 0.2.137", +dependencies = [ + "unicode-xid 0.1.0", ] [[package]] -name = "progpow_miner" -version = "0.1.0" +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "bigint", - "epic_miner_core", - "epic_miner_util", - "keccak-hash", - "lazy_static 1.4.0", - "progpow", - "slog", + "unicode-ident", ] [[package]] @@ -1933,23 +1107,13 @@ dependencies = [ "proc-macro2 1.0.47", ] -[[package]] -name = "qutex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4a51ba3d773c196f9450a6b239077ad8dda608b15263b4c9f29e58909883f" -dependencies = [ - "crossbeam", - "futures", -] - [[package]] name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" dependencies = [ - "libc 0.2.137", + "libc", "rand 0.4.6", ] @@ -1960,54 +1124,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ "fuchsia-cprng", - "libc 0.2.137", + "libc", "rand_core 0.3.1", "rdrand", "winapi 0.3.9", ] -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc 0.2.137", - "rand_core 0.3.1", - "winapi 0.3.9", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc 0.2.137", - "rand_chacha", - "rand_core 0.4.2", - "rand_hc", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - [[package]] name = "rand_core" version = "0.3.1" @@ -2023,78 +1145,17 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc 0.2.137", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc 0.2.137", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "randomx" -version = "0.1.0" +version = "0.1.1" +source = "git+https://github.com/EpicCash/randomx-rust.git?tag=v0.1.1#2d42b569b11a4c98954702c106c733c7578ed2b9" dependencies = [ "bigint", "bindgen", "byteorder 0.5.3", "cmake", "filetime", - "libc 0.2.137", + "libc", ] [[package]] @@ -2156,37 +1217,15 @@ dependencies = [ "thiserror", ] -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr 2.5.0", - "regex-syntax 0.5.6", - "thread_local 0.3.6", - "utf8-ranges", -] - [[package]] name = "regex" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ - "aho-corasick 0.7.19", + "aho-corasick", "memchr 2.5.0", - "regex-syntax 0.6.27", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", + "regex-syntax", ] [[package]] @@ -2216,61 +1255,12 @@ dependencies = [ "crossbeam-utils 0.8.12", ] -[[package]] -name = "rust-crypto" -version = "0.2.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -dependencies = [ - "gcc", - "libc 0.2.137", - "rand 0.3.23", - "rustc-serialize", - "time 0.1.44", -] - [[package]] name = "rustc-demangle" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.14", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - [[package]] name = "ryu" version = "1.0.11" @@ -2296,18 +1286,6 @@ dependencies = [ "windows-sys 0.36.1", ] -[[package]] -name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "scratch" version = "1.0.2" @@ -2323,7 +1301,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-foundation-sys", - "libc 0.2.137", + "libc", "security-framework-sys", ] @@ -2334,7 +1312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", - "libc 0.2.137", + "libc", ] [[package]] @@ -2346,12 +1324,6 @@ dependencies = [ "semver-parser", ] -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" - [[package]] name = "semver-parser" version = "0.7.0" @@ -2386,25 +1358,6 @@ dependencies = [ "serde", ] -[[package]] -name = "signal-hook" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc 0.2.137", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc 0.2.137", -] - [[package]] name = "slog" version = "2.1.1" @@ -2413,62 +1366,35 @@ checksum = "0a6b13b17f4225771f7f15cece704a4e68d3a5f31278ed26367f497133398a18" [[package]] name = "slog-async" -version = "2.7.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766c59b252e62a34651412870ff55d8c4e6d04df19b43eecb2703e417b097ffe" +checksum = "51b3336ce47ce2f96673499fc07eb85e3472727b9a7a2959964b002c2ce8fbbb" dependencies = [ - "crossbeam-channel 0.5.6", + "crossbeam-channel", "slog", "take_mut", - "thread_local 1.1.4", + "thread_local", ] [[package]] name = "slog-term" -version = "2.9.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" +checksum = "124501187c410b6a46fe8a47a48435ae462fae4e02d03c558d358f40b17308cb" dependencies = [ "atty", + "chrono", "slog", - "term 0.7.0", - "thread_local 1.1.4", - "time 0.3.16", -] - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", + "term 0.6.1", + "thread_local", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" - [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "syn" version = "0.11.11" @@ -2506,16 +1432,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - [[package]] name = "tempfile" version = "3.3.0" @@ -2524,7 +1440,7 @@ checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc 0.2.137", + "libc", "redox_syscall 0.2.16", "remove_dir_all", "winapi 0.3.9", @@ -2542,12 +1458,11 @@ dependencies = [ [[package]] name = "term" -version = "0.7.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" dependencies = [ - "dirs-next", - "rustversion", + "dirs 2.0.2", "winapi 0.3.9", ] @@ -2557,7 +1472,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ - "libc 0.2.137", + "libc", "winapi 0.3.9", ] @@ -2618,15 +1533,6 @@ dependencies = [ "syn 1.0.103", ] -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static 1.4.0", -] - [[package]] name = "thread_local" version = "1.1.4" @@ -2642,58 +1548,11 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ - "libc 0.2.137", + "libc", "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] -[[package]] -name = "time" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" -dependencies = [ - "itoa", - "libc 0.2.137", - "num_threads", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" -dependencies = [ - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" -dependencies = [ - "crunchy 0.2.2", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy 0.2.2", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2718,32 +1577,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "ucd-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bfcbf611b122f2c10eb1bb6172fbc4c2e25df9970330e4d75ce2b5201c9bfc" - -[[package]] -name = "uint" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2143cded94692b156c356508d92888acc824db5bffc0b4089732264c6fcf86d4" -dependencies = [ - "byteorder 1.4.3", - "crunchy 0.2.2", - "rustc-hex", -] - [[package]] name = "unicode-bidi" version = "0.3.8" @@ -2765,12 +1598,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - [[package]] name = "unicode-width" version = "0.1.10" @@ -2800,12 +1627,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - [[package]] name = "vcpkg" version = "0.2.15" @@ -2907,7 +1728,7 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e84a603e7e0b1ce1aa1ee2b109c7be00155ce52df5081590d1ffb93f4f515cb2" dependencies = [ - "libc 0.2.137", + "libc", ] [[package]] @@ -3062,27 +1883,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" -[[package]] -name = "winreg" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "xi-unicode" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" - -[[package]] -name = "xi-unicode" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e71b85d8b1b8bfaf4b5c834187554d201a8cd621c2bbfa33efd41a3ecabd48b2" - [[package]] name = "yaml-rust" version = "0.3.5" diff --git a/Cargo.toml b/Cargo.toml index b534877..1c969de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,12 +11,23 @@ autobins = false [workspace] members = ["config", "util", "plugin"] +# BT Labs: path dependencies implicitly join the workspace even when their +# feature is disabled, so cuckoo-miner/ocl_cuckatoo/progpow-miner still get +# resolved and built. cuckoo-miner depends on rust-crypto -> rustc-serialize, +# which fails to compile on rustc >= ~1.7x (E0310). We mine RandomX only, so +# exclude them outright. See docs/03-codebase-findings.md A17. +exclude = ["cuckoo-miner", "ocl_cuckatoo", "progpow-miner"] [features] -default = ["cpu"] -opencl = ["ocl_cuckatoo", "progpow_miner_opencl", "progpow_opencl"] -cuda = ["progpow_miner_cuda", "progpow_cuda", "cuckoo_miner_cuda"] -cpu = ["cuckoo_miner"] +default = [] # BT Labs: RandomX-only. Upstream default was ["cpu"] = cuckoo_miner. +# The source already gates every cursive/TUI use behind #[cfg(feature = "tui")] +# and provides a complete #[cfg(not(feature = "tui"))] fallback +# (src/bin/epic_miner.rs:43,51,97,170,179,254) -- but upstream never declared the +# feature and left `cursive` as a hard dependency. That makes the crate +# unbuildable today, because cursive 0.16 requires ahash ^0.6 and every 0.6.x is +# yanked from crates.io. Declaring the feature restores the TUI-less build the +# code was already written for. See docs/03-codebase-findings.md A17. +# tui feature intentionally not declared: cursive was removed (see below). [[bin]] @@ -41,61 +52,32 @@ epic_miner_util = { path = "./util", version = "1.0.2" } epic_miner_plugin = { path = "./plugin", version = "1.0.2" } epic_miner_config = { path = "./config", version = "1.0.2" } #use this alternative inclusion below to build cuda plugins -ocl_cuckatoo = { path = "./ocl_cuckatoo", version = "1.0.2", optional = true} randomx = { git = "https://github.com/EpicCash/randomx-rust.git", tag = "v0.1.1" } randomx_miner = { path = "./randomx-miner", version = "0.1.0" } -cursive = { version = "~0.16", default-features = false, features = ["pancurses-backend"] } - -[target.'cfg(windows)'.dependencies.pancurses] -version = "~0.16" -features = ["win32"] - -[[test]] -name = "cucumber" -harness = false - -[dependencies.cuckoo_miner_cuda] -package = "cuckoo_miner" -path = "./cuckoo-miner" -version = "1.0.2" -features = ["build-cuda-plugins"] -optional = true - -[dependencies.cuckoo_miner] -package = "cuckoo_miner" -path = "./cuckoo-miner" -version = "1.0.2" -features = [] -optional = true - -[dependencies.progpow_miner_opencl] -package = "progpow_miner" -path = "./progpow-miner" -version = "0.1.0" -features = ["opencl"] -optional = true - -[dependencies.progpow_miner_cuda] -package = "progpow_miner" -path = "./progpow-miner" -version = "0.1.0" -features = ["cuda"] -optional = true - -[dependencies.progpow_opencl] -package = "progpow" -git = "https://github.com/EpicCash/progpow-rust.git" -tag = "v0.1.0" -features = ["opencl"] -optional = true - -[dependencies.progpow_cuda] -package = "progpow" -git = "https://github.com/EpicCash/progpow-rust.git" -tag = "v0.1.0" -features = ["cuda"] -optional = true +# cursive/pancurses REMOVED by BT Labs. Rationale: +# * cursive 0.16 depends on ahash ^0.6 and every 0.6.x release is yanked from +# crates.io, so the dependency cannot be resolved at all today -- and Cargo +# resolves optional dependencies for the lockfile even when their feature is +# off, so marking it `optional` is not enough. It has to go. +# * Nothing is lost for headless mining: every cursive use is already behind +# #[cfg(feature = "tui")] with a complete #[cfg(not(feature = "tui"))] +# fallback, and epic-miner.toml sets run_tui = false. +# Consequence: the `tui` feature cannot be enabled in this checkout. +# See docs/03-codebase-findings.md A17. +# cursive = { version = "~0.16", default-features = false, features = ["pancurses-backend"] } + +# pancurses removed along with cursive (TUI backend, Windows only). +#[target.'cfg(windows)'.dependencies.pancurses] +#version = "~0.16" +#features = ["win32"] + +# [[test]] cucumber removed: harness depends on the excluded cuckoo plugins. + +# BT Labs: cuckoo/progpow/ocl optional dependency blocks removed. They are path +# or git deps on the excluded workspace members and on progpow-rust; keeping the +# declarations would make Cargo resolve (and fail on) them even with the feature +# off. This checkout builds a RandomX-only CPU miner. [build-dependencies] built = "0.2" diff --git a/config/Cargo.toml b/config/Cargo.toml index 4a2d81d..476b474 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -13,7 +13,7 @@ serde_derive = "1" toml = "0.4" dirs = "1.0" -cuckoo_miner = { path = "../cuckoo-miner", version = "1.0.2" } +# BT Labs: cuckoo_miner removed -- it was only reachable through a dead import. slog = { version = "~2.1", features = ["max_level_trace", "release_max_level_trace"] } epic_miner_util = { path = "../util", version = "1.0.2" } epic_miner_core = { path = "../core", version = "0.1.0" } \ No newline at end of file diff --git a/config/src/config.rs b/config/src/config.rs index ee70473..ec1746b 100644 --- a/config/src/config.rs +++ b/config/src/config.rs @@ -21,7 +21,11 @@ use std::path::PathBuf; use core::config::MinerConfig; use core::MinerError; -use cuckoo::PluginConfig; +// BT Labs: removed `use cuckoo::PluginConfig;` -- it was an UNUSED import, and it +// was the only thing making epic_miner_config depend on cuckoo_miner, which pulls +// rust-crypto -> rustc-serialize (abandoned 2017, fails to compile on modern +// rustc with E0310). One dead line made the whole crate unbuildable. +// See docs/03-codebase-findings.md A17. use toml; use types::{ConfigError, ConfigMembers, GlobalConfig}; use util::{LoggingConfig, LOGGER}; diff --git a/config/src/lib.rs b/config/src/lib.rs index 89fd20f..2cb09bc 100644 --- a/config/src/lib.rs +++ b/config/src/lib.rs @@ -30,7 +30,7 @@ extern crate slog; extern crate epic_miner_core as core; extern crate epic_miner_util as util; -extern crate cuckoo_miner as cuckoo; +// BT Labs: cuckoo_miner dependency removed (see config.rs). mod config; mod types; diff --git a/core/src/config.rs b/core/src/config.rs index 68ee4a3..156fd59 100644 --- a/core/src/config.rs +++ b/core/src/config.rs @@ -18,6 +18,18 @@ pub struct RxConfig { pub hard_aes: bool, #[serde(default = "default_rx_bool")] pub large_pages: bool, + /// RandomX "fast mode" (RANDOMX_FLAG_FULL_MEM): allocates a ~2080 MB dataset + /// per epoch for roughly an order of magnitude more hashrate. Light mode + /// (false) uses ~256 MB per VM instead. + /// + /// BT Labs: added because randomx-miner hardcoded `full_mem = true` with no + /// way to opt out (randomx-miner/src/miner.rs), and the miner also pre-builds + /// the NEXT epoch's dataset, so peak usage approaches 4 GB. On any host + /// without several spare GB that is an immediate OOM -- it killed a live + /// mainnet node on ours. Defaults to false so the safe option is the default. + /// See docs/03-codebase-findings.md A19. + #[serde(default = "default_rx_bool")] + pub full_mem: bool, } fn default_threads() -> u64 { @@ -34,6 +46,7 @@ impl Default for RxConfig { jit: true, hard_aes: true, large_pages: false, + full_mem: false, threads: 1 } } diff --git a/randomx-miner/src/miner.rs b/randomx-miner/src/miner.rs index 10a2a63..0ba3804 100644 --- a/randomx-miner/src/miner.rs +++ b/randomx-miner/src/miner.rs @@ -89,7 +89,11 @@ impl RxMiner { fn create_rx_state(config: &RxConfig) -> Arc> { let mut rx_state = RxState::new(); - rx_state.full_mem = true; + // BT Labs: was hardcoded `true` (RandomX fast mode, ~2080 MB dataset per + // epoch, and this miner pre-builds the next epoch too). Now driven by + // `full_mem` in [mining.randomx_config], defaulting to false = light mode + // (~256 MB). See docs/03-codebase-findings.md A19. + rx_state.full_mem = config.full_mem; rx_state.hard_aes = config.hard_aes; rx_state.large_pages = config.large_pages; @@ -145,9 +149,24 @@ impl RxMiner { let mut rx = rx_state.write().unwrap(); if let Ok(RxAction::Changed) = rx.init_cache(&seed) { - if let Err(e) = rx.init_dataset(threads as u8) { - error!(LOGGER, "Tried to initialize a new dataset: {:?}", e); - result = EpochState::Failed(e.to_owned()); + // BT Labs: init_dataset() was called unconditionally, which + // allocates the ~2080 MB RandomX dataset even when full_mem is + // false -- so "light mode" still OOM'd. RxState::create_vm() + // already does the right thing when self.dataset is None: it + // passes the cache and omits RANDOMX_FLAG_FULL_MEM, giving a + // cache-only (light mode, ~256 MB) VM. So in light mode we + // simply skip dataset allocation and let create_vm handle it. + // See docs/03-codebase-findings.md A19. + if rx.full_mem { + if let Err(e) = rx.init_dataset(threads as u8) { + error!(LOGGER, "Tried to initialize a new dataset: {:?}", e); + result = EpochState::Failed(e.to_owned()); + } + } else { + debug!( + LOGGER, + "full_mem = false: skipping dataset allocation, using RandomX light mode" + ); } } else { result = EpochState::Failed("Is not possible initialize a new dataset".to_owned()); diff --git a/src/bin/epic_miner.rs b/src/bin/epic_miner.rs index c45e386..43e5ef8 100644 --- a/src/bin/epic_miner.rs +++ b/src/bin/epic_miner.rs @@ -270,6 +270,15 @@ fn main() { mining_config.algorithm.clone().unwrap(), &mining_config, ), //randomx::RxMiner::new(&mining_config), + // BT Labs: gated to match the ProgPow arms below. Upstream left this arm + // ungated, so it referenced `cuckoo::` unconditionally even though the + // `extern crate cuckoo_miner` at the top of this file IS gated behind + // `#[cfg(feature = "cpu")]`. That makes any build without the cuckoo + // feature fail with E0433 -- i.e. upstream's own feature flags were + // unusable. With the gate, a RandomX-only build falls through to the + // `_ => panic!` arm if someone sets algorithm = "Cuckoo" in the config. + // See docs/03-codebase-findings.md A17. + #[cfg(feature = "cpu")] Algorithm::Cuckoo => start_miner( cuckoo::CuckooMiner::new(&mining_config), mining_config.algorithm.clone().unwrap(),