Skip to content

btc: F1 v36 raw-key parity in payout/skiplist hashing #85

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
frstrtr merged 2 commits into from
Jun 12, 2026
Merged

btc: F1 v36 raw-key parity in payout/skiplist hashing #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
698cc37
btc(v36): raw parent-script merged-weight key, matching payout addres…
frstrtr Jun 12, 2026
5920c76
btc: F1 v36 raw-key parity in payout/skiplist hashing
frstrtr Jun 12, 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
39 changes: 24 additions & 15 deletions src/impl/btc/share_tracker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2255,11 +2255,13 @@ class ShareTracker
delta.total_donation_weight = att * static_cast<uint32_t>(obj->m_donation);
auto raw_script = get_share_script(obj);
if (raw_script.empty()) return;
// Normalize P2WPKH→P2PKH for merged chain compatibility.
// P2TR/P2WSH → empty → skipped (unconvertible).
auto script = normalize_script_for_merged(raw_script);
if (script.empty()) return;
delta.weights[script] = att * static_cast<uint32_t>(65535 - obj->m_donation);
// F1 (Option A; mirror of ltc 8ca17954): key merged weight by the
// RAW parent script (== p2pool address_key == share.new_script),
// matching the payout key. p2pool credits raw weight to every V36
// share regardless of script type (data.py compute_merged_payout_hash);
// keying by the normalized P2WPKH->P2PKH form (and skipping
// unconvertible P2TR/P2WSH) was the merged-payout key/pay divergence.
delta.weights[raw_script] = att * static_cast<uint32_t>(65535 - obj->m_donation);
});
return delta;
},
Expand Down Expand Up @@ -2649,15 +2651,17 @@ class ShareTracker
auto att = chain::target_to_average_attempts(target);
auto raw_script = get_share_script(obj);
if (raw_script.empty()) return;
// Normalize P2WPKH→P2PKH for merged chain compatibility.
// P2TR/P2WSH → empty → skipped (unconvertible).
auto script = normalize_script_for_merged(raw_script);
if (script.empty()) return;
// Only set total_weight/donation for convertible scripts
// (matching p2pool: unconvertible → (1, {}, 0, 0))
// F1 (Option A; mirror of ltc 8ca17954): key merged weight by the
// RAW parent script (== p2pool address_key == share.new_script),
// matching the payout key and compute_merged_payout_hash. p2pool
// credits raw weight + full total to every V36 share regardless of
// script type (data.py get_v36_merged_weights:2756 -- if address_key
// is None: address_key = share.new_script). Keying by the normalized
// P2WPKH->P2PKH form and skipping unconvertible P2TR/P2WSH was the
// key/pay divergence F1 removes.
delta.total_weight = att * 65535;
delta.total_donation_weight = att * static_cast<uint32_t>(obj->m_donation);
delta.weights[script] = att * static_cast<uint32_t>(65535 - obj->m_donation);
delta.weights[raw_script] = att * static_cast<uint32_t>(65535 - obj->m_donation);
});
return delta;
},
Expand Down Expand Up @@ -2726,10 +2730,15 @@ class ShareTracker
tier_name = "T1.5:retro";
}
}
// Tier 2: normalize P2WPKH→P2PKH for merged
// chain compatibility. P2TR/P2WSH → empty → skipped.
// F1 (Option A; mirror of ltc 8ca17954): default
// merged-weight emission key = RAW parent script
// (== p2pool address_key == share.new_script), matching
// the payout key. normalize_script_for_merged stays the
// Tier-1.5 lookup PROBE only (above); keying emission by
// the normalized P2WPKH->P2PKH form was the merged-payout
// accounting divergence.
if (weight_key.empty())
weight_key = normalize_script_for_merged(parent_script);
weight_key = parent_script;
}
}
else
Expand Down
Loading