Merge pull request #6047

ebc6ce44f cryptonote: untangle dependency from miner to blockchain (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-11-02 17:30:09 +02:00
commit da31077bed
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
6 changed files with 24 additions and 14 deletions

View file

@ -1833,7 +1833,9 @@ namespace cryptonote
return false;
}
b.nonce = req.starting_nonce;
miner::find_nonce_for_given_block(&(m_core.get_blockchain_storage()), b, template_res.difficulty, template_res.height);
miner::find_nonce_for_given_block([this](const cryptonote::block &b, uint64_t height, unsigned int threads, crypto::hash &hash) {
return cryptonote::get_block_longhash(&(m_core.get_blockchain_storage()), b, hash, height, threads);
}, b, template_res.difficulty, template_res.height);
submit_req.front() = string_tools::buff_to_hex_nodelimer(block_to_blob(b));
r = on_submitblock(submit_req, submit_res, error_resp, ctx);