add HashMap of prevhashes in Sv1ServerData

Author: GitGab19

miner-apps/translator/src/lib/sv1/sv1_server/data.rs

@@ -26,7 +26,9 @@ pub struct Sv1ServerData {
     pub downstreams: HashMap<DownstreamId, Arc<Downstream>>,
     pub request_id_to_downstream_id: HashMap<RequestId, DownstreamId>,
     pub vardiff: HashMap<DownstreamId, Arc<RwLock<VardiffState>>>,
-    pub prevhash: Option<SetNewPrevHash<'static>>,
+    /// HashMap to store the SetNewPrevHash for each channel
+    /// Used in both aggregated and non-aggregated mode
+    pub prevhashes: HashMap<ChannelId, SetNewPrevHash<'static>>,
     pub downstream_id_factory: AtomicUsize,
     pub request_id_factory: AtomicU32,
     /// Job storage for aggregated mode - all Sv1 downstreams share the same jobs
@@ -52,7 +54,7 @@ impl Sv1ServerData {
             downstreams: HashMap::new(),
             request_id_to_downstream_id: HashMap::new(),
             vardiff: HashMap::new(),
-            prevhash: None,
+            prevhashes: HashMap::new(),
             downstream_id_factory: AtomicUsize::new(1),
             request_id_factory: AtomicU32::new(1),
             aggregated_valid_jobs: aggregate_channels.then(Vec::new),
@@ -87,6 +89,16 @@ impl Sv1ServerData {
         job_id.contains(KEEPALIVE_JOB_ID_DELIMITER)
     }
 
+    /// Gets the prevhash for a given channel.
+    pub fn get_prevhash(&self, channel_id: u32) -> Option<SetNewPrevHash<'static>> {
+        self.prevhashes.get(&channel_id).cloned()
+    }
+
+    /// Sets the prevhash for a given channel.
+    pub fn set_prevhash(&mut self, channel_id: u32, prevhash: SetNewPrevHash<'static>) {
+        self.prevhashes.insert(channel_id, prevhash);
+    }
+
     /// Gets the last job from the jobs storage.
     /// In aggregated mode, returns the last job from the shared job list.
     /// In non-aggregated mode, returns the last job for the specified channel.

miner-apps/translator/src/lib/sv1/sv1_server/sv1_server.rs

@@ -576,7 +576,9 @@ impl Sv1Server {
                     "Received NewExtendedMiningJob for channel id: {}",
                     m.channel_id
                 );
-                if let Some(prevhash) = self.sv1_server_data.super_safe_lock(|v| v.prevhash.clone())
+                if let Some(prevhash) = self
+                    .sv1_server_data
+                    .super_safe_lock(|v| v.get_prevhash(m.channel_id))
                 {
                     let clean_jobs = m.job_id == prevhash.job_id;
                     let notify =
@@ -616,7 +618,7 @@ impl Sv1Server {
             Mining::SetNewPrevHash(m) => {
                 debug!("Received SetNewPrevHash for channel id: {}", m.channel_id);
                 self.sv1_server_data
-                    .super_safe_lock(|v| v.prevhash = Some(m.clone().into_static()));
+                    .super_safe_lock(|v| v.set_prevhash(m.channel_id, m.clone().into_static()));
             }
 
             Mining::SetTarget(m) => {

miner-apps/translator/src/lib/sv2/channel_manager/channel_manager.rs

@@ -5,7 +5,7 @@ use crate::{
         channel::ChannelState,
         data::{ChannelManagerData, ChannelMode},
     },
-    utils::ShutdownMessage,
+    utils::{ShutdownMessage, AGGREGATED_CHANNEL_ID},
 };
 use async_channel::{Receiver, Sender};
 use std::sync::{Arc, RwLock};
@@ -404,6 +404,10 @@ impl ChannelManager {
                                         }
                                     });
 
+                                    // set the channel id to the aggregated channel id
+                                    // before sending the message to the SV1Server
+                                    job.channel_id = AGGREGATED_CHANNEL_ID;
+
                                     self.channel_state
                                         .sv1_server_sender
                                         .send((Mining::NewExtendedMiningJob(job.clone()), None))