mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-06-18 10:22:39 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3807 from SChernykh/dev

Browse Source 
Update FCMP++ block template layout
This commit is contained in:
xmrig
2026-04-30 17:31:14 +07:00
committed by GitHub
parent 80eff55ed6 c59c03e137
commit a7baa9cb63
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/base/tools/cryptonote/BlockTemplate.cpp
View File

@@ -406,9 +406,9 @@ bool xmrig::BlockTemplate::parse(bool hashes)
if (hashes) { if (hashes) {
// FCMP++ layout: // FCMP++ layout:
// //
// index 0 fcmp_pp_n_tree_layers + 31 zero bytes // index 0 coinbase transaction hash
// index 1 fcmp_pp_tree_root // index 1 fcmp_pp_n_tree_layers + 31 zero bytes
// index 2 coinbase transaction hash // index 2 fcmp_pp_tree_root
// index 3+ other transaction hashes // index 3+ other transaction hashes
// //
// pre-FCMP++ layout: // pre-FCMP++ layout:
@@ -416,30 +416,28 @@ bool xmrig::BlockTemplate::parse(bool hashes)
// index 0 coinbase transaction hash // index 0 coinbase transaction hash
// index 1+ other transaction hashes // index 1+ other transaction hashes
// //
const uint32_t coinbase_tx_index = is_fcmp_pp ? 2 : 0; // Update: FCMP moved coinbase tx to index 0 to stay consistent with pre-fork layout
m_hashes.clear(); m_hashes.clear();
m_hashes.resize((coinbase_tx_index + m_numHashes + 1) * kHashSize); m_hashes.resize((m_numHashes + (is_fcmp_pp ? 3 : 1)) * kHashSize);
uint8_t* data = m_hashes.data() + coinbase_tx_index * kHashSize; calculateMinerTxHash(blob(MINER_TX_PREFIX_OFFSET), blob(MINER_TX_PREFIX_END_OFFSET), m_hashes.data());
calculateMinerTxHash(blob(MINER_TX_PREFIX_OFFSET), blob(MINER_TX_PREFIX_END_OFFSET), data);
for (uint64_t i = 1; i <= m_numHashes; ++i) { for (uint64_t i = 1; i <= m_numHashes; ++i) {
Span h; Span h;
ar(h, kHashSize); ar(h, kHashSize);
memcpy(data + i * kHashSize, h.data(), kHashSize); memcpy(m_hashes.data() + (i + (is_fcmp_pp ? 2 : 0)) * kHashSize, h.data(), kHashSize);
} }
if (is_fcmp_pp) { if (is_fcmp_pp) {
ar(m_FCMPTreeLayers); ar(m_FCMPTreeLayers);
ar(m_FCMPTreeRoot); ar(m_FCMPTreeRoot);
m_hashes[0] = m_FCMPTreeLayers; m_hashes[kHashSize] = m_FCMPTreeLayers;
memcpy(m_hashes.data() + kHashSize, m_FCMPTreeRoot, kHashSize); memcpy(m_hashes.data() + kHashSize * 2, m_FCMPTreeRoot, kHashSize);
} }
calculateMerkleTreeHash(coinbase_tx_index); calculateMerkleTreeHash(0);
} }
return true; return true;