channels-sv2: refine client share accounting counters

replace shares_accepted with acknowledged_shares, validated_shares, and rejected_shares
add on_share_rejection and delegate it from extended and standard channels
update on_share_acknowledgement and track_validated_share to increment the new counters
add getters for acknowledged, validated, and rejected shares

Author: plebhash

sv2/channels-sv2/src/client/extended.rs

@@ -223,6 +223,12 @@ impl<'a> ExtendedChannel<'a> {
             .on_share_acknowledgement(new_submits_accepted_count, new_shares_sum);
     }
 
+    /// Updates share accounting based on a [`SubmitSharesError`] message from the upstream
+    /// server. Delegates to [`ShareAccounting::on_share_rejection`].
+    pub fn on_share_rejection(&mut self) {
+        self.share_accounting.on_share_rejection();
+    }
+
     /// Handles a [`NewExtendedMiningJob`] message received from upstream.
     ///
     /// The message could be either directed at this channel, or at a group channel it belongs to.

sv2/channels-sv2/src/client/share_accounting.rs

@@ -50,18 +50,22 @@ pub enum ShareValidationError {
 /// - highest difficulty seen in validated shares
 ///
 /// **Acceptance phase** (updated by the application layer via [`on_share_acknowledgement`]):
-/// - total accepted shares (confirmed by upstream [`SubmitSharesSuccess`])
+/// - total acknowledged shares (confirmed by upstream [`SubmitSharesSuccess`])
+/// - total rejected shares (reported by upstream [`SubmitSharesError`])
 /// - cumulative work from accepted shares
 /// - number of blocks found
 ///
 /// [`validate_share`]: super::extended::ExtendedChannel::validate_share
 /// [`track_validated_share`]: ShareAccounting::track_validated_share
 /// [`on_share_acknowledgement`]: ShareAccounting::on_share_acknowledgement
 /// [`SubmitSharesSuccess`]: mining_sv2::SubmitSharesSuccess
+/// [`SubmitSharesError`]: mining_sv2::SubmitSharesError
 #[derive(Clone, Debug)]
 pub struct ShareAccounting {
     last_share_sequence_number: u32,
-    shares_accepted: u32,
+    acknowledged_shares: u32,
+    validated_shares: u32,
+    rejected_shares: u32,
     share_work_sum: f64,
     seen_shares: HashSet<Hash>,
     best_diff: f64,
@@ -79,7 +83,9 @@ impl ShareAccounting {
     pub fn new() -> Self {
         Self {
             last_share_sequence_number: 0,
-            shares_accepted: 0,
+            acknowledged_shares: 0,
+            validated_shares: 0,
+            rejected_shares: 0,
             share_work_sum: 0.0,
             seen_shares: HashSet::new(),
             best_diff: 0.0,
@@ -99,10 +105,18 @@ impl ShareAccounting {
         new_submits_accepted_count: u32,
         new_shares_sum: f64,
     ) {
-        self.shares_accepted += new_submits_accepted_count;
+        self.acknowledged_shares += new_submits_accepted_count;
         self.share_work_sum += new_shares_sum;
     }
 
+    /// Updates rejection accounting based on a [`SubmitSharesError`] message from the upstream
+    /// server.
+    ///
+    /// One call corresponds to one rejected share.
+    pub fn on_share_rejection(&mut self) {
+        self.rejected_shares += 1;
+    }
+
     /// Records a share that passed local validation.
     ///
     /// Adds the hash to the seen set for duplicate detection and updates the last sequence
@@ -111,6 +125,7 @@ impl ShareAccounting {
     /// called when the upstream server confirms via [`SubmitSharesSuccess`].
     pub fn track_validated_share(&mut self, share_sequence_number: u32, share_hash: Hash) {
         self.last_share_sequence_number = share_sequence_number;
+        self.validated_shares += 1;
         self.seen_shares.insert(share_hash);
     }
 
@@ -127,9 +142,19 @@ impl ShareAccounting {
         self.last_share_sequence_number
     }
 
-    /// Returns the total number of shares accepted.
-    pub fn get_shares_accepted(&self) -> u32 {
-        self.shares_accepted
+    /// Returns the total number of shares acknowledged by upstream.
+    pub fn get_acknowledged_shares(&self) -> u32 {
+        self.acknowledged_shares
+    }
+
+    /// Returns the total number of locally validated shares.
+    pub fn get_validated_shares(&self) -> u32 {
+        self.validated_shares
+    }
+
+    /// Returns the total number of shares rejected by upstream.
+    pub fn get_rejected_shares(&self) -> u32 {
+        self.rejected_shares
     }
 
     /// Returns the cumulative work of all accepted shares.

sv2/channels-sv2/src/client/standard.rs

@@ -179,6 +179,12 @@ impl<'a> StandardChannel<'a> {
             .on_share_acknowledgement(new_submits_accepted_count, new_shares_sum);
     }
 
+    /// Updates share accounting based on a [`SubmitSharesError`] message from the upstream
+    /// server. Delegates to [`ShareAccounting::on_share_rejection`].
+    pub fn on_share_rejection(&mut self) {
+        self.share_accounting.on_share_rejection();
+    }
+
     /// Handles a new group channel job by converting it into a standard job
     /// and activating it in this channel's context.
     ///