Merge pull request dmnd-pool#80 from Fi3/FixStaleJobs

Flush job cache on new blocks

Author: Fi3

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "demand-cli"
-version = "0.1.8"
+version = "0.1.10"
 edition = "2021"
 
 [dependencies]
@@ -40,7 +40,7 @@ reqwest ={ version = "0.12.20"}
 #demand-sv2-connection = { path = "../demand-sv2-connection"}
 #roles_logic_sv2 = { path = "../stratum/protocols/v2/roles-logic-sv2"}
 #framing_sv2 = { path = "../stratum/protocols/v2/framing-sv2"}
-#binary_sv2 = { path = "../stratum/protocols/v2/binary-sv2/binary-sv2"}
+#binary_sv2 = { path = "../stratum/protocols/v2/binary-sv2"}
 #noise_sv2 = {path ="../stratum/protocols/v2/noise-sv2"}
 #codec_sv2 = {features = ["noise_sv2","with_buffer_pool"], path = "../stratum/protocols/v2/codec-sv2" }
 #sv1_api = {path = "../stratum/protocols/v1" }

Cargo.toml

@@ -251,6 +251,7 @@ impl Bridge {
         share: SubmitShareWithChannelId,
     ) -> ProxyResult<'static, ()> {
         let channel_id = share.channel_id;
+        let job_id = share.share.job_id.clone();
         info!("Bridge recv share for channel {:?}", channel_id);
         let (tx_sv2_submit_shares_ext, target_mutex) = self_
             .safe_lock(|s| (s.tx_sv2_submit_shares_ext.clone(), s.target.clone()))
@@ -265,7 +266,7 @@ impl Bridge {
             .safe_lock(|s| {
                 let job_id = share.share.job_id.parse::<u32>().expect("Invalid job_id");
                 if !s.valid_job_ids.contains(&job_id) {
-                    info!("Share rejected: job_id {} not in last two jobs", job_id);
+                    warn!("Share rejected: job_id {} not in last two jobs", job_id);
                     return Err(roles_logic_sv2::Error::ShareDoNotMatchAnyJob); // rejected
                 }
                 s.channel_factory.set_target(&mut upstream_target);
@@ -324,6 +325,9 @@ impl Bridge {
                             );
                 }
             }
+            Err(roles_logic_sv2::Error::ShareDoNotMatchAnyJob) => {
+                warn!("Channel factory can not get this share's job_id: {}", job_id);
+            }
             Err(e) => {
                 return Err(Error::RolesSv2Logic(e));
             }
@@ -387,6 +391,7 @@ impl Bridge {
 
         self_
             .safe_lock(|s| {
+                s.valid_job_ids.clear();
                 s.channel_factory
                     .on_new_prev_hash(sv2_set_new_prev_hash.clone())
             })