Merge pull request #1561 from plebhash/tproxy-accepts-every-share

remove `translator-proxy-old-share` and revert #910

Author: plebhash

.github/workflows/mg.yaml

@@ -85,14 +85,6 @@ jobs:
       - name: Run translation-proxy-broke-pool
         run: sh ./test/message-generator/test/translation-proxy-broke-pool/translation-proxy-broke-pool.sh
 
-  translation-proxy-old-share:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Run translation-proxy-old-share
-        run: sh ./test/message-generator/test/translation-proxy-old-share/translation-proxy-old-share.sh
-
   mg-aggregate-results:
     name: "Aggregate MG Test Results"
     runs-on: ubuntu-latest
@@ -106,8 +98,7 @@ jobs:
       pool-sri-test-1-standard,
       pool-sri-test-close-channel,
       sv1-test,
-      translation-proxy-broke-pool,
-      translation-proxy-old-share
+      translation-proxy-broke-pool
     ]
     steps:
       - name: Aggregate Results
@@ -120,8 +111,7 @@ jobs:
           [ "${{ needs.pool-sri-test-1-standard.result }}" != "success" ] ||
           [ "${{ needs.pool-sri-test-close-channel.result }}" != "success" ] ||
           [ "${{ needs.sv1-test.result }}" != "success" ] ||
-          [ "${{ needs.translation-proxy-broke-pool.result }}" != "success" ] ||
-          [ "${{ needs.translation-proxy-old-share.result }}" != "success" ]; then
+          [ "${{ needs.translation-proxy-broke-pool.result }}" != "success" ]; then
             echo "One or more jobs failed."
             exit 1
           else

roles/translator/README.md

@@ -55,4 +55,8 @@ There are two files in `roles/translator/config-examples`:
 
 ```bash
 cd roles/translator/config-examples/
-cargo run -- -c tproxy-config-local-jdc-example.toml
+cargo run -- -c tproxy-config-local-jdc-example.toml
+
+### Limitations
+
+The current implementation always replies to Sv1 `mining.submit` with `"result": true`, regardless of whether the share was rejected on Sv2 upstream.

roles/translator/src/lib/downstream_sv1/downstream.rs

@@ -61,7 +61,6 @@ pub struct Downstream {
     extranonce2_len: usize,
     pub(super) difficulty_mgmt: DownstreamDifficultyConfig,
     pub(super) upstream_difficulty_config: Arc<Mutex<UpstreamDifficultyConfig>>,
-    last_job_id: String, // we usually receive a String on SV1 messages, no need to cast to u32
 }
 
 impl Downstream {
@@ -92,7 +91,6 @@ impl Downstream {
             extranonce2_len,
             difficulty_mgmt,
             upstream_difficulty_config,
-            last_job_id,
         }
     }
     /// Instantiate a new `Downstream`.
@@ -128,7 +126,6 @@ impl Downstream {
             extranonce2_len,
             difficulty_mgmt: difficulty_config,
             upstream_difficulty_config,
-            last_job_id: "".to_string(),
         }));
         let self_ = downstream.clone();
 
@@ -287,10 +284,6 @@ impl Downstream {
 
                     let sv1_mining_notify_msg = last_notify.clone().unwrap();
 
-                    self_
-                        .safe_lock(|s| s.last_job_id = sv1_mining_notify_msg.clone().job_id)
-                        .unwrap();
-
                     let message: json_rpc::Message = sv1_mining_notify_msg.into();
                     handle_result!(
                         tx_status_notify,
@@ -314,8 +307,6 @@ impl Downstream {
                             let sv1_mining_notify_msg = handle_result!(tx_status_notify, res);
                             let message: json_rpc::Message = sv1_mining_notify_msg.clone().into();
 
-                            self_.safe_lock(|s| s.last_job_id = sv1_mining_notify_msg.job_id).unwrap();
-
                             handle_result!(tx_status_notify, Downstream::send_message_downstream(downstream.clone(), message).await);
                         },
                         _ = rx_shutdown.recv().fuse() => {
@@ -538,23 +529,19 @@ impl IsServer<'static> for Downstream {
 
         // TODO: Check if receiving valid shares by adding diff field to Downstream
 
-        if request.job_id == self.last_job_id {
-            let to_send = SubmitShareWithChannelId {
-                channel_id: self.connection_id,
-                share: request.clone(),
-                extranonce: self.extranonce1.clone(),
-                extranonce2_len: self.extranonce2_len,
-                version_rolling_mask: self.version_rolling_mask.clone(),
-            };
-
-            self.tx_sv1_bridge
-                .try_send(DownstreamMessages::SubmitShares(to_send))
-                .unwrap();
-
-            true
-        } else {
-            false
-        }
+        let to_send = SubmitShareWithChannelId {
+            channel_id: self.connection_id,
+            share: request.clone(),
+            extranonce: self.extranonce1.clone(),
+            extranonce2_len: self.extranonce2_len,
+            version_rolling_mask: self.version_rolling_mask.clone(),
+        };
+
+        self.tx_sv1_bridge
+            .try_send(DownstreamMessages::SubmitShares(to_send))
+            .unwrap();
+
+        true
     }
 
     /// Indicates to the server that the client supports the mining.set_extranonce method.