tiamak/p2pool-monero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync test: added merge mining

Browse Source
This commit is contained in:
SChernykh
2023-11-17 19:22:12 +01:00
parent d1fee33482
commit 5aff5f5796
5 changed files with 89 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p2pool.cpp
+4 -2
View File
@@ -346,13 +346,15 @@ void p2pool::handle_miner_data(MinerData& data)
data.aux_chains.reserve(m_mergeMiningClients.size());
std::vector<hash> tmp;
tmp.reserve(m_mergeMiningClients.size());
tmp.reserve(m_mergeMiningClients.size() + 1);
for (const MergeMiningClient* c : m_mergeMiningClients) {
data.aux_chains.emplace_back(c->aux_id(), c->aux_data(), c->aux_diff());
tmp.emplace_back(c->aux_data());
tmp.emplace_back(c->aux_id());
}
tmp.emplace_back(m_sideChain->consensus_hash());
if (!find_aux_nonce(tmp, data.aux_nonce)) {
LOGERR(1, "Failed to find the aux nonce for merge mining. Merge mining will be off this round.");
data.aux_chains.clear();