diff --git a/integration-tests/Cargo.lock b/integration-tests/Cargo.lock index 6da01184f..cf2821ec3 100644 --- a/integration-tests/Cargo.lock +++ b/integration-tests/Cargo.lock @@ -1025,7 +1025,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "3.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", ] @@ -1336,7 +1336,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -1449,7 +1449,7 @@ dependencies = [ [[package]] name = "codec_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1478,7 +1478,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1779,7 +1779,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" [[package]] name = "digest" @@ -1958,7 +1958,7 @@ dependencies = [ [[package]] name = "extensions_sv2" version = "0.2.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -2031,7 +2031,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -2252,7 +2252,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -2817,7 +2817,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "9.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -3062,7 +3062,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "11.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -3115,7 +3115,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -3277,7 +3277,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -4391,7 +4391,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -4414,12 +4414,13 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.4.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", "channels_sv2", "mining_sv2", + "serde_json", "sv1_api", "tracing", ] @@ -4460,7 +4461,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -4528,7 +4529,7 @@ dependencies = [ [[package]] name = "template_distribution_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] diff --git a/miner-apps/Cargo.lock b/miner-apps/Cargo.lock index c676bd341..194c83d8d 100644 --- a/miner-apps/Cargo.lock +++ b/miner-apps/Cargo.lock @@ -839,7 +839,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -994,7 +994,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "3.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", ] @@ -1125,7 +1125,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -1217,7 +1217,7 @@ dependencies = [ [[package]] name = "codec_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1255,7 +1255,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1465,7 +1465,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" [[package]] name = "digest" @@ -1633,7 +1633,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.2.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1701,7 +1701,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1872,7 +1872,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -2395,7 +2395,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "9.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -2587,7 +2587,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "11.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -2757,7 +2757,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -3760,7 +3760,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -3783,12 +3783,13 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.4.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", "channels_sv2", "mining_sv2", + "serde_json", "sv1_api", "tracing", ] @@ -3829,7 +3830,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -3885,7 +3886,7 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "template_distribution_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] diff --git a/miner-apps/translator/src/lib/sv1/sv1_server/difficulty_manager.rs b/miner-apps/translator/src/lib/sv1/sv1_server/difficulty_manager.rs index 9684d48c5..c3d845599 100644 --- a/miner-apps/translator/src/lib/sv1/sv1_server/difficulty_manager.rs +++ b/miner-apps/translator/src/lib/sv1/sv1_server/difficulty_manager.rs @@ -1,6 +1,8 @@ use std::sync::Arc; -use crate::sv1::sv1_server::PendingTargetUpdate; +use crate::sv1::sv1_server::{ + PendingTargetUpdate, SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING, +}; use stratum_apps::{ stratum_core::{ @@ -8,7 +10,7 @@ use stratum_apps::{ channels_sv2::{target::hash_rate_to_target, Vardiff}, mining_sv2::{SetTarget, UpdateChannel}, parsers_sv2::Mining, - stratum_translation::sv2_to_sv1::build_sv1_set_difficulty_from_sv2_target, + stratum_translation::sv2_to_sv1::build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding, }, utils::types::{ChannelId, DownstreamId, Hashrate}, }; @@ -159,7 +161,12 @@ impl Sv1Server { // Process immediate set_difficulty updates (for new_target >= upstream_target) for (_channel_id, downstream_id, target) in immediate_updates { // Send set_difficulty message immediately - if let Ok(set_difficulty_msg) = build_sv1_set_difficulty_from_sv2_target(target) { + if let Ok(set_difficulty_msg) = + build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding( + target, + SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING, + ) + { let downstream_id = downstream_id.unwrap_or(0); if let Some(sender) = self .sv1_server_io @@ -432,7 +439,10 @@ impl Sv1Server { ) { for update in difficulty_updates { let set_difficulty_msg = - match build_sv1_set_difficulty_from_sv2_target(update.new_target) { + match build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding( + update.new_target, + SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING, + ) { Ok(msg) => msg, Err(e) => { error!( diff --git a/miner-apps/translator/src/lib/sv1/sv1_server/mod.rs b/miner-apps/translator/src/lib/sv1/sv1_server/mod.rs index 773edebbc..acba91714 100644 --- a/miner-apps/translator/src/lib/sv1/sv1_server/mod.rs +++ b/miner-apps/translator/src/lib/sv1/sv1_server/mod.rs @@ -43,7 +43,10 @@ use stratum_apps::{ build_sv2_open_extended_mining_channel, build_sv2_submit_shares_extended_from_sv1_submit, }, - sv2_to_sv1::{build_sv1_notify_from_sv2, build_sv1_set_difficulty_from_sv2_target}, + sv2_to_sv1::{ + build_sv1_notify_from_sv2, + build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding, + }, }, sv1_api::{json_rpc, server_to_client, utils::HexU32Be, IsServer}, }, @@ -54,6 +57,8 @@ use tokio::net::TcpListener; use tokio_util::sync::CancellationToken; use tracing::{debug, error, info, trace, warn}; +const SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING: f64 = 1.0; + #[derive(Clone)] struct Sv1ServerIo { sv1_server_to_downstream_sender: Arc>>>, @@ -834,12 +839,12 @@ impl Sv1Server { } } - let set_difficulty = build_sv1_set_difficulty_from_sv2_target(first_target) - .map_err(|_| { - TproxyError::shutdown(TproxyErrorKind::General( - "Failed to generate set_difficulty".into(), - )) - })?; + let set_difficulty = + build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding( + first_target, + SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING, + ) + .map_err(TproxyError::shutdown)?; // send the set_difficulty message to the downstream if let Some(sender) = self .sv1_server_io @@ -1157,16 +1162,20 @@ impl Sv1Server { .collect(); for (downstream_id, sender) in tasks { - let set_difficulty_msg = match build_sv1_set_difficulty_from_sv2_target(target) { - Ok(msg) => msg, - Err(e) => { - error!( - "Failed to build SetDifficulty for downstream {}: {:?}", - downstream_id, e - ); - return Err(TproxyError::shutdown(e)); - } - }; + let set_difficulty_msg = + match build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding( + target, + SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING, + ) { + Ok(msg) => msg, + Err(e) => { + error!( + "Failed to build SetDifficulty for downstream {}: {:?}", + downstream_id, e + ); + return Err(TproxyError::shutdown(e)); + } + }; if let Err(e) = sender.send(set_difficulty_msg).await { error!( "Failed to send SetDifficulty to downstream {}: {:?}", @@ -1230,16 +1239,20 @@ impl Sv1Server { } }); - let set_difficulty_msg = match build_sv1_set_difficulty_from_sv2_target(target) { - Ok(msg) => msg, - Err(e) => { - error!( - "Failed to build SetDifficulty for downstream {}: {:?}", - downstream_id, e - ); - return Err(TproxyError::shutdown(e)); - } - }; + let set_difficulty_msg = + match build_sv1_set_difficulty_from_sv2_target_with_integer_power_of_two_rounding( + target, + SV1_MIN_DIFFICULTY_FOR_INTEGER_POWER_OF_TWO_ROUNDING, + ) { + Ok(msg) => msg, + Err(e) => { + error!( + "Failed to build SetDifficulty for downstream {}: {:?}", + downstream_id, e + ); + return Err(TproxyError::shutdown(e)); + } + }; let sender = self .sv1_server_io diff --git a/pool-apps/Cargo.lock b/pool-apps/Cargo.lock index e85551dd7..c6460534d 100644 --- a/pool-apps/Cargo.lock +++ b/pool-apps/Cargo.lock @@ -273,7 +273,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -419,7 +419,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "3.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", ] @@ -531,7 +531,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -601,7 +601,7 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "codec_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -629,7 +629,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -797,7 +797,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" [[package]] name = "digest" @@ -926,7 +926,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.2.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -987,7 +987,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -1524,7 +1524,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "9.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1644,7 +1644,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "11.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1684,7 +1684,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1808,7 +1808,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -2468,7 +2468,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -2535,7 +2535,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "template_distribution_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] diff --git a/stratum-apps/Cargo.lock b/stratum-apps/Cargo.lock index aaafcc183..20656cac9 100644 --- a/stratum-apps/Cargo.lock +++ b/stratum-apps/Cargo.lock @@ -774,7 +774,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "3.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", ] @@ -995,7 +995,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -1041,7 +1041,7 @@ dependencies = [ [[package]] name = "codec_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1064,7 +1064,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" [[package]] name = "digest" @@ -1400,7 +1400,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.2.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -1458,7 +1458,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1629,7 +1629,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -2058,7 +2058,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "9.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -2246,7 +2246,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "11.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ] @@ -2286,7 +2286,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -2410,7 +2410,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -3359,7 +3359,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.5.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -3382,12 +3382,13 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.4.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", "channels_sv2", "mining_sv2", + "serde_json", "sv1_api", "tracing", ] @@ -3422,7 +3423,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", "bitcoin", @@ -3478,7 +3479,7 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "template_distribution_sv2" version = "6.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#b019ba3eaada98c7f43738f22e860c506e9544ef" +source = "git+https://github.com/stratum-mining/stratum?branch=main#18bf77c5102b42c5a62e39d1969f957425d7dde0" dependencies = [ "binary_sv2", ]