Fix/issue 2092 share accounting companion

bitcoin-core-sv2/Cargo.toml

@@ -21,6 +21,7 @@ async-channel = "1.5.1"
 # fetching from github enables synchronizing development workflows across sv2-apps and stratum repos
 # it MUST be changed before bitcoin-core-sv2 is published to crates.io
 # with the proper version of stratum-core being fetched from crates.io as well
-stratum-core = { git = "https://github.com/stratum-mining/stratum", branch = "main" }
+stratum-core = { git = "https://github.com/stratum-mining/stratum", branch = "fix/issue-2092-share-accounting" }
 
 bitcoin-capnp-types = "0.1.0"
+

integration-tests/Cargo.toml

@@ -29,3 +29,4 @@ hex = "0.4.3"
 
 [lib]
 path = "lib/mod.rs"
+

miner-apps/Cargo.toml

@@ -1,19 +1,14 @@
-[workspace]
 resolver="2"
-
 members = [
     "jd-client",
     "translator",
 ]
-
 exclude = [
     "mining-device"
 ]
-
 [profile.dev]
 # Required by super_safe_lock
 opt-level = 1
-
 [profile.test]
 # Required by super_safe_lock
-opt-level = 1
+opt-level = 1

miner-apps/jd-client/src/lib/channel_manager/downstream_message_handler.rs

@@ -989,7 +989,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
                                 channel_id,
                                 last_sequence_number: share_accounting.get_last_share_sequence_number(),
                                 new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
-                                new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
+                                new_shares_sum: share_accounting.get_last_batch_work_sum(),
                             };
                             info!("SubmitSharesStandard on downstream channel: {} ✅", success);
                             messages.push((downstream.downstream_id, Mining::SubmitSharesSuccess(success)).into());
@@ -1023,7 +1023,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
                             channel_id,
                             last_sequence_number: share_accounting.get_last_share_sequence_number(),
                             new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
-                            new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
+                            new_shares_sum: share_accounting.get_last_batch_work_sum(),
                         };
                         messages.push((
                             downstream.downstream_id,
@@ -1240,7 +1240,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
                                 channel_id,
                                 last_sequence_number: share_accounting.get_last_share_sequence_number(),
                                 new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
-                                new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
+                                new_shares_sum: share_accounting.get_last_batch_work_sum(),
                             };
                             info!("SubmitSharesExtended on downstream channel: {} ✅", success);
                             messages.push((downstream.downstream_id, Mining::SubmitSharesSuccess(success)).into());
@@ -1272,7 +1272,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
                             channel_id,
                             last_sequence_number: share_accounting.get_last_share_sequence_number(),
                             new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
-                            new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
+                            new_shares_sum: share_accounting.get_last_batch_work_sum(),
                         };
                         is_downstream_share_valid = true;
                         messages.push((

miner-apps/jd-client/src/lib/channel_manager/upstream_message_handler.rs

@@ -498,10 +498,8 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager {
 
         self.channel_manager_data.super_safe_lock(|data| {
             if let Some(upstream_channel) = data.upstream_channel.as_mut() {
-                upstream_channel.on_share_acknowledgement(
-                    msg.new_submits_accepted_count,
-                    msg.new_shares_sum as f64,
-                );
+                upstream_channel
+                    .on_share_acknowledgement(msg.new_submits_accepted_count, msg.new_shares_sum);
             }
         });
 

miner-apps/mining-device/Cargo.toml

@@ -10,15 +10,10 @@ homepage = "https://stratumprotocol.org"
 repository = "https://github.com/stratum-mining/stratum"
 license = "MIT OR Apache-2.0"
 keywords = ["stratum", "mining", "bitcoin", "protocol"]
-
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 name = "mining_device"
 path = "src/lib/mod.rs"
-
-
 [dependencies]
 stratum-common = { git = "https://github.com/stratum-mining/stratum", rev = "v1.5.0", features = ["with_network_helpers"] }
 async-channel = "1.5.1"
@@ -31,21 +26,17 @@ sha2 = { version = "0.10.6", features = ["compress", "asm"] }
 tokio = "1.44.1"
 primitive-types = "0.13.1"
 num-format = "0.4"
-
 [dev-dependencies]
 # Criterion 0.5 without default features; combined with a dev pin of `half = 2.3.1` to stay Rust 1.75-compatible.
 criterion = { version = "0.5", default-features = false, features = ["stable"] }
 half = "=2.3.1"
 num_cpus = "1"
-
 [[bench]]
 name = "hasher_bench"
 harness = false
-
 [[bench]]
 name = "microbatch_bench"
 harness = false
-
 [[bench]]
 name = "scaling_bench"
 harness = false