Browse Source

Code cleanup.

StriderDM-merge_mining_tag_fix
XMRig 3 years ago
parent
commit
733b85a132
No known key found for this signature in database GPG Key ID: 446A53638BE94409
  1. 25
      src/base/tools/cryptonote/BlockTemplate.cpp

25
src/base/tools/cryptonote/BlockTemplate.cpp

@ -244,32 +244,29 @@ bool xmrig::BlockTemplate::parse(bool hashes)
ar.skip(m_extraSize); ar.skip(m_extraSize);
while (ar_extra.index() < m_extraSize) { while (ar_extra.index() < m_extraSize) {
uint64_t extra_tag = 0; uint64_t extra_tag = 0;
uint64_t size = 0;
ar_extra(extra_tag); ar_extra(extra_tag);
switch (extra_tag) { switch (extra_tag) {
case 0x01: // TX_EXTRA_TAG_PUBKEY case 0x01: // TX_EXTRA_TAG_PUBKEY
{
setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index()); setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
ar_extra.skip(kKeySize); ar_extra.skip(kKeySize);
break; break;
}
case 0x02: // TX_EXTRA_NONCE case 0x02: // TX_EXTRA_NONCE
{ ar_extra(size);
uint64_t size = 0; setOffset(TX_EXTRA_NONCE_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
ar_extra(size); ar_extra(m_txExtraNonce, size);
setOffset(TX_EXTRA_NONCE_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
ar_extra(m_txExtraNonce, size);
}
break; break;
case 0x03: // TX_EXTRA_MERGE_MINING_TAG case 0x03: // TX_EXTRA_MERGE_MINING_TAG
{
uint64_t size = 0;
ar_extra(size); ar_extra(size);
setOffset(TX_EXTRA_MERGE_MINING_TAG_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index()); setOffset(TX_EXTRA_MERGE_MINING_TAG_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
ar_extra(m_txMergeMiningTag, size+kKeySize); ar_extra(m_txMergeMiningTag, size + kKeySize);
break; break;
}
default: default:
return false; // TODO(SChernykh): handle other tags return false; // TODO(SChernykh): handle other tags
} }

Loading…
Cancel
Save