oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

keep add block and pop block for batching database in sync with service node list

This commit is contained in:
Sean Darcy 2022-06-20 15:53:12 +10:00
parent d826fbee03
commit fa88a104d4
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cryptonote_core/blockchain.cpp
View File

@ -710,7 +710,6 @@ void Blockchain::pop_blocks(uint64_t nblocks)
MGINFO("... popping blocks " << (++progress * PERCENT_PER_PROGRESS_UPDATE) << "% completed, height: " << (blockchain_height - i) << " (" << timer.seconds() << "s)");
timer.reset();
}
pop_block_from_blockchain();
}
}

15
src/cryptonote_core/service_node_list.cpp
View File

@ -1715,10 +1715,25 @@ namespace service_nodes
bool service_node_list::process_batching_rewards(const cryptonote::block& block)
{
uint64_t block_height = cryptonote::get_block_height(block);
if (m_blockchain.nettype() != cryptonote::network_type::FAKECHAIN && block.major_version >= hf::hf19_reward_batching && height() != block_height)
{
MERROR("Service node list out of sync with the batching database, adding block will fail because the service node list is at height: " << height() << " and the batching database is at height: " << m_blockchain.sqlite_db()->height+1);
return false;
}
return m_blockchain.sqlite_db()->add_block(block, m_state);
}
bool service_node_list::pop_batching_rewards_block(const cryptonote::block& block)
{
bool reinitialise = false;
uint64_t block_height = cryptonote::get_block_height(block);
if (m_blockchain.nettype() != cryptonote::network_type::FAKECHAIN && block.major_version >= hf::hf19_reward_batching && height() != block_height)
{
if (auto it = m_transient.state_history.find(block_height); it != m_transient.state_history.end())
return m_blockchain.sqlite_db()->pop_block(block, *it);
m_blockchain.sqlite_db()->reset_database();
return false;
}
return m_blockchain.sqlite_db()->pop_block(block, m_state);
}