Merge pull request dmnd-pool#109 from Fi3/FixShareSubmitWhenExceedUpstreamCapacity

Fix share submit when exceed upstream capacity

Author: Fi3

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "demand-cli"
-version = "0.1.16"
+version = "0.1.17"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -1,4 +1,7 @@
-use std::{net::{IpAddr, SocketAddr}, sync::Arc};
+use std::{
+    net::{IpAddr, SocketAddr},
+    sync::Arc,
+};
 
 use crate::{
     config::Configuration,
@@ -96,7 +99,7 @@ impl Downstream {
                 if Configuration::sv1_ingress_log() {
                     info!("Sending msg to upstream: {}", message);
                 }
-                if ! is_subscribed {
+                if !is_subscribed {
                     if message.contains("mining.subscribe") {
                         is_subscribed = true;
                         if message.contains("LUXminer") {
@@ -158,7 +161,7 @@ impl Downstream {
     }
 }
 
-#[derive(Debug,Clone,Copy)]
+#[derive(Debug, Clone, Copy)]
 enum Firmware {
     Luxor,
     Other,

src/ingress/sv1_ingress.rs

@@ -510,9 +510,40 @@ impl IsServer<'static> for Downstream {
                 }
             }
             Ok(false) => {
-                warn!("Share rejected: Exceeded 70 shares/min limit");
-                self.stats_sender.update_rejected_shares(self.connection_id);
-                false
+                warn!("Share will not be sent upstream: Exceeded 70 shares/min limit");
+                if let Some(job) = self
+                    .recent_jobs
+                    .get_matching_job(job_id_as_number.expect("checked above"))
+                {
+                    request.job_id = job.job_id.clone();
+                    //check share is valid
+                    if let Some(met_difficulty) = validate_share(
+                        &request,
+                        &job,
+                        &self.difficulty_mgmt.current_difficulties,
+                        self.extranonce1.clone(),
+                        self.version_rolling_mask.clone(),
+                    ) {
+                        info!(
+                            "Share for Job {} and difficulty {} is accepted",
+                            request.job_id, met_difficulty
+                        );
+                        // TODO here stats sender should update accepted shares that are not sent
+                        // upstream
+                        true
+                    } else {
+                        error!("Share rejected: Invalid share");
+                        self.stats_sender.update_rejected_shares(self.connection_id);
+                        false
+                    }
+                } else {
+                    error!(
+                        "Share rejected: can not find job with id {}",
+                        request.job_id
+                    );
+                    self.stats_sender.update_rejected_shares(self.connection_id);
+                    false
+                }
             }
             Err(e) => {
                 error!("Failed to record share: {e:?}");

src/translator/downstream/downstream.rs

@@ -89,9 +89,7 @@ pub async fn start_notify(
                 }
                 tokio::time::sleep(std::time::Duration::from_secs(1)).await;
             }
-            if let Err(e) =
-                start_update(task_manager, downstream.clone(), connection_id).await
-            {
+            if let Err(e) = start_update(task_manager, downstream.clone(), connection_id).await {
                 warn!("Translator impossible to start update task: {e}");
             } else if authorized_in_time {
                 // Get the mask after initialization since is set by configure message