From 04cd698b09ed647eca722cd7e0412f6cd53e0aa1 Mon Sep 17 00:00:00 2001 From: plebhash Date: Thu, 19 Mar 2026 08:56:56 -0300 Subject: [PATCH 1/4] refine client share accounting on stratum-apps --- stratum-apps/src/monitoring/http_server.rs | 5 +++-- stratum-apps/src/monitoring/server.rs | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/stratum-apps/src/monitoring/http_server.rs b/stratum-apps/src/monitoring/http_server.rs index 5242e48cc..2e65bc097 100644 --- a/stratum-apps/src/monitoring/http_server.rs +++ b/stratum-apps/src/monitoring/http_server.rs @@ -781,7 +781,7 @@ async fn handle_prometheus_metrics(State(state): State) -> Response if let Some(ref metric) = state.metrics.sv2_server_shares_accepted_total { metric .with_label_values(&[&channel_id, user]) - .set(channel.shares_accepted as f64); + .set(channel.shares_acknowledged as f64); } if let (Some(ref metric), Some(hashrate)) = ( &state.metrics.sv2_server_channel_hashrate, @@ -996,7 +996,8 @@ mod tests { full_extranonce_size: 16, rollable_extranonce_size: 4, version_rolling: true, - shares_accepted: 10, + shares_acknowledged: 10, + shares_rejected: 0, share_work_sum: 100.0, shares_submitted: 12, best_diff: 50.0, diff --git a/stratum-apps/src/monitoring/server.rs b/stratum-apps/src/monitoring/server.rs index 721cebf3c..84b666958 100644 --- a/stratum-apps/src/monitoring/server.rs +++ b/stratum-apps/src/monitoring/server.rs @@ -18,9 +18,10 @@ pub struct ServerExtendedChannelInfo { pub full_extranonce_size: usize, pub rollable_extranonce_size: u16, pub version_rolling: bool, - pub shares_accepted: u32, - pub share_work_sum: f64, + pub shares_acknowledged: u32, pub shares_submitted: u32, + pub shares_rejected: u32, + pub share_work_sum: f64, pub best_diff: f64, pub blocks_found: u32, } @@ -114,7 +115,8 @@ mod tests { full_extranonce_size: 16, rollable_extranonce_size: 4, version_rolling: true, - shares_accepted: 10, + shares_acknowledged: 10, + shares_rejected: 0, share_work_sum: 100.0, shares_submitted: 12, best_diff: 50.0, From 417239d74049401fbfa5da0c8c59ebf5a076b096 Mon Sep 17 00:00:00 2001 From: plebhash Date: Thu, 12 Mar 2026 14:21:27 -0300 Subject: [PATCH 2/4] refine client share accounting on JDC --- .../lib/channel_manager/upstream_message_handler.rs | 9 +++++++++ miner-apps/jd-client/src/lib/monitoring.rs | 12 +++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/miner-apps/jd-client/src/lib/channel_manager/upstream_message_handler.rs b/miner-apps/jd-client/src/lib/channel_manager/upstream_message_handler.rs index 7c2932a4c..d47171321 100644 --- a/miner-apps/jd-client/src/lib/channel_manager/upstream_message_handler.rs +++ b/miner-apps/jd-client/src/lib/channel_manager/upstream_message_handler.rs @@ -497,6 +497,7 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager { info!("Received: {} ✅", msg); self.channel_manager_data.super_safe_lock(|data| { + // if None, upstream is not currently available, so we skip accounting update if let Some(upstream_channel) = data.upstream_channel.as_mut() { upstream_channel.on_share_acknowledgement( msg.new_submits_accepted_count, @@ -516,6 +517,14 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager { _tlv_fields: Option<&[Tlv]>, ) -> Result<(), Self::Error> { warn!("Received: {} ❌", msg); + + self.channel_manager_data.super_safe_lock(|data| { + // if None, upstream is not currently available, so we skip accounting update + if let Some(upstream_channel) = data.upstream_channel.as_mut() { + upstream_channel.on_share_rejection(); + } + }); + Ok(()) } diff --git a/miner-apps/jd-client/src/lib/monitoring.rs b/miner-apps/jd-client/src/lib/monitoring.rs index 06d0d157e..dcc7aff76 100644 --- a/miner-apps/jd-client/src/lib/monitoring.rs +++ b/miner-apps/jd-client/src/lib/monitoring.rs @@ -27,13 +27,6 @@ impl ServerMonitoring for ChannelManager { let user_identity = upstream_channel.get_user_identity(); let share_accounting = upstream_channel.get_share_accounting(); - // Get the count of shares submitted to the upstream. - // Counter starts at 1, so subtract 1 to get shares submitted. - let shares_submitted = d - .sequence_number_factory - .load(std::sync::atomic::Ordering::Relaxed) - .saturating_sub(1); - extended_channels.push(ServerExtendedChannelInfo { channel_id, user_identity: user_identity.clone(), @@ -43,9 +36,10 @@ impl ServerMonitoring for ChannelManager { full_extranonce_size: upstream_channel.get_full_extranonce_size(), rollable_extranonce_size: upstream_channel.get_rollable_extranonce_size(), version_rolling: upstream_channel.is_version_rolling(), - shares_accepted: share_accounting.get_shares_accepted(), + shares_acknowledged: share_accounting.get_acknowledged_shares(), + shares_submitted: share_accounting.get_validated_shares(), + shares_rejected: share_accounting.get_rejected_shares(), share_work_sum: share_accounting.get_share_work_sum(), - shares_submitted, best_diff: share_accounting.get_best_diff(), blocks_found: share_accounting.get_blocks_found(), }); From 01a581ac0c623dd5498e04307afaee6e50ca99af Mon Sep 17 00:00:00 2001 From: plebhash Date: Thu, 12 Mar 2026 14:21:37 -0300 Subject: [PATCH 3/4] refine client share accounting on tproxy --- miner-apps/translator/src/lib/monitoring.rs | 26 +++++-------------- .../channel_manager/mining_message_handler.rs | 13 ++++++++++ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/miner-apps/translator/src/lib/monitoring.rs b/miner-apps/translator/src/lib/monitoring.rs index 707cb4e81..44b9f4713 100644 --- a/miner-apps/translator/src/lib/monitoring.rs +++ b/miner-apps/translator/src/lib/monitoring.rs @@ -30,14 +30,6 @@ impl ServerMonitoring for ChannelManager { let user_identity = aggregated_extended_channel.get_user_identity(); let share_accounting = aggregated_extended_channel.get_share_accounting(); - // Get the actual upstream sequence counter (shares submitted upstream) - // In aggregated mode, we use the upstream channel_id as the counter key - let shares_submitted = self - .share_sequence_counters - .get(&channel_id) - .map(|v| *v) - .unwrap_or(0); - extended_channels.push(ServerExtendedChannelInfo { channel_id, user_identity: user_identity.clone(), @@ -53,9 +45,10 @@ impl ServerMonitoring for ChannelManager { rollable_extranonce_size: aggregated_extended_channel .get_rollable_extranonce_size(), version_rolling: aggregated_extended_channel.is_version_rolling(), - shares_accepted: share_accounting.get_shares_accepted(), + shares_acknowledged: share_accounting.get_acknowledged_shares(), + shares_submitted: share_accounting.get_validated_shares(), + shares_rejected: share_accounting.get_rejected_shares(), share_work_sum: share_accounting.get_share_work_sum(), - shares_submitted, best_diff: share_accounting.get_best_diff(), blocks_found: share_accounting.get_blocks_found(), }); @@ -73,14 +66,6 @@ impl ServerMonitoring for ChannelManager { let user_identity = extended_channel.get_user_identity(); let share_accounting = extended_channel.get_share_accounting(); - // Get the actual upstream sequence counter (shares submitted upstream) - // In non-aggregated mode, each channel has its own counter - let shares_submitted = self - .share_sequence_counters - .get(&channel_id) - .map(|v| *v) - .unwrap_or(0); - extended_channels.push(ServerExtendedChannelInfo { channel_id, user_identity: user_identity.clone(), @@ -94,9 +79,10 @@ impl ServerMonitoring for ChannelManager { full_extranonce_size: extended_channel.get_full_extranonce_size(), rollable_extranonce_size: extended_channel.get_rollable_extranonce_size(), version_rolling: extended_channel.is_version_rolling(), - shares_accepted: share_accounting.get_shares_accepted(), + shares_acknowledged: share_accounting.get_acknowledged_shares(), + shares_submitted: share_accounting.get_validated_shares(), + shares_rejected: share_accounting.get_rejected_shares(), share_work_sum: share_accounting.get_share_work_sum(), - shares_submitted, best_diff: share_accounting.get_best_diff(), blocks_found: share_accounting.get_blocks_found(), }); diff --git a/miner-apps/translator/src/lib/sv2/channel_manager/mining_message_handler.rs b/miner-apps/translator/src/lib/sv2/channel_manager/mining_message_handler.rs index 2b88bcb69..f6db37182 100644 --- a/miner-apps/translator/src/lib/sv2/channel_manager/mining_message_handler.rs +++ b/miner-apps/translator/src/lib/sv2/channel_manager/mining_message_handler.rs @@ -401,6 +401,7 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager { m.channel_id }; + // if None, the channel may be closed/missing, so we ignore this accounting update if let Some(mut ch) = self.extended_channels.get_mut(&key) { ch.on_share_acknowledgement(m.new_submits_accepted_count, m.new_shares_sum as f64); } @@ -415,6 +416,18 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager { _tlv_fields: Option<&[Tlv]>, ) -> Result<(), Self::Error> { warn!("Received: {} ❌", m); + + let key = if is_aggregated() { + AGGREGATED_CHANNEL_ID + } else { + m.channel_id + }; + + // if None, the channel may be closed/missing, so we ignore this accounting update + if let Some(mut ch) = self.extended_channels.get_mut(&key) { + ch.on_share_rejection(); + } + Ok(()) } From 7c13f503d86740a3091909919f37249d347b9a2f Mon Sep 17 00:00:00 2001 From: plebhash Date: Thu, 19 Mar 2026 09:24:06 -0300 Subject: [PATCH 4/4] refresh stratum-core tip --- integration-tests/Cargo.lock | 85 ++++++----- miner-apps/Cargo.lock | 284 ++++++++++++++--------------------- pool-apps/Cargo.lock | 113 +++++++------- 3 files changed, 217 insertions(+), 265 deletions(-) diff --git a/integration-tests/Cargo.lock b/integration-tests/Cargo.lock index 0ab8ae91d..421e15525 100644 --- a/integration-tests/Cargo.lock +++ b/integration-tests/Cargo.lock @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" @@ -281,7 +281,7 @@ dependencies = [ [[package]] name = "binary_sv2" version = "5.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "buffer_sv2 3.0.1", "derive_codec_sv2 1.1.2", @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "3.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "aes-gcm", ] @@ -522,9 +522,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.56" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "shlex", @@ -578,7 +578,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "4.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "bitcoin", @@ -655,7 +655,7 @@ dependencies = [ [[package]] name = "codec_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "buffer_sv2 3.0.1", @@ -667,9 +667,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "common_messages_sv2" @@ -682,7 +682,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", ] @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" [[package]] name = "digest" @@ -979,7 +979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -991,7 +991,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.1.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", ] @@ -1058,7 +1058,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "6.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "buffer_sv2 3.0.1", @@ -1207,7 +1207,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.2.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "common_messages_sv2 7.0.0", @@ -1606,7 +1606,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", ] @@ -1765,7 +1765,7 @@ dependencies = [ [[package]] name = "mining_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", ] @@ -1848,7 +1848,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1986,7 +1986,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.2.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "common_messages_sv2 7.0.0", @@ -2139,7 +2139,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.4+spec-1.1.0", + "toml_edit 0.25.5+spec-1.1.0", ] [[package]] @@ -2373,7 +2373,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2697,7 +2697,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "bitcoin", @@ -2720,7 +2720,7 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.1.3" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "bitcoin", @@ -2745,7 +2745,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "3.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", "bitcoin_hashes 0.3.2", @@ -2798,7 +2798,7 @@ dependencies = [ "fastrand", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2812,7 +2812,7 @@ dependencies = [ [[package]] name = "template_distribution_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2 5.0.1", ] @@ -2951,9 +2951,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.0+spec-1.1.0" +version = "1.0.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e" +checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" dependencies = [ "serde_core", ] @@ -2969,28 +2969,28 @@ dependencies = [ "serde_spanned", "toml_datetime 0.6.11", "toml_write", - "winnow", + "winnow 0.7.15", ] [[package]] name = "toml_edit" -version = "0.25.4+spec-1.1.0" +version = "0.25.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2" +checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1" dependencies = [ "indexmap", - "toml_datetime 1.0.0+spec-1.1.0", + "toml_datetime 1.0.1+spec-1.1.0", "toml_parser", - "winnow", + "winnow 1.0.0", ] [[package]] name = "toml_parser" -version = "1.0.9+spec-1.1.0" +version = "1.0.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" +checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" dependencies = [ - "winnow", + "winnow 1.0.0", ] [[package]] @@ -3297,7 +3297,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3397,6 +3397,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +dependencies = [ + "memchr", +] + [[package]] name = "writeable" version = "0.6.2" diff --git a/miner-apps/Cargo.lock b/miner-apps/Cargo.lock index d7e49a47d..511bb69a1 100644 --- a/miner-apps/Cargo.lock +++ b/miner-apps/Cargo.lock @@ -72,9 +72,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anstream" -version = "0.6.21" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -87,15 +87,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] @@ -106,7 +106,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -117,7 +117,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -273,7 +273,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "5.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "buffer_sv2", "derive_codec_sv2", @@ -428,16 +428,16 @@ dependencies = [ [[package]] name = "buffer_sv2" version = "3.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "aes-gcm", ] [[package]] name = "bumpalo" -version = "3.20.1" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6f81257d10a0f602a294ae4182251151ff97dbb504ef9afcdda4a64b24d9b4" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "byte-slice-cast" @@ -499,9 +499,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.56" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "shlex", @@ -540,7 +540,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "4.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "bitcoin", @@ -569,9 +569,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.59" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5caf74d17c3aec5495110c34cc3f78644bfa89af6c8993ed4de2790e49b6499" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" dependencies = [ "clap_builder", "clap_derive", @@ -579,9 +579,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.59" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370daa45065b80218950227371916a1633217ae42b2715b2287b606dcd618e24" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", @@ -591,9 +591,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.55" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" dependencies = [ "heck", "proc-macro2", @@ -603,14 +603,14 @@ dependencies = [ [[package]] name = "clap_lex" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "codec_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "buffer_sv2", @@ -622,9 +622,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "colored" @@ -632,13 +632,13 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.61.2", + "windows-sys", ] [[package]] name = "common_messages_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -806,7 +806,7 @@ dependencies = [ [[package]] name = "derive_codec_sv2" version = "1.1.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" [[package]] name = "digest" @@ -855,7 +855,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -923,7 +923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -935,7 +935,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.1.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -996,7 +996,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "6.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.2.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -1501,7 +1501,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1535,16 +1535,16 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] [[package]] name = "js-sys" -version = "0.3.85" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", @@ -1569,17 +1569,16 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.182" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libredox" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" +checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a" dependencies = [ - "bitflags", "libc", ] @@ -1656,7 +1655,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -1690,13 +1689,13 @@ checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1720,7 +1719,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -1734,9 +1733,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" @@ -1820,7 +1819,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.2.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -1888,9 +1887,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -1965,11 +1964,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.23.10+spec-1.0.0", + "toml_edit 0.25.5+spec-1.1.0", ] [[package]] @@ -2019,9 +2018,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -2127,9 +2126,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "ron" @@ -2369,9 +2368,9 @@ dependencies = [ [[package]] name = "shellexpand" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" +checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8" dependencies = [ "dirs", ] @@ -2412,12 +2411,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys", ] [[package]] @@ -2462,7 +2461,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "bitcoin", @@ -2485,7 +2484,7 @@ dependencies = [ [[package]] name = "stratum_translation" version = "0.1.3" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "bitcoin", @@ -2510,7 +2509,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sv1_api" version = "3.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "bitcoin_hashes 0.3.2", @@ -2522,9 +2521,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.116" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df424c70518695237746f84cede799c9c58fcb37450d7b23716568cc8bc69cb" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -2557,7 +2556,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "template_distribution_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -2655,9 +2654,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -2667,14 +2666,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.61.2", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" dependencies = [ "proc-macro2", "quote", @@ -2718,9 +2717,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.5+spec-1.1.0" +version = "1.0.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" dependencies = [ "serde_core", ] @@ -2736,28 +2735,28 @@ dependencies = [ "serde_spanned", "toml_datetime 0.6.11", "toml_write", - "winnow", + "winnow 0.7.15", ] [[package]] name = "toml_edit" -version = "0.23.10+spec-1.0.0" +version = "0.25.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1" dependencies = [ "indexmap", - "toml_datetime 0.7.5+spec-1.1.0", + "toml_datetime 1.0.1+spec-1.1.0", "toml_parser", - "winnow", + "winnow 1.0.0", ] [[package]] name = "toml_parser" -version = "1.0.9+spec-1.1.0" +version = "1.0.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" +checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" dependencies = [ - "winnow", + "winnow 1.0.0", ] [[package]] @@ -2840,9 +2839,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -3046,9 +3045,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.108" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", @@ -3059,9 +3058,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.108" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3069,9 +3068,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.108" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ "bumpalo", "proc-macro2", @@ -3082,18 +3081,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.108" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.85" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" dependencies = [ "js-sys", "wasm-bindgen", @@ -3121,7 +3120,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys", ] [[package]] @@ -3136,15 +3135,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -3155,75 +3145,19 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.53.5" +name = "winnow" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" dependencies = [ - "windows-link", - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "memchr", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" -version = "0.7.14" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" dependencies = [ "memchr", ] @@ -3279,18 +3213,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.39" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a" +checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.39" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" +checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" dependencies = [ "proc-macro2", "quote", @@ -3373,9 +3307,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c745c48e1007337ed136dc99df34128b9faa6ed542d80a1c673cf55a6d7236c8" +checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" [[package]] name = "zmij" diff --git a/pool-apps/Cargo.lock b/pool-apps/Cargo.lock index a76d9d5be..c2fe0b3f7 100644 --- a/pool-apps/Cargo.lock +++ b/pool-apps/Cargo.lock @@ -72,9 +72,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anstream" -version = "0.6.21" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -87,15 +87,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] @@ -273,7 +273,7 @@ checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "binary_sv2" version = "5.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" 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#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "aes-gcm", ] @@ -490,9 +490,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.56" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "shlex", @@ -531,7 +531,7 @@ dependencies = [ [[package]] name = "channels_sv2" version = "4.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "bitcoin", @@ -560,9 +560,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.60" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" dependencies = [ "clap_builder", "clap_derive", @@ -570,9 +570,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.60" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", @@ -582,9 +582,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.55" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" dependencies = [ "heck", "proc-macro2", @@ -594,14 +594,14 @@ dependencies = [ [[package]] name = "clap_lex" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "codec_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "buffer_sv2", @@ -613,9 +613,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "colored" @@ -629,7 +629,7 @@ dependencies = [ [[package]] name = "common_messages_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" 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#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" [[package]] name = "digest" @@ -926,7 +926,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "extensions_sv2" version = "0.1.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -987,7 +987,7 @@ dependencies = [ [[package]] name = "framing_sv2" version = "6.0.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "buffer_sv2", @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "handlers_sv2" version = "0.2.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -1525,7 +1525,7 @@ dependencies = [ [[package]] name = "job_declaration_sv2" version = "7.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -1645,7 +1645,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mining_sv2" version = "8.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -1685,7 +1685,7 @@ dependencies = [ [[package]] name = "noise_sv2" version = "1.4.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -1723,9 +1723,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" @@ -1809,7 +1809,7 @@ dependencies = [ [[package]] name = "parsers_sv2" version = "0.2.2" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "common_messages_sv2", @@ -1975,7 +1975,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.4+spec-1.1.0", + "toml_edit 0.25.5+spec-1.1.0", ] [[package]] @@ -2468,7 +2468,7 @@ dependencies = [ [[package]] name = "stratum-core" version = "0.2.1" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", "bitcoin", @@ -2535,7 +2535,7 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "template_distribution_sv2" version = "5.0.0" -source = "git+https://github.com/stratum-mining/stratum?branch=main#c35172ede52b2e426e9d09161225645d98f9369e" +source = "git+https://github.com/stratum-mining/stratum?branch=main#9d9cc06b87008220e922fc71060c87f738d0a527" dependencies = [ "binary_sv2", ] @@ -2696,9 +2696,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.0+spec-1.1.0" +version = "1.0.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e" +checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" dependencies = [ "serde_core", ] @@ -2714,28 +2714,28 @@ dependencies = [ "serde_spanned", "toml_datetime 0.6.11", "toml_write", - "winnow", + "winnow 0.7.15", ] [[package]] name = "toml_edit" -version = "0.25.4+spec-1.1.0" +version = "0.25.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2" +checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1" dependencies = [ "indexmap", - "toml_datetime 1.0.0+spec-1.1.0", + "toml_datetime 1.0.1+spec-1.1.0", "toml_parser", - "winnow", + "winnow 1.0.0", ] [[package]] name = "toml_parser" -version = "1.0.9+spec-1.1.0" +version = "1.0.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" +checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" dependencies = [ - "winnow", + "winnow 1.0.0", ] [[package]] @@ -2818,9 +2818,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -3113,6 +3113,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +dependencies = [ + "memchr", +] + [[package]] name = "writeable" version = "0.6.2" @@ -3164,18 +3173,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.40" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5" +checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.40" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953" +checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" dependencies = [ "proc-macro2", "quote",