mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-01-30 09:02:54 -05:00
Code Issues Projects Releases Wiki Activity

fix: expand validation of tx_extra for merge mining tag

Browse Source
This commit is contained in:
David Main
2021-10-10 20:30:33 +02:00
parent 53be5765e6
commit 446810a837
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/tools/cryptonote/BlockTemplate.h
View File

@@ -54,6 +54,7 @@ public:
TX_EXTRA_OFFSET,
TX_PUBKEY_OFFSET,
TX_EXTRA_NONCE_OFFSET,
TX_EXTRA_MERGE_MINING_TAG_OFFSET,
OFFSET_COUNT
};
@@ -86,6 +87,7 @@ public:
inline uint64_t outputType() const { return m_outputType; }
inline const Span &ephPublicKey() const { return m_ephPublicKey; }
inline const Span &txExtraNonce() const { return m_txExtraNonce; }
inline const Span &txMergeMiningTag() const { return m_txMergeMiningTag; }
// Transaction hashes
inline uint64_t numHashes() const { return m_numHashes; }
@@ -140,7 +142,7 @@ private:
Span m_ephPublicKey;
uint64_t m_extraSize = 0;
Span m_txExtraNonce;
Span m_txMergeMiningTag = 0;
uint64_t m_numHashes = 0;
Buffer m_hashes;
Buffer m_minerTxMerkleTreeBranch;