Skip to content

represent share work as u64 (where appropriate) #449

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

Merged
plebhash merged 3 commits into from
May 18, 2026
Merged

represent share work as u64 (where appropriate) #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e757c5f
represent share work as u64 where appropriate
plebhash Apr 22, 2026
f06bf44
update openapi.json
plebhash May 18, 2026
c625de0
chore(deps): update stratum-core to d283cb9
SV2-bot May 18, 2026
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
34 changes: 17 additions & 17 deletions integration-tests/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions miner-apps/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions miner-apps/jd-client/src/lib/channel_manager/downstream_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
channel_id,
last_sequence_number: share_accounting.get_last_share_sequence_number(),
new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
new_shares_sum: share_accounting.get_last_batch_work_sum(),
};
info!("SubmitSharesStandard on downstream channel: {} ✅", success);
messages.push((downstream.downstream_id, Mining::SubmitSharesSuccess(success)).into());
Expand Down Expand Up @@ -1022,7 +1022,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
channel_id,
last_sequence_number: share_accounting.get_last_share_sequence_number(),
new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
new_shares_sum: share_accounting.get_last_batch_work_sum(),
};
messages.push((
downstream.downstream_id,
Expand Down Expand Up @@ -1253,7 +1253,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
channel_id,
last_sequence_number: share_accounting.get_last_share_sequence_number(),
new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
new_shares_sum: share_accounting.get_last_batch_work_sum(),
};
info!("SubmitSharesExtended on downstream channel: {} ✅", success);
messages.push((downstream.downstream_id, Mining::SubmitSharesSuccess(success)).into());
Expand Down Expand Up @@ -1285,7 +1285,7 @@ impl HandleMiningMessagesFromClientAsync for ChannelManager {
channel_id,
last_sequence_number: share_accounting.get_last_share_sequence_number(),
new_submits_accepted_count: share_accounting.get_last_batch_accepted(),
new_shares_sum: share_accounting.get_last_batch_work_sum() as u64,
new_shares_sum: share_accounting.get_last_batch_work_sum(),
};
is_downstream_share_valid = true;
messages.push((
Expand Down
6 changes: 2 additions & 4 deletions miner-apps/jd-client/src/lib/channel_manager/upstream_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,8 @@ impl HandleMiningMessagesFromServerAsync for ChannelManager {
self.channel_manager_data.super_safe_lock(|data| {
// if None, upstream is not currently available, so we skip accounting update
if let Some(upstream_channel) = data.upstream_channel.as_mut() {
upstream_channel.on_share_acknowledgement(
msg.new_submits_accepted_count,
msg.new_shares_sum as f64,
);
upstream_channel
.on_share_acknowledgement(msg.new_submits_accepted_count, msg.new_shares_sum);
}
});

Expand Down
3 changes: 2 additions & 1 deletion miner-apps/jd-client/src/lib/monitoring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ impl ServerMonitoring for ChannelManager {
shares_submitted: share_accounting.get_validated_shares(),
shares_rejected,
shares_rejected_by_reason,
share_work_sum: share_accounting.get_share_work_sum(),
acknowledged_work_sum: share_accounting.get_acknowledged_work_sum(),
validated_work_sum: share_accounting.get_validated_work_sum(),
best_diff: share_accounting.get_best_diff(),
blocks_found: share_accounting.get_blocks_found(),
});
Expand Down
Loading
Loading