diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-10 20:18:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-10 20:18:26 +0200 |
| commit | 098596ea12e13be5c3550f6ab8442fa6940883e4 (patch) | |
| tree | 97ae79611430d0112d632a46758d324c218a65b9 | |
| parent | Merge pull request #5232 (diff) | |
| parent | blockchain: fix ahead of time PoW batch calc (diff) | |
| download | monero-098596ea12e13be5c3550f6ab8442fa6940883e4.tar.xz | |
Merge pull request #5264
4ef3c895 blockchain: fix ahead of time PoW batch calc (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 50e0f1959..471edea99 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -3514,7 +3514,7 @@ leave: // validate proof_of_work versus difficulty target if(!check_hash(proof_of_work, current_diffic)) { - MERROR_VER("Block with id: " << id << std::endl << "does not have enough proof of work: " << proof_of_work << std::endl << "unexpected difficulty: " << current_diffic); + MERROR_VER("Block with id: " << id << std::endl << "does not have enough proof of work: " << proof_of_work << " at height " << blockchain_height << ", unexpected difficulty: " << current_diffic); bvc.m_verifivation_failed = true; goto leave; } @@ -4328,7 +4328,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::vector<block_complete unsigned nblocks = batches; if (i < extra) ++nblocks; - tpool.submit(&waiter, boost::bind(&Blockchain::block_longhash_worker, this, thread_height, epee::span<const block>(&blocks[i], nblocks), std::ref(maps[i])), true); + tpool.submit(&waiter, boost::bind(&Blockchain::block_longhash_worker, this, thread_height, epee::span<const block>(&blocks[thread_height - height], nblocks), std::ref(maps[i])), true); thread_height += nblocks; } |