Skip to content

RRP-734 Share Logger Switched To Pool #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mlgodskz wants to merge 1 commit into
base: nomium-develop
Choose a base branch
from
+27 −4
Open

RRP-734 Share Logger Switched To Pool #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions protocols/v2/roles-logic-sv2/src/channel_logic/channel_factory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ impl ChannelFactory {
bits: u32,
) -> Result<OnNewShare, Error> {
debug!("Checking target for share {:?}", m);

let upstream_target = match &self.kind {
ExtendedChannelKind::Pool => Target::new(0, 0),
ExtendedChannelKind::Proxy {
Expand All @@ -796,11 +797,14 @@ impl ChannelFactory {
| ExtendedChannelKind::ProxyJd {
upstream_target, ..
} => upstream_target.clone(),
};
};

let (downstream_target, extranonce) = self
.get_channel_specific_mining_info(&m)
.ok_or(Error::ShareDoNotMatchAnyChannel)?;
// Nomium ----
//let upstream_target = downstream_target.clone();
// ---- Nomium
let extranonce_1_len = self.extranonces.get_range0_len();
let extranonce_2 = extranonce[extranonce_1_len..].to_vec();
match &mut m {
Expand Down Expand Up @@ -895,8 +899,7 @@ impl ChannelFactory {
let received_at = shares_logger::get_utc_now();

match self.kind {
ExtendedChannelKind::Pool => {},
ExtendedChannelKind::Proxy { .. } | ExtendedChannelKind::ProxyJd { .. } => {
ExtendedChannelKind::Pool => {
let share_log = shares_logger::services::share_processor::ShareProcessor::prepare_share_log(
m.get_channel_id(),
m.get_sequence_number(),
Expand All @@ -911,9 +914,29 @@ impl ChannelFactory {
received_at,
share_status_mapped,
);
info!("Calling share logging for PROXY");
info!("Calling share logging for Pool");
shares_logger::log_share(share_log);
nomium_prometheus::CHFACT_SHARES_LOGGED_TOTAL.inc();
},
ExtendedChannelKind::Proxy { .. } | ExtendedChannelKind::ProxyJd { .. } => {
/* let share_log = shares_logger::services::share_processor::ShareProcessor::prepare_share_log(
m.get_channel_id(),
m.get_sequence_number(),
m.get_job_id(),
m.get_nonce(),
m.get_n_time(),
m.get_version(),
hash,
downstream_target.clone(),
extranonce.to_vec(),
user_identity,
received_at,
share_status_mapped,
);
info!("Calling share logging for PROXY");
shares_logger::log_share(share_log);
nomium_prometheus::CHFACT_SHARES_LOGGED_TOTAL.inc(); */
info!("Calling share logging for TProxy, but nothing to do");
}
}
// ---- NOMIUM share_log injection ----
Expand Down