Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixed crush on miner

Browse source
This commit is contained in:
crypro.zoidberg 2019-01-19 19:24:37 +03:00
parent 0e6e3dcd79
commit 871bfb76b8
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/currency_core/miner.cpp
View file

@ -64,12 +64,13 @@ namespace currency
stop();
}
//-----------------------------------------------------------------------------------------------------
bool miner::set_block_template(const block& bl, const wide_difficulty_type& di, uint64_t height)
bool miner::set_block_template(const block& bl, const wide_difficulty_type& di, uint64_t height, const crypto::hash& seed)
{
CRITICAL_REGION_LOCAL(m_template_lock);
m_template = bl;
m_diffic = di;
m_height = height;
m_seed = seed;
++m_template_no;
m_starter_nonce = crypto::rand<uint32_t>();
m_scratchpad.generate(m_seed, height);
@ -95,12 +96,13 @@ namespace currency
{
extra_nonce += std::string("|") + m_extra_messages[m_config.current_extra_message_index];
}
if(!m_phandler->get_block_template(bl, m_seed, m_mine_address, m_mine_address, di, height, extra_nonce))
crypto::hash seed = null_hash;
if(!m_phandler->get_block_template(bl, seed, m_mine_address, m_mine_address, di, height, extra_nonce))
{
LOG_ERROR("Failed to get_block_template()");
return false;
}
set_block_template(bl, di, height);
set_block_template(bl, di, height, seed);
return true;
}
//-----------------------------------------------------------------------------------------------------
@ -307,6 +309,8 @@ namespace currency
wide_difficulty_type local_diff = 0;
uint32_t local_template_ver = 0;
blobdata local_blob_data;
crypto::hash local_seed = null_hash;
uint64_t local_height = 0;
//uint64_t local_template_height = 0;
block b;
@ -324,6 +328,8 @@ namespace currency
CRITICAL_REGION_BEGIN(m_template_lock);
b = m_template;
local_diff = m_diffic;
local_seed = m_seed;
local_height = m_height;
CRITICAL_REGION_END();
//local_template_height = get_block_height(b);
local_template_ver = m_template_no;
@ -339,7 +345,7 @@ namespace currency
}
b.nonce = nonce;
access_nonce_in_block_blob(local_blob_data) = b.nonce;
crypto::hash h = m_scratchpad.get_pow_hash(local_blob_data, m_height, m_seed);
crypto::hash h = m_scratchpad.get_pow_hash(local_blob_data, local_height, local_seed);
if(check_hash(h, local_diff))
{

2
src/currency_core/miner.h
View file

@ -84,7 +84,7 @@ namespace currency
}
private:
bool set_block_template(const block& bl, const wide_difficulty_type& diffic, uint64_t height);
bool set_block_template(const block& bl, const wide_difficulty_type& diffic, uint64_t height, const crypto::hash& seed);
bool worker_thread();
bool request_block_template();
void merge_hr();

2
src/currency_core/scratchpad_helper.cpp
View file

@ -28,7 +28,7 @@ namespace currency
crypto::hash scratchpad_keeper::get_pow_hash(const blobdata& bd, uint64_t height, const crypto::hash& scr_seed)
{
crypto::hash res_hash = null_hash;
if (scr_seed != m_seed)
if (scr_seed != m_seed || get_scratchpad_size_for_height(height) != this->size())
{
bool r = generate(scr_seed, height);
CHECK_AND_ASSERT_THROW_MES(r, "Unable to generate scratchpad");

2
src/gui/qt-daemon/application/mainwindow.cpp
View file

@ -568,7 +568,7 @@ QString MainWindow::start_backend(const QString& params)
return MAKE_RESPONSE(ar);
}
}
bool r = m_backend.start();
if (!r)
{