diff --git a/integration-tests/Cargo.lock b/integration-tests/Cargo.lock index 995304869..b8282e003 100644 --- a/integration-tests/Cargo.lock +++ b/integration-tests/Cargo.lock @@ -179,7 +179,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -242,7 +242,7 @@ dependencies = [ [[package]] name = "binary_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "buffer_sv2 2.0.0 (git+https://github.com/stratum-mining/stratum?branch=main)", "derive_codec_sv2 1.1.2", @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "2.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "aes-gcm", "generic-array", @@ -477,9 +477,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.49" +version = "1.2.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" dependencies = [ "find-msvc-tools", "shlex", @@ -533,7 +533,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "3.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "bitcoin", @@ -557,9 +557,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", "clap_derive", @@ -567,9 +567,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstream", "anstyle", @@ -586,7 +586,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -611,7 +611,7 @@ dependencies = [ [[package]] name = "codec_sv2" version = "4.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "buffer_sv2 2.0.0 (git+https://github.com/stratum-mining/stratum?branch=main)", @@ -638,7 +638,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "6.0.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", ] @@ -847,7 +847,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" [[package]] name = "digest" @@ -922,7 +922,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.1.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", ] @@ -947,9 +947,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" [[package]] name = "fixed-hash" @@ -992,7 +992,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "buffer_sv2 2.0.0 (git+https://github.com/stratum-mining/stratum?branch=main)", @@ -1061,7 +1061,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -1173,7 +1173,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "common_messages_sv2 6.0.2", @@ -1381,7 +1381,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -1440,9 +1440,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jd_client_sv2" @@ -1492,7 +1492,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", ] @@ -1540,19 +1540,19 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" [[package]] name = "libredox" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ "bitflags", "libc", - "redox_syscall 0.6.0", + "redox_syscall 0.7.0", ] [[package]] @@ -1628,7 +1628,7 @@ dependencies = [ [[package]] name = "mining_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", ] @@ -1721,7 +1721,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1813,7 +1813,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -1855,7 +1855,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "common_messages_sv2 6.0.2", @@ -1880,9 +1880,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22" +checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7" dependencies = [ "memchr", "ucd-trie", @@ -1890,9 +1890,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f72981ade67b1ca6adc26ec221be9f463f2b5839c7508998daa17c23d94d7f" +checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed" dependencies = [ "pest", "pest_generator", @@ -1900,22 +1900,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee9efd8cdb50d719a80088b76f81aec7c41ed6d522ee750178f83883d271625" +checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] name = "pest_meta" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1d70880e76bdc13ba52eafa6239ce793d85c8e43896507e43dd8984ff05b82" +checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365" dependencies = [ "pest", "sha2 0.10.9", @@ -1998,14 +1998,14 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.9", + "toml_edit 0.23.10+spec-1.0.0", ] [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" dependencies = [ "unicode-ident", ] @@ -2101,9 +2101,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5" +checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" dependencies = [ "bitflags", ] @@ -2205,9 +2205,9 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags", "errno", @@ -2244,12 +2244,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "scopeguard" version = "1.2.0" @@ -2333,20 +2327,20 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -2409,10 +2403,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.7" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] @@ -2485,7 +2480,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.2.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "bitcoin", @@ -2508,7 +2503,7 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "bitcoin", @@ -2533,7 +2528,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "2.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", "bitcoin_hashes 0.3.2", @@ -2557,9 +2552,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.111" +version = "2.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4" dependencies = [ "proc-macro2", "quote", @@ -2605,9 +2600,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand", "once_cell", @@ -2626,7 +2621,7 @@ dependencies = [ [[package]] name = "template_distribution_sv2" version = "4.0.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2 5.0.0", ] @@ -2651,9 +2646,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", @@ -2675,14 +2670,14 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] name = "tokio-util" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -2715,9 +2710,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -2738,21 +2733,21 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.9" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ "indexmap", - "toml_datetime 0.7.3", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -2777,9 +2772,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -2794,14 +2789,14 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -2844,7 +2839,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -3225,7 +3220,7 @@ checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.113", ] [[package]] @@ -3233,3 +3228,9 @@ name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zmij" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868" diff --git a/miner-apps/Cargo.lock b/miner-apps/Cargo.lock index d57adbeeb..d1f749abe 100644 --- a/miner-apps/Cargo.lock +++ b/miner-apps/Cargo.lock @@ -173,7 +173,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -327,7 +327,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "2.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "aes-gcm", "generic-array", @@ -393,9 +393,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.49" +version = "1.2.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" dependencies = [ "find-msvc-tools", "shlex", @@ -434,7 +434,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "3.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "bitcoin", @@ -458,9 +458,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", "clap_derive", @@ -468,9 +468,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstream", "anstyle", @@ -499,7 +499,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "codec_sv2" version = "4.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "buffer_sv2", @@ -518,7 +518,7 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "common_messages_sv2" version = "6.0.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", ] @@ -643,7 +643,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" [[package]] name = "digest" @@ -694,6 +694,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -703,16 +713,16 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.1.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", ] [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" [[package]] name = "fixed-hash" @@ -729,7 +739,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "buffer_sv2", @@ -865,7 +875,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -989,9 +999,9 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "jd_client_sv2" @@ -1010,7 +1020,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", ] @@ -1034,9 +1044,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" [[package]] name = "lock_api" @@ -1077,7 +1087,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", ] @@ -1107,7 +1117,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1218,7 +1228,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -1237,9 +1247,9 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pest" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22" +checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7" dependencies = [ "memchr", "ucd-trie", @@ -1247,9 +1257,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f72981ade67b1ca6adc26ec221be9f463f2b5839c7508998daa17c23d94d7f" +checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed" dependencies = [ "pest", "pest_generator", @@ -1257,9 +1267,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee9efd8cdb50d719a80088b76f81aec7c41ed6d522ee750178f83883d271625" +checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5" dependencies = [ "pest", "pest_meta", @@ -1270,9 +1280,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1d70880e76bdc13ba52eafa6239ce793d85c8e43896507e43dd8984ff05b82" +checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365" dependencies = [ "pest", "sha2 0.10.9", @@ -1339,14 +1349,14 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit 0.23.9", + "toml_edit 0.23.10+spec-1.0.0", ] [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" dependencies = [ "unicode-ident", ] @@ -1456,12 +1466,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "scopeguard" version = "1.2.0" @@ -1539,15 +1543,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -1600,10 +1604,11 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.7" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] @@ -1661,7 +1666,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.2.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "bitcoin", @@ -1684,7 +1689,7 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "bitcoin", @@ -1709,7 +1714,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "2.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", "bitcoin_hashes 0.3.2", @@ -1722,9 +1727,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.111" +version = "2.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4" dependencies = [ "proc-macro2", "quote", @@ -1740,7 +1745,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "template_distribution_sv2" version = "4.0.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#310275b4a0caed45810d4c6c14b4c0b0cb06ef85" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ba72b21964bef236955c6e9343edb93835350a41" dependencies = [ "binary_sv2", ] @@ -1765,9 +1770,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", @@ -1793,9 +1798,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.17" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -1828,9 +1833,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -1851,21 +1856,21 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.23.9" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ "indexmap", - "toml_datetime 0.7.3", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow", ] [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -1878,9 +1883,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -1900,9 +1905,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -2182,3 +2187,9 @@ name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zmij" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868" diff --git a/miner-apps/translator/src/lib/sv1/downstream/downstream.rs b/miner-apps/translator/src/lib/sv1/downstream/downstream.rs index e7cf4e480..afc9b4290 100644 --- a/miner-apps/translator/src/lib/sv1/downstream/downstream.rs +++ b/miner-apps/translator/src/lib/sv1/downstream/downstream.rs @@ -420,7 +420,7 @@ impl Downstream { // Channel is established, process message normally let response = self .downstream_data - .super_safe_lock(|data| data.handle_message(message.clone())); + .super_safe_lock(|data| data.handle_message(None, message.clone())); match response { Ok(Some(response_msg)) => { diff --git a/miner-apps/translator/src/lib/sv1/downstream/message_handler.rs b/miner-apps/translator/src/lib/sv1/downstream/message_handler.rs index 99736d8e1..6bd732862 100644 --- a/miner-apps/translator/src/lib/sv1/downstream/message_handler.rs +++ b/miner-apps/translator/src/lib/sv1/downstream/message_handler.rs @@ -14,6 +14,7 @@ use crate::{ impl IsServer<'static> for DownstreamData { fn handle_configure( &mut self, + _client_id: Option, request: &client_to_server::Configure, ) -> (Option, Option) { info!("Received mining.configure from Sv1 downstream"); @@ -36,7 +37,11 @@ impl IsServer<'static> for DownstreamData { ) } - fn handle_subscribe(&self, request: &client_to_server::Subscribe) -> Vec<(String, String)> { + fn handle_subscribe( + &self, + _client_id: Option, + request: &client_to_server::Subscribe, + ) -> Vec<(String, String)> { info!("Received mining.subscribe from Sv1 downstream"); debug!("Down: Handling mining.subscribe: {:?}", request); @@ -53,13 +58,21 @@ impl IsServer<'static> for DownstreamData { vec![set_difficulty_sub, notify_sub] } - fn handle_authorize(&self, request: &client_to_server::Authorize) -> bool { + fn handle_authorize( + &self, + _client_id: Option, + request: &client_to_server::Authorize, + ) -> bool { info!("Received mining.authorize from Sv1 downstream"); debug!("Down: Handling mining.authorize: {:?}", request); true } - fn handle_submit(&self, request: &client_to_server::Submit<'static>) -> bool { + fn handle_submit( + &self, + _client_id: Option, + request: &client_to_server::Submit<'static>, + ) -> bool { if let Some(channel_id) = self.channel_id { info!( "Received mining.submit from SV1 downstream for channel id: {}", @@ -100,14 +113,14 @@ impl IsServer<'static> for DownstreamData { fn handle_extranonce_subscribe(&self) {} /// Checks if a Downstream role is authorized. - fn is_authorized(&self, name: &str) -> bool { + fn is_authorized(&self, _client_id: Option, name: &str) -> bool { self.authorized_worker_name == *name } /// Authorizes a Downstream role. - fn authorize(&mut self, name: &str) { + fn authorize(&mut self, _client_id: Option, name: &str) { let name: String = name.into(); - if !self.is_authorized(&name) { + if !self.is_authorized(None, &name) { self.authorized_worker_name = name.to_string(); } // Set user_identity from the authorize request @@ -122,44 +135,50 @@ impl IsServer<'static> for DownstreamData { /// by the SV2 `OpenExtendedMiningChannelSuccess` message sent from the Upstream role. fn set_extranonce1( &mut self, + _client_id: Option, _extranonce1: Option>, ) -> Extranonce<'static> { self.extranonce1.clone().try_into().unwrap() } /// Returns the `Downstream`'s `extranonce1` value. - fn extranonce1(&self) -> Extranonce<'static> { + fn extranonce1(&self, _client_id: Option) -> Extranonce<'static> { self.extranonce1.clone().try_into().unwrap() } /// Sets the `extranonce2_size` field sent in the SV1 `mining.notify` message to the value /// specified by the SV2 `OpenExtendedMiningChannelSuccess` message sent from the Upstream role. - fn set_extranonce2_size(&mut self, _extra_nonce2_size: Option) -> usize { + fn set_extranonce2_size( + &mut self, + __client_id: Option, + _extra_nonce2_size: Option, + ) -> usize { self.extranonce2_len } /// Returns the `Downstream`'s `extranonce2_size` value. - fn extranonce2_size(&self) -> usize { + fn extranonce2_size(&self, _client_id: Option) -> usize { self.extranonce2_len } /// Returns the version rolling mask. - fn version_rolling_mask(&self) -> Option { + fn version_rolling_mask(&self, _client_id: Option) -> Option { self.version_rolling_mask.clone() } /// Sets the version rolling mask. - fn set_version_rolling_mask(&mut self, mask: Option) { + fn set_version_rolling_mask(&mut self, _client_id: Option, mask: Option) { self.version_rolling_mask = mask; } /// Sets the minimum version rolling bit. - fn set_version_rolling_min_bit(&mut self, mask: Option) { + fn set_version_rolling_min_bit(&mut self, _client_id: Option, mask: Option) { self.version_rolling_min_bit = mask } fn notify( &'_ mut self, + _client_id: Option, ) -> Result> { warn!("notify() called on DownstreamData - this method is not implemented for the translator proxy"); Err( diff --git a/miner-apps/translator/src/lib/sv1/sv1_server/sv1_server.rs b/miner-apps/translator/src/lib/sv1/sv1_server/sv1_server.rs index c363dc01e..98b477703 100644 --- a/miner-apps/translator/src/lib/sv1/sv1_server/sv1_server.rs +++ b/miner-apps/translator/src/lib/sv1/sv1_server/sv1_server.rs @@ -498,7 +498,7 @@ impl Sv1Server { for message in queued_messages { if let Ok(Some(response_msg)) = downstream .downstream_data - .super_safe_lock(|data| data.handle_message(message)) + .super_safe_lock(|data| data.handle_message(None, message)) { self.sv1_server_channel_state .sv1_server_to_downstream_sender