diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 129829d88..33370e1d7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,9 +4,11 @@ on: pull_request: branches: - main + - sv2-integration-braidpool push: branches: - main + - sv2-integration-braidpool env: CARGO_TERM_COLOR: always @@ -47,7 +49,7 @@ jobs: - name: Clippy check run: | cargo clippy -p stratum-apps --all-features -- -D warnings - for crate in pool_sv2 jd_server_sv2 jd_client_sv2 translator_sv2 bitcoin_core_sv2 integration_tests_sv2; do + for crate in pool_sv2 jd_server_sv2 jd_client_sv2 translator_sv2 bitcoin_core_sv2 integration_tests_sv2 braidpool-common braidpool-template-provider; do cargo clippy -p "$crate" -- -D warnings done for crate in pool_sv2 jd_client_sv2 translator_sv2; do @@ -80,5 +82,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust uses: dtolnay/rust-toolchain@stable - - name: Run cargo-machete - uses: bnjbvr/cargo-machete@main + - name: Install cargo-machete + run: cargo install cargo-machete --locked + - name: Run cargo-machete (braidpool crates) + run: | + cargo machete pool-apps/braidpool-common + cargo machete pool-apps/braidpool-template-provider diff --git a/Cargo.lock b/Cargo.lock index b1bb47d38..460626491 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,6 +29,20 @@ dependencies = [ "cpufeatures 0.2.17", ] +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + [[package]] name = "ahash" version = "0.8.12" @@ -58,9 +72,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" dependencies = [ "libc", ] @@ -123,9 +137,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" [[package]] name = "arbitrary" @@ -202,7 +216,7 @@ dependencies = [ "ipnet", "measurements", "pyo3-build-config", - "rand 0.10.1", + "rand 0.10.3", "rlimit", "serde", "serde_json", @@ -683,9 +697,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.42" +version = "0.4.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" +checksum = "9d5755640120b24961f8231e05892e4a4f7e0d04e8aeca161508c9c397946970" dependencies = [ "compression-codecs", "compression-core", @@ -701,7 +715,7 @@ checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.4.1", + "fastrand 2.5.0", "futures-lite 2.6.1", "pin-project-lite", "slab", @@ -767,7 +781,7 @@ dependencies = [ "futures-lite 2.6.1", "parking", "polling 3.11.0", - "rustix 1.1.4", + "rustix 1.1.5", "slab", "windows-sys 0.61.2", ] @@ -787,7 +801,7 @@ version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ - "event-listener 5.4.1", + "event-listener 5.4.2", "event-listener-strategy", "pin-project-lite", ] @@ -832,7 +846,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 1.1.4", + "rustix 1.1.5", "signal-hook-registry", "slab", "windows-sys 0.61.2", @@ -917,9 +931,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.17.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" +checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13" dependencies = [ "aws-lc-sys", "zeroize", @@ -927,21 +941,22 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.41.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" +checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc" dependencies = [ "cc", "cmake", "dunce", "fs_extra", + "pkg-config", ] [[package]] name = "axum" -version = "0.8.9" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" +checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" dependencies = [ "axum-core", "bytes", @@ -995,7 +1010,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" dependencies = [ - "bitcoin-internals", + "bitcoin-internals 0.3.0", "bitcoin_hashes 0.14.1", ] @@ -1017,6 +1032,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "bech32" version = "0.11.1" @@ -1025,8 +1046,8 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" -version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "7.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -1034,14 +1055,14 @@ dependencies = [ [[package]] name = "bitcoin" -version = "0.32.9" +version = "0.32.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf93e61f2dbc3e3c41234ca26a65e2c0b0975c52e0f069ab9893ebbede584d3" +checksum = "1e499f9fc0407f50fe98af744ab44fa67d409f76b6772e1689ec8485eb0c0f66" dependencies = [ "base58ck", "base64 0.21.7", "bech32", - "bitcoin-internals", + "bitcoin-internals 0.3.0", "bitcoin-io", "bitcoin-units", "bitcoin_hashes 0.14.1", @@ -1073,6 +1094,12 @@ dependencies = [ "capnpc", ] +[[package]] +name = "bitcoin-internals" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + [[package]] name = "bitcoin-internals" version = "0.3.0" @@ -1090,11 +1117,11 @@ checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" [[package]] name = "bitcoin-units" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346568ebaab2918487cea76dd55dae13c27bb618cdb737c952e69eb2017c4118" +checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" dependencies = [ - "bitcoin-internals", + "bitcoin-internals 0.3.0", "serde", ] @@ -1114,10 +1141,11 @@ dependencies = [ [[package]] name = "bitcoin_hashes" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446819536d8121575eeb7e89efdbadb3f055e87e4bb66c6679a6d5cc2f4b64fd" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" dependencies = [ + "bitcoin-internals 0.2.0", "hex-conservative 0.1.2", ] @@ -1140,9 +1168,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" dependencies = [ "serde_core", ] @@ -1188,9 +1216,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa" dependencies = [ "async-channel 2.5.0", "async-task", @@ -1199,6 +1227,23 @@ dependencies = [ "piper", ] +[[package]] +name = "braidpool-common" +version = "0.1.0" + +[[package]] +name = "braidpool-template-provider" +version = "0.1.0" +dependencies = [ + "async-channel 1.9.0", + "bitcoin", + "braidpool-common", + "stratum-core", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "bs58" version = "0.4.0" @@ -1210,8 +1255,11 @@ dependencies = [ [[package]] name = "buffer_sv2" -version = "4.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "3.0.1" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" +dependencies = [ + "aes-gcm", +] [[package]] name = "bumpalo" @@ -1259,9 +1307,9 @@ dependencies = [ [[package]] name = "capnp-rpc" -version = "0.25.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c74c337e87f75f3174ffb3513738ab0acc631c04f64cc33b867c60f84771da" +checksum = "07ccca6d26009f4d6c12b741994f33b421da613b5dcf461508e236b53ef862f1" dependencies = [ "capnp", "capnp-futures", @@ -1285,9 +1333,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.62" +version = "1.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" dependencies = [ "find-msvc-tools", "jobserver", @@ -1303,9 +1351,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "chacha20" @@ -1320,12 +1368,12 @@ dependencies = [ [[package]] name = "chacha20" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", + "cpufeatures 0.3.1", "rand_core 0.10.1", ] @@ -1344,8 +1392,8 @@ dependencies = [ [[package]] name = "channels_sv2" -version = "9.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "8.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "bitcoin", @@ -1414,9 +1462,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" dependencies = [ "clap_builder", "clap_derive", @@ -1436,9 +1484,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" dependencies = [ "heck", "proc-macro2", @@ -1463,14 +1511,15 @@ dependencies = [ [[package]] name = "codec_sv2" -version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "7.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "buffer_sv2", "framing_sv2", "noise_sv2", - "rand 0.8.6", + "rand 0.8.5", + "tracing", ] [[package]] @@ -1490,9 +1539,9 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.7" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" dependencies = [ "bytes", "memchr", @@ -1500,17 +1549,17 @@ dependencies = [ [[package]] name = "common_messages_sv2" -version = "10.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "9.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", ] [[package]] name = "compression-codecs" -version = "0.4.38" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" +checksum = "cae36683101b2899f48bd31f8db9839437356188e3b1ff23096e73dab09ba8fe" dependencies = [ "compression-core", "flate2", @@ -1519,9 +1568,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" +checksum = "2ebdda89edc534bf8d5dd2857562633b6495557e5846552ade994b99ed13c36a" [[package]] name = "concurrent-queue" @@ -1573,12 +1622,11 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.36" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", - "konst", ] [[package]] @@ -1667,9 +1715,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" dependencies = [ "libc", ] @@ -1774,6 +1822,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + [[package]] name = "dashmap" version = "6.1.0" @@ -1802,7 +1859,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "2.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" [[package]] name = "digest" @@ -1832,7 +1889,7 @@ dependencies = [ "digest 0.10.7", "hex", "md-5", - "rand 0.8.6", + "rand 0.8.5", "sha2 0.10.9", ] @@ -1891,9 +1948,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.6" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", @@ -1926,9 +1983,9 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" [[package]] name = "embedded-io" @@ -1986,11 +2043,10 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.4.1" +version = "5.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2" dependencies = [ - "concurrent-queue", "parking", "pin-project-lite", ] @@ -2001,14 +2057,14 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.4.1", + "event-listener 5.4.2", "pin-project-lite", ] [[package]] name = "extensions_sv2" -version = "0.4.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "0.3.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", ] @@ -2034,9 +2090,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "find-msvc-tools" @@ -2051,7 +2107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.6", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -2073,12 +2129,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -2090,11 +2140,12 @@ dependencies = [ [[package]] name = "framing_sv2" -version = "9.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "8.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "buffer_sv2", + "noise_sv2", ] [[package]] @@ -2178,7 +2229,7 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" dependencies = [ - "fastrand 2.4.1", + "fastrand 2.5.0", "futures-core", "futures-io", "parking", @@ -2250,30 +2301,26 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi 5.3.0", - "wasip2", + "r-efi", + "rand_core 0.10.1", "wasm-bindgen", ] [[package]] -name = "getrandom" -version = "0.4.2" +name = "ghash" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ - "cfg-if", - "libc", - "r-efi 6.0.0", - "rand_core 0.10.1", - "wasip2", - "wasip3", + "opaque-debug", + "polyval", ] [[package]] @@ -2300,8 +2347,8 @@ dependencies = [ [[package]] name = "handlers_sv2" -version = "0.7.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "0.6.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -2326,18 +2373,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashbrown" -version = "0.17.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "hashlink" @@ -2399,12 +2437,9 @@ dependencies = [ [[package]] name = "hex-conservative" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7289f6b628ce69fb1a371d0fdcf8ff38cd93ec00e3010eb055d1e044998c8d1" -dependencies = [ - "arrayvec", -] +checksum = "366fa3443ac84474447710ec17bb00b05dfbd096137817981e86f992f21a2793" [[package]] name = "hex_lit" @@ -2497,9 +2532,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -2511,6 +2546,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -2518,14 +2554,14 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.9" +version = "0.27.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.23.40", + "rustls 0.23.46", "tokio", "tokio-rustls", "tower-service", @@ -2580,13 +2616,12 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", - "utf8_iter", "yoke", "zerofrom", "zerovec", @@ -2594,9 +2629,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -2607,9 +2642,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -2621,15 +2656,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -2641,15 +2676,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", @@ -2660,12 +2695,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "idna" version = "1.1.0" @@ -2679,9 +2708,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -2715,12 +2744,12 @@ checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" [[package]] name = "indexmap" -version = "2.14.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown 0.17.1", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -2762,7 +2791,7 @@ dependencies = [ "once_cell", "pool_sv2", "primitive-types", - "rand 0.8.6", + "rand 0.8.5", "serde", "serde_json", "sha2 0.10.9", @@ -2787,9 +2816,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.12.0" +version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" [[package]] name = "is-terminal" @@ -2835,7 +2864,7 @@ dependencies = [ "serde", "stratum-apps", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml 1.1.8+spec-1.1.0", "tracing", ] @@ -2903,27 +2932,27 @@ dependencies = [ [[package]] name = "job_declaration_sv2" -version = "11.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "10.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", ] [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.98" +version = "0.3.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" +checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995" dependencies = [ "cfg-if", "futures-util", @@ -2954,21 +2983,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "konst" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb" -dependencies = [ - "konst_macro_rules", -] - -[[package]] -name = "konst_macro_rules" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" - [[package]] name = "kv-log-macro" version = "1.0.7" @@ -2984,17 +2998,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" -version = "0.2.186" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libm" @@ -3004,9 +3012,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" dependencies = [ "libc", ] @@ -3031,9 +3039,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" @@ -3055,9 +3063,9 @@ dependencies = [ [[package]] name = "lru-slab" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f" [[package]] name = "macaddr" @@ -3101,9 +3109,9 @@ dependencies = [ [[package]] name = "md5" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" +checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c" [[package]] name = "md5crypt" @@ -3154,8 +3162,8 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" -version = "13.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "12.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", ] @@ -3168,7 +3176,7 @@ checksum = "867b1f11e0545ad5ebbddd8a9f18756d9657a6758bf10d96cf15ddd0b726b650" dependencies = [ "bech32", "bitcoin", - "hex-conservative 1.1.0", + "hex-conservative 1.0.1", ] [[package]] @@ -3207,11 +3215,11 @@ dependencies = [ [[package]] name = "noise_sv2" -version = "2.1.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "2.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "chacha20poly1305", - "rand 0.8.6", + "rand 0.8.5", "secp256k1 0.28.2", "zeroize", ] @@ -3369,8 +3377,8 @@ dependencies = [ [[package]] name = "parsers_sv2" -version = "0.7.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "0.6.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -3455,10 +3463,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1" dependencies = [ "atomic-waker", - "fastrand 2.4.1", + "fastrand 2.5.0", "futures-io", ] +[[package]] +name = "pkg-config" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" + [[package]] name = "polling" version = "2.8.0" @@ -3485,7 +3499,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.5.2", "pin-project-lite", - "rustix 1.1.4", + "rustix 1.1.5", "windows-sys 0.61.2", ] @@ -3500,6 +3514,18 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "opaque-debug", + "universal-hash", +] + [[package]] name = "pool_sv2" version = "0.8.0" @@ -3517,9 +3543,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -3533,16 +3559,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "prettytable-rs" version = "0.10.0" @@ -3573,7 +3589,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.11+spec-1.1.0", + "toml_edit 0.25.8+spec-1.1.0", ] [[package]] @@ -3632,9 +3648,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "4051e23e9185c255a7e33ef59cdbca87a22d359052eecd22fc6b901fb37d9d11" dependencies = [ "bytes", "cfg_aliases", @@ -3642,7 +3658,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.40", + "rustls 0.23.46", "socket2 0.6.3", "thiserror 2.0.18", "tokio", @@ -3652,18 +3668,19 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.14" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" +checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe" dependencies = [ "aws-lc-rs", "bytes", - "getrandom 0.3.4", + "getrandom 0.4.3", "lru-slab", - "rand 0.9.4", + "rand 0.10.3", + "rand_pcg", "ring", "rustc-hash", - "rustls 0.23.40", + "rustls 0.23.46", "rustls-pki-types", "slab", "thiserror 2.0.18", @@ -3674,16 +3691,16 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.14" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016" dependencies = [ "cfg_aliases", "libc", "once_cell", "socket2 0.6.3", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3695,12 +3712,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "r-efi" version = "6.0.0" @@ -3715,33 +3726,23 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" -version = "0.8.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] [[package]] name = "rand" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.5", -] - -[[package]] -name = "rand" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" dependencies = [ - "chacha20 0.10.0", - "getrandom 0.4.2", + "chacha20 0.10.2", + "getrandom 0.4.3", "rand_core 0.10.1", ] @@ -3755,16 +3756,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", -] - [[package]] name = "rand_core" version = "0.6.4" @@ -3776,18 +3767,18 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.9.5" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] -name = "rand_core" -version = "0.10.1" +name = "rand_pcg" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +dependencies = [ + "rand_core 0.10.1", +] [[package]] name = "raw-cpuid" @@ -3795,7 +3786,7 @@ version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.11.0", ] [[package]] @@ -3804,7 +3795,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.11.0", ] [[package]] @@ -3860,11 +3851,11 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "bytes", "futures-core", "futures-util", @@ -3880,7 +3871,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.40", + "rustls 0.23.46", "rustls-pki-types", "rustls-platform-verifier", "serde", @@ -3929,7 +3920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.11.1", + "bitflags 2.11.0", "serde", "serde_derive", ] @@ -3980,9 +3971,9 @@ dependencies = [ [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc-hex" @@ -4019,20 +4010,20 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.11.0", "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustix" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.11.0", "errno", "libc", "linux-raw-sys 0.12.1", @@ -4053,23 +4044,23 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "aws-lc-rs", "once_cell", "rustls-pki-types", - "rustls-webpki 0.103.13", + "rustls-webpki 0.103.16", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" +checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -4079,9 +4070,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ "web-time", "zeroize", @@ -4089,19 +4080,19 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" dependencies = [ "core-foundation", "core-foundation-sys", "jni", "log", "once_cell", - "rustls 0.23.40", + "rustls 0.23.46", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.13", + "rustls-webpki 0.103.16", "security-framework", "security-framework-sys", "webpki-root-certs", @@ -4110,9 +4101,9 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" [[package]] name = "rustls-webpki" @@ -4126,9 +4117,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "aws-lc-rs", "ring", @@ -4159,9 +4150,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5" dependencies = [ "windows-sys 0.61.2", ] @@ -4188,8 +4179,8 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "bitcoin_hashes 0.13.1", - "rand 0.8.6", + "bitcoin_hashes 0.13.0", + "rand 0.8.5", "secp256k1-sys 0.9.2", ] @@ -4200,6 +4191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "bitcoin_hashes 0.14.1", + "rand 0.8.5", "secp256k1-sys 0.10.1", "serde", ] @@ -4237,7 +4229,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.11.0", "core-foundation", "core-foundation-sys", "libc", @@ -4325,9 +4317,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" +checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" dependencies = [ "serde_core", ] @@ -4420,9 +4412,9 @@ checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "simd_cesu8" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" dependencies = [ "rustc_version", "simdutf8", @@ -4512,7 +4504,7 @@ dependencies = [ "hyper", "miniscript", "prometheus", - "rand 0.8.6", + "rand 0.8.5", "rustversion", "secp256k1 0.28.2", "serde", @@ -4530,8 +4522,8 @@ dependencies = [ [[package]] name = "stratum-core" -version = "0.7.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "0.6.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "bitcoin", @@ -4553,8 +4545,8 @@ dependencies = [ [[package]] name = "stratum_translation" -version = "0.6.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "0.5.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "bitcoin", @@ -4600,8 +4592,8 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" -version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "6.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", "bitcoin", @@ -4660,16 +4652,16 @@ version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ - "fastrand 2.4.1", + "fastrand 2.5.0", "once_cell", - "rustix 1.1.4", + "rustix 1.1.5", "windows-sys 0.61.2", ] [[package]] name = "template_distribution_sv2" -version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#4a716fa78aae1a69333da3b58932deeeda0e990d" +version = "7.0.0" +source = "git+https://github.com/stratum-mining/stratum?branch=main#ca3cc83af17c470caae2fa7ae39901957b27aee7" dependencies = [ "binary_sv2", ] @@ -4757,9 +4749,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -4777,24 +4769,15 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.52.3" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -4810,9 +4793,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" dependencies = [ "proc-macro2", "quote", @@ -4821,19 +4804,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db" dependencies = [ - "rustls 0.23.40", + "rustls 0.23.46", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b" dependencies = [ "futures-core", "pin-project-lite", @@ -4869,17 +4852,17 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.2+spec-1.1.0" +version = "1.1.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" +checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" dependencies = [ "indexmap", "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 1.1.1+spec-1.1.0", + "serde_spanned 1.1.2", + "toml_datetime 1.1.2+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 1.0.3", + "winnow 1.0.0", ] [[package]] @@ -4893,9 +4876,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.1.1+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" dependencies = [ "serde_core", ] @@ -4916,23 +4899,23 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.11+spec-1.1.0" +version = "0.25.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" +checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c" dependencies = [ "indexmap", - "toml_datetime 1.1.1+spec-1.1.0", + "toml_datetime 1.1.2+spec-1.1.0", "toml_parser", - "winnow 1.0.3", + "winnow 1.0.0", ] [[package]] name = "toml_parser" -version = "1.1.2+spec-1.1.0" +version = "1.1.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" dependencies = [ - "winnow 1.0.3", + "winnow 1.0.0", ] [[package]] @@ -4943,9 +4926,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" -version = "1.1.1+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" +checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" [[package]] name = "tower" @@ -4970,7 +4953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "async-compression", - "bitflags 2.11.1", + "bitflags 2.11.0", "bytes", "futures-core", "futures-util", @@ -5086,7 +5069,7 @@ dependencies = [ "stratum-apps", "tokio", "tokio-util", - "toml 1.1.2+spec-1.1.0", + "toml 1.1.8+spec-1.1.0", "tracing", ] @@ -5098,9 +5081,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.20.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -5192,9 +5175,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utoipa" -version = "5.5.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde15df68e80b16c7d16b9616e80770ad158988daa56a27dccd1e55558b0160" +checksum = "2fcc29c80c21c31608227e0912b2d7fddba57ad76b606890627ba8ee7964e993" dependencies = [ "indexmap", "serde", @@ -5204,9 +5187,9 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "5.5.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba0b99ee52df3028635d93840c797102da61f8a7bb3cf751032455895b52ef8" +checksum = "6d79d08d92ab8af4c5e8a6da20c47ae3f61a0f1dabc1997cdf2d082b757ca08b" dependencies = [ "proc-macro2", "quote", @@ -5247,9 +5230,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "value-bag" -version = "1.12.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0" +checksum = "2799ffb329a792ecfd902b71306c8a815a6ef1c0470fa9953a6aa4d4cecbe511" [[package]] name = "version_check" @@ -5275,9 +5258,9 @@ dependencies = [ [[package]] name = "want" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b" dependencies = [ "try-lock", ] @@ -5288,29 +5271,11 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.3+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" -dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", -] - [[package]] name = "wasm-bindgen" -version = "0.2.121" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" +checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a" dependencies = [ "cfg-if", "once_cell", @@ -5321,9 +5286,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.71" +version = "0.4.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" +checksum = "2d1faf851e778dfa54db7cd438b70758eba9755cb47403f3496edd7c8fc212f0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5331,9 +5296,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.121" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" +checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5341,9 +5306,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.121" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" +checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf" dependencies = [ "bumpalo", "proc-macro2", @@ -5354,35 +5319,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.121" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" +checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93" dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - [[package]] name = "wasm-streams" version = "0.5.0" @@ -5396,23 +5339,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.11.1", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "web-sys" -version = "0.3.98" +version = "0.3.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" +checksum = "84cde8507f4d7cfcb1185b8cb5890c494ffea65edbe1ba82cfd63661c805ed94" dependencies = [ "js-sys", "wasm-bindgen", @@ -5430,9 +5361,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.7" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" +checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" dependencies = [ "rustls-pki-types", ] @@ -5560,6 +5491,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -5701,112 +5641,18 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" dependencies = [ "memchr", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.11.1", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wyz" @@ -5830,9 +5676,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -5841,9 +5687,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -5853,18 +5699,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" dependencies = [ "proc-macro2", "quote", @@ -5873,18 +5719,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.8" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", @@ -5900,9 +5746,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -5911,9 +5757,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -5922,9 +5768,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 180dcaea3..fe0dcc431 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,8 @@ members = [ "stratum-apps", "pool-apps/pool", "pool-apps/jd-server", + "pool-apps/braidpool-common", + "pool-apps/braidpool-template-provider", "miner-apps/jd-client", "miner-apps/translator", "integration-tests", @@ -19,6 +21,8 @@ default-members = [ "stratum-apps", "pool-apps/pool", "pool-apps/jd-server", + "pool-apps/braidpool-common", + "pool-apps/braidpool-template-provider", "miner-apps/jd-client", "miner-apps/translator", ] diff --git a/pool-apps/braidpool-common/Cargo.toml b/pool-apps/braidpool-common/Cargo.toml new file mode 100644 index 000000000..47db3ead5 --- /dev/null +++ b/pool-apps/braidpool-common/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "braidpool-common" +version = "0.1.0" +edition = "2021" +description = "Common types shared between Braidpool node and sv2-apps" +license = "MIT OR Apache-2.0" + +[dependencies] diff --git a/pool-apps/braidpool-common/src/lib.rs b/pool-apps/braidpool-common/src/lib.rs new file mode 100644 index 000000000..612b5b95f --- /dev/null +++ b/pool-apps/braidpool-common/src/lib.rs @@ -0,0 +1 @@ +pub mod template; diff --git a/pool-apps/braidpool-common/src/template.rs b/pool-apps/braidpool-common/src/template.rs new file mode 100644 index 000000000..07c406f93 --- /dev/null +++ b/pool-apps/braidpool-common/src/template.rs @@ -0,0 +1,37 @@ +/// A block template produced by the Braidpool node, consumed by +/// braidpool-template-provider in sv2-apps. +/// +/// The node converts its internal BlockTemplate into this type before +/// sending it over the channel to the SV2 pool. This avoids a direct +/// dependency on node internals from sv2-apps. +#[derive(Debug, Clone)] +pub struct BraidpoolTemplate { + /// Full serialized coinbase transaction built by template_creator.rs. + /// Contains the Braidpool OP_RETURN commitment already embedded. + /// Used by build_new_template in braidpool_mode=true. + pub coinbase_tx: Vec, + + /// Merkle path from coinbase txid to merkle root. + pub merkle_path: Vec<[u8; 32]>, + + /// Previous block hash (32 bytes, little-endian). + pub prev_hash: [u8; 32], + + /// Compact difficulty target (nbits). + pub nbits: u32, + + /// Block header timestamp (nTime), seconds since Unix epoch. + /// Used as min_ntime in SetNewPrevHash → NewExtendedMiningJob downstream. + pub header_timestamp: u32, + + /// Bitcoin block version. + pub version: i32, + + /// Block height — required for Future Job (NewExtendedMiningJob). + /// Must come from ipc_template.components, NOT BlockTemplate.height + /// which is Height::ZERO in ipc_template_consumer. + pub height: u32, + + /// Monotonically increasing template identifier from the node. + pub template_id: u64, +} diff --git a/pool-apps/braidpool-template-provider/Cargo.toml b/pool-apps/braidpool-template-provider/Cargo.toml new file mode 100644 index 000000000..9fdfc709b --- /dev/null +++ b/pool-apps/braidpool-template-provider/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "braidpool-template-provider" +version = "0.1.0" +edition = "2021" +description = "Converts Braidpool node templates to SV2 TemplateDistribution messages" +license = "MIT OR Apache-2.0" + +[dependencies] +braidpool-common = { path = "../braidpool-common" } +stratum-core = { git = "https://github.com/stratum-mining/stratum", branch = "main" } +async-channel = "1.5.1" +tokio = { version = "1.44.1", features = ["full"] } +tokio-util = { version = "0.7", features = ["rt"] } +tracing = "0.1" +bitcoin = { version = "0.32.5", features = ["serde", "std", "rand"] } diff --git a/pool-apps/braidpool-template-provider/src/error.rs b/pool-apps/braidpool-template-provider/src/error.rs new file mode 100644 index 000000000..493b7db49 --- /dev/null +++ b/pool-apps/braidpool-template-provider/src/error.rs @@ -0,0 +1,40 @@ +#[derive(Debug)] +pub enum BraidpoolTemplateProviderError { + InvalidTemplateData(String), + InvalidCoinbaseTx(String), + InvalidBlockVersion, + InvalidCoinbaseTxVersion, + InvalidCoinbaseScriptSig, + CoinbaseOutputSerializationFailed, + BlockDeserializationFailed(String), + TemplateNotFound(u64), + ChannelSendError(String), + ChannelRecvError(String), + MerklePathError(String), +} + +/// Errors specific to building SV2 template messages +#[derive(Debug)] +pub enum TemplateDataError { + InvalidBlockVersion, + InvalidCoinbaseTxVersion, + InvalidCoinbaseScriptSig, + InvalidCoinbaseTx(String), + MerklePathError(String), + SerializationError(String), +} + +impl std::fmt::Display for BraidpoolTemplateProviderError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{self:?}") + } +} + +impl std::fmt::Display for TemplateDataError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{self:?}") + } +} + +impl std::error::Error for BraidpoolTemplateProviderError {} +impl std::error::Error for TemplateDataError {} diff --git a/pool-apps/braidpool-template-provider/src/lib.rs b/pool-apps/braidpool-template-provider/src/lib.rs new file mode 100644 index 000000000..0575450d8 --- /dev/null +++ b/pool-apps/braidpool-template-provider/src/lib.rs @@ -0,0 +1,157 @@ +//! Braidpool Template Provider +//! +//! Converts BraidpoolTemplate (from braidpool-common) to SV2 +//! TemplateDistribution messages for the pool downstream channel manager. + +use async_channel::{Receiver, Sender}; +use braidpool_common::template::BraidpoolTemplate; +use stratum_core::{ + parsers_sv2::TemplateDistributionOwned, + template_distribution_sv2::RequestTransactionDataErrorOwned, +}; +pub use tokio_util::sync::CancellationToken; +use tracing::{debug, error, info, warn}; + +pub mod error; +pub mod sv2_messages; + +pub use error::BraidpoolTemplateProviderError; + +/// Consumes BraidpoolTemplates and converts to SV2 TemplateDistribution messages. +/// +/// Runs as a sibling task to ipc_template_consumer in the braidpool node. +/// Receives templates via a dedicated channel rather than sharing the node's +/// notification_tx (which is single-consumer). +/// +/// # Parameters +/// * `template_rx` - Receiver for BraidpoolTemplates from the node +/// * `sv2_outgoing_tx` - Sender for outgoing SV2 TemplateDistribution messages to pool +/// * `sv2_incoming_rx` - Receiver for incoming SV2 messages (SubmitSolution etc.) +/// * `cancellation_token` - Token for graceful shutdown +pub async fn sv2_template_consumer( + mut template_rx: tokio::sync::mpsc::Receiver, + sv2_outgoing_tx: Sender, + sv2_incoming_rx: Receiver, + cancellation_token: CancellationToken, +) -> Result<(), BraidpoolTemplateProviderError> { + info!("SV2 template consumer started"); + + let mut _current_template_id: Option = None; + + // Wait for CoinbaseOutputConstraints from pool before processing templates. + // The pool sends this on startup to tell us the max coinbase output size. + info!("Waiting for CoinbaseOutputConstraints from pool"); + loop { + tokio::select! { + _ = cancellation_token.cancelled() => { + warn!("Cancelled before receiving CoinbaseOutputConstraints"); + return Ok(()); + } + result = sv2_incoming_rx.recv() => { + match result { + Ok(TemplateDistributionOwned::CoinbaseOutputConstraints(constraints)) => { + info!( + max_size = constraints.coinbase_output_max_additional_size, + "Received CoinbaseOutputConstraints from pool" + ); + break; + } + Ok(_) => {} + Err(e) => { + warn!(error = %e, "SV2 incoming channel closed while waiting for CoinbaseOutputConstraints"); + return Err(BraidpoolTemplateProviderError::ChannelRecvError(e.to_string())); + } + } + } + } + } + + // Main loop — receive BraidpoolTemplates and send SV2 messages + loop { + tokio::select! { + _ = cancellation_token.cancelled() => { + info!("SV2 template consumer shutting down"); + return Ok(()); + } + + Some(template) = template_rx.recv() => { + let template_id = template.template_id; + debug!(template_id, "Received BraidpoolTemplate"); + + // Send future job first (no prev_hash yet — miners prepare work) + match sv2_messages::build_new_template(&template, true) { + Ok(new_template) => { + if let Err(e) = sv2_outgoing_tx + .send(TemplateDistributionOwned::NewTemplate(new_template)) + .await + { + error!(error = %e, "Failed to send NewTemplate"); + return Err(BraidpoolTemplateProviderError::ChannelSendError( + e.to_string(), + )); + } + info!(template_id, "Sent NewTemplate (future job)"); + } + Err(e) => { + error!(template_id, error = %e, "Failed to build NewTemplate"); + continue; + } + } + + // Send SetNewPrevHash to activate the job + match sv2_messages::build_set_new_prev_hash(&template) { + Ok(set_new_prev_hash) => { + if let Err(e) = sv2_outgoing_tx + .send(TemplateDistributionOwned::SetNewPrevHash(set_new_prev_hash)) + .await + { + error!(error = %e, "Failed to send SetNewPrevHash"); + return Err(BraidpoolTemplateProviderError::ChannelSendError( + e.to_string(), + )); + } + info!(template_id, "Sent SetNewPrevHash"); + } + Err(e) => { + error!(template_id, error = %e, "Failed to build SetNewPrevHash"); + continue; + } + } + + _current_template_id = Some(template_id); + } + + result = sv2_incoming_rx.recv() => { + match result { + Ok(TemplateDistributionOwned::SubmitSolution(_solution)) => { + debug!("Received SubmitSolution — forwarding to node via bridge"); + // TODO(sv2-integration): forward to node's block submission channel + // This will be wired in PR 4 when the node bridge is added + } + Ok(TemplateDistributionOwned::RequestTransactionData(req)) => { + debug!(template_id = req.template_id, "Received RequestTransactionData"); + // Braidpool does not use TDP transaction data requests + // Send error response per SV2 spec + let err = RequestTransactionDataErrorOwned { + template_id: req.template_id, + error_code: b"template-id-not-found" + .to_vec() + .try_into() + .expect("static ASCII fits Str0255"), + }; + let _ = sv2_outgoing_tx + .send(TemplateDistributionOwned::RequestTransactionDataError(err)) + .await; + } + Ok(_) => { + debug!("Ignoring unhandled incoming SV2 message"); + } + Err(e) => { + warn!(error = %e, "SV2 incoming channel closed"); + return Err(BraidpoolTemplateProviderError::ChannelRecvError(e.to_string())); + } + } + } + } + } +} diff --git a/pool-apps/braidpool-template-provider/src/sv2_messages.rs b/pool-apps/braidpool-template-provider/src/sv2_messages.rs new file mode 100644 index 000000000..7639953e1 --- /dev/null +++ b/pool-apps/braidpool-template-provider/src/sv2_messages.rs @@ -0,0 +1,230 @@ +//! SV2 message builders for TemplateDistribution protocol. +//! +//! Builds NewTemplate and SetNewPrevHash from BraidpoolTemplate. + +use crate::error::TemplateDataError; +use bitcoin::{consensus::deserialize, Transaction}; +use braidpool_common::template::BraidpoolTemplate; +use stratum_core::{ + binary_sv2::{B0255Owned, B064KOwned, Seq0255Owned, U256Owned}, + template_distribution_sv2::{NewTemplateOwned, SetNewPrevHashOwned}, +}; +use tracing::debug; + +/// Build a NewTemplate SV2 message from a BraidpoolTemplate. +/// +/// braidpool_mode=true: includes ALL coinbase outputs (reward + segwit + OP_RETURN). +/// This is the Braidpool-specific behavior — factory.rs uses these outputs +/// directly to construct the full coinbase for downstream miners. +/// +/// # Parameters +/// * `template` - The BraidpoolTemplate from the node +/// * `future_template` - true = send job without prev_hash (Future Job) +pub fn build_new_template( + template: &BraidpoolTemplate, + future_template: bool, +) -> Result { + // Deserialize the full coinbase built by template_creator.rs. + // This coinbase already contains the Braidpool OP_RETURN commitment. + let coinbase_tx: Transaction = deserialize(&template.coinbase_tx).map_err(|e| { + TemplateDataError::InvalidCoinbaseTx(format!("Failed to deserialize coinbase_tx: {e}")) + })?; + + if coinbase_tx.input.is_empty() { + return Err(TemplateDataError::InvalidCoinbaseTx( + "coinbase transaction has no inputs".into(), + )); + } + + let version: u32 = template + .version + .try_into() + .map_err(|_| TemplateDataError::InvalidBlockVersion)?; + + let coinbase_tx_version: u32 = coinbase_tx + .version + .0 + .try_into() + .map_err(|_| TemplateDataError::InvalidCoinbaseTxVersion)?; + + // coinbase scriptSig becomes the coinbase_prefix in SV2 + let coinbase_prefix: B0255Owned = coinbase_tx.input[0] + .script_sig + .to_bytes() + .try_into() + .map_err(|_| TemplateDataError::InvalidCoinbaseScriptSig)?; + + let coinbase_tx_input_sequence = coinbase_tx.input[0].sequence.to_consensus_u32(); + + // Total value across all outputs + let coinbase_tx_value_remaining: u64 = + coinbase_tx.output.iter().map(|o| o.value.to_sat()).sum(); + + // braidpool_mode=true: include ALL outputs (reward[0] + segwit[1] + OP_RETURN[2]) + // Standard SRI mode would only include output[0] + let outputs_to_include = coinbase_tx.output.to_vec(); + + let mut serialized_outputs = Vec::new(); + for output in &outputs_to_include { + serialized_outputs.extend_from_slice(&bitcoin::consensus::serialize(output)); + } + + let coinbase_tx_outputs: B064KOwned = serialized_outputs.try_into().map_err(|_| { + TemplateDataError::SerializationError("coinbase outputs too large for B064K".into()) + })?; + + let coinbase_tx_locktime = coinbase_tx.lock_time.to_consensus_u32(); + + // Build merkle path: each [u8; 32] branch → U256Owned + let merkle_path_vec: Vec = template + .merkle_path + .iter() + .map(|branch| U256Owned::from(*branch)) + .collect(); + + let merkle_path: Seq0255Owned = + Seq0255Owned::new(merkle_path_vec).map_err(|_| { + TemplateDataError::MerklePathError("merkle path exceeds 255 elements".into()) + })?; + + debug!( + template_id = template.template_id, + future_template, + outputs = outputs_to_include.len(), + "Building NewTemplate (braidpool_mode=true)" + ); + + Ok(NewTemplateOwned { + template_id: template.template_id, + future_template, + version, + coinbase_tx_version, + coinbase_prefix, + coinbase_tx_input_sequence, + coinbase_tx_value_remaining, + coinbase_tx_outputs_count: outputs_to_include.len() as u32, + coinbase_tx_outputs, + coinbase_tx_locktime, + merkle_path, + }) +} + +#[cfg(test)] +mod tests { + use super::*; + use bitcoin::{ + consensus::serialize, locktime::absolute::LockTime, OutPoint, ScriptBuf, Sequence, + Transaction, TxIn, TxOut, Witness, + }; + use braidpool_common::template::BraidpoolTemplate; + + fn make_template(coinbase_tx: Transaction) -> BraidpoolTemplate { + BraidpoolTemplate { + coinbase_tx: serialize(&coinbase_tx), + merkle_path: vec![[2u8; 32]], + prev_hash: [1u8; 32], + nbits: 0x1d00ffff, + header_timestamp: 1_700_000_000, + version: 2, + height: 840_000, + template_id: 99, + } + } + + fn coinbase_tx(outputs: Vec) -> Transaction { + Transaction { + version: bitcoin::transaction::Version::TWO, + input: vec![TxIn { + previous_output: OutPoint::null(), + script_sig: ScriptBuf::from_bytes(vec![0x03, 0x01, 0x00, 0x00]), + sequence: Sequence::MAX, + witness: Witness::new(), + }], + output: outputs, + lock_time: LockTime::ZERO, + } + } + + fn dummy_output(sats: u64) -> TxOut { + TxOut { + value: bitcoin::Amount::from_sat(sats), + script_pubkey: ScriptBuf::new(), + } + } + + #[test] + fn test_build_new_template_maps_fields() { + let tx = coinbase_tx(vec![dummy_output(5_000_000_000), dummy_output(0)]); + let template = make_template(tx.clone()); + + let result = build_new_template(&template, true).unwrap(); + + assert_eq!(result.template_id, 99); + assert!(result.future_template); + assert_eq!(result.version, 2u32); + assert_eq!(result.coinbase_tx_value_remaining, 5_000_000_000); + assert_eq!(result.coinbase_tx_outputs_count, 2); + assert_eq!(result.coinbase_tx_locktime, 0); + assert_eq!(result.merkle_path.len(), 1); + } + + #[test] + fn test_build_new_template_empty_input_returns_error() { + let tx = Transaction { + version: bitcoin::transaction::Version::TWO, + input: vec![], + output: vec![dummy_output(0)], + lock_time: LockTime::ZERO, + }; + let template = make_template(tx); + + let err = build_new_template(&template, false).unwrap_err(); + assert!(matches!(err, TemplateDataError::InvalidCoinbaseTx(_))); + } + + #[test] + fn test_build_new_template_invalid_bytes_returns_error() { + let template = BraidpoolTemplate { + coinbase_tx: vec![0xde, 0xad, 0xbe, 0xef], + merkle_path: vec![], + prev_hash: [0u8; 32], + nbits: 0, + header_timestamp: 0, + version: 2, + height: 0, + template_id: 1, + }; + + let err = build_new_template(&template, false).unwrap_err(); + assert!(matches!(err, TemplateDataError::InvalidCoinbaseTx(_))); + } + + #[test] + fn test_build_set_new_prev_hash_maps_fields() { + let tx = coinbase_tx(vec![dummy_output(0)]); + let template = make_template(tx); + + let result = build_set_new_prev_hash(&template).unwrap(); + + assert_eq!(result.template_id, 99); + assert_eq!(result.header_timestamp, 1_700_000_000); + assert_eq!(result.n_bits, 0x1d00ffff); + assert_eq!(result.prev_hash.as_ref(), &[1u8; 32]); + } +} + +/// Build a SetNewPrevHash SV2 message from a BraidpoolTemplate. +/// Activates the Future Job sent by build_new_template. +pub fn build_set_new_prev_hash( + template: &BraidpoolTemplate, +) -> Result { + let prev_hash = U256Owned::from(template.prev_hash); + + Ok(SetNewPrevHashOwned { + template_id: template.template_id, + prev_hash, + header_timestamp: template.header_timestamp, + n_bits: template.nbits, + target: U256Owned::from([0u8; 32]), // pool sets target via SetTarget separately + }) +}