Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-01 15:56:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

cryptonote: untangle dependency from miner to blockchain

Browse source 
It causes link errors at least on mac
This commit is contained in:
moneromooo-monero 2019-10-31 01:05:58 +00:00
parent 4c9fd8d86d
commit ebc6ce44f4
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
6 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cryptonote_basic/miner.cpp
View file

@ -102,13 +102,13 @@ namespace cryptonote
}
miner::miner(i_miner_handler* phandler, Blockchain* pbc):m_stop(1),
miner::miner(i_miner_handler* phandler, const get_block_hash_t &gbh):m_stop(1),
m_template{},
m_template_no(0),
m_diffic(0),
m_thread_index(0),
m_phandler(phandler),
m_pbc(pbc),
m_gbh(gbh),
m_height(0),
m_threads_active(0),
m_pausers_count(0),
@ -471,12 +471,12 @@ namespace cryptonote
return true;
}
//-----------------------------------------------------------------------------------------------------
bool miner::find_nonce_for_given_block(const Blockchain *pbc, block& bl, const difficulty_type& diffic, uint64_t height)
bool miner::find_nonce_for_given_block(const get_block_hash_t &gbh, block& bl, const difficulty_type& diffic, uint64_t height)
{
for(; bl.nonce != std::numeric_limits<uint32_t>::max(); bl.nonce++)
{
crypto::hash h;
get_block_longhash(pbc, bl, h, height, tools::get_max_concurrency());
gbh(bl, height, tools::get_max_concurrency(), h);
if(check_hash(h, diffic))
{
@ -572,7 +572,7 @@ namespace cryptonote
b.nonce = nonce;
crypto::hash h;
get_block_longhash(m_pbc, b, h, height, tools::get_max_concurrency());
m_gbh(b, height, tools::get_max_concurrency(), h);
if(check_hash(h, local_diff))
{

8
src/cryptonote_basic/miner.h
View file

@ -52,7 +52,7 @@ namespace cryptonote
~i_miner_handler(){};
};
class Blockchain;
typedef std::function<bool(const cryptonote::block&, uint64_t, unsigned int, crypto::hash&)> get_block_hash_t;
/************************************************************************/
/* */
@ -60,7 +60,7 @@ namespace cryptonote
class miner
{
public:
miner(i_miner_handler* phandler, Blockchain* pbc);
miner(i_miner_handler* phandler, const get_block_hash_t& gbh);
~miner();
bool init(const boost::program_options::variables_map& vm, network_type nettype);
static void init_options(boost::program_options::options_description& desc);
@ -76,7 +76,7 @@ namespace cryptonote
bool on_idle();
void on_synchronized();
//synchronous analog (for fast calls)
static bool find_nonce_for_given_block(const Blockchain *pbc, block& bl, const difficulty_type& diffic, uint64_t height);
static bool find_nonce_for_given_block(const get_block_hash_t &gbh, block& bl, const difficulty_type& diffic, uint64_t height);
void pause();
void resume();
void do_print_hashrate(bool do_hr);
@ -135,7 +135,7 @@ namespace cryptonote
std::list<boost::thread> m_threads;
epee::critical_section m_threads_lock;
i_miner_handler* m_phandler;
Blockchain* m_pbc;
get_block_hash_t m_gbh;
account_public_address m_mine_address;
epee::math_helper::once_a_time_seconds<5> m_update_block_template_interval;
epee::math_helper::once_a_time_seconds<2> m_update_merge_hr_interval;