Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-22 19:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Tari: fixed pow_data generation

Browse source
This commit is contained in:
SChernykh 2024-05-11 18:58:53 +02:00
parent c09da948fe
commit a25b5c9713
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/merge_mining_client_tari.cpp
View file

@ -153,8 +153,12 @@ void MergeMiningClientTari::submit_solution(const BlockTemplate* block_tpl, cons
return; return;
} }
if (transaction_count > std::numeric_limits<uint16_t>::max()) {
return;
}
// Total number of transactions in this block (including the miner tx) // Total number of transactions in this block (including the miner tx)
data.append(reinterpret_cast<const char*>(&transaction_count), 2); data.append(reinterpret_cast<const char*>(&transaction_count), sizeof(uint16_t));
// Tx Merkle tree root // Tx Merkle tree root
data.append(reinterpret_cast<const char*>(hashing_blob + nonce_offset + sizeof(uint32_t)), HASH_SIZE); data.append(reinterpret_cast<const char*>(hashing_blob + nonce_offset + sizeof(uint32_t)), HASH_SIZE);
@ -198,6 +202,7 @@ void MergeMiningClientTari::submit_solution(const BlockTemplate* block_tpl, cons
uint32_t tx_extra_size; uint32_t tx_extra_size;
p = readVarint(p, e, tx_extra_size); if (!p) return; p = readVarint(p, e, tx_extra_size); if (!p) return;
const uint8_t* tx_extra_begin = p;
p = coinbase_tx; p = coinbase_tx;
while (offset >= KeccakParams::HASH_DATA_AREA) { while (offset >= KeccakParams::HASH_DATA_AREA) {
@ -227,7 +232,7 @@ void MergeMiningClientTari::submit_solution(const BlockTemplate* block_tpl, cons
// coinbase_tx_extra // coinbase_tx_extra
data.append(reinterpret_cast<const char*>(&tx_extra_size), sizeof(tx_extra_size)); data.append(reinterpret_cast<const char*>(&tx_extra_size), sizeof(tx_extra_size));
data.append(reinterpret_cast<const char*>(p), tx_extra_size); data.append(reinterpret_cast<const char*>(tx_extra_begin), tx_extra_size);
// aux_chain_merkle_proof // aux_chain_merkle_proof
data.append(1, static_cast<char>(merkle_proof.size())); data.append(1, static_cast<char>(merkle_proof.size()));

5
src/params.cpp
View file

@ -235,6 +235,11 @@ bool Params::valid() const
return false; return false;
} }
if (m_mergeMiningHosts.size() > 10) {
LOGERR(1, "Too many merge mining blockchains.");
return false;
}
return true; return true;
} }