mirror of
https://github.com/monero-project/monero.git
synced 2024-12-23 12:09:54 +00:00
blockchain: add --reorg-notify
This will trigger if a reorg is seen. This may be used to do things like stop automated withdrawals on large reorgs. %s is replaced by the height at the split point %h is replaced by the height of the new chain %n is replaced by the number of new blocks after the reorg
This commit is contained in:
parent
1168e8d5d5
commit
7d2f817f5e
3 changed files with 32 additions and 1 deletions
|
@ -1043,6 +1043,11 @@ bool Blockchain::switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::
|
||||||
|
|
||||||
m_hardfork->reorganize_from_chain_height(split_height);
|
m_hardfork->reorganize_from_chain_height(split_height);
|
||||||
|
|
||||||
|
std::shared_ptr<tools::Notify> reorg_notify = m_reorg_notify;
|
||||||
|
if (reorg_notify)
|
||||||
|
reorg_notify->notify("%s", std::to_string(split_height).c_str(), "%h", std::to_string(m_db->height()).c_str(),
|
||||||
|
"%n", std::to_string(m_db->height() - split_height).c_str(), NULL);
|
||||||
|
|
||||||
MGINFO_GREEN("REORGANIZE SUCCESS! on height: " << split_height << ", new blockchain size: " << m_db->height());
|
MGINFO_GREEN("REORGANIZE SUCCESS! on height: " << split_height << ", new blockchain size: " << m_db->height());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -718,10 +718,17 @@ namespace cryptonote
|
||||||
/**
|
/**
|
||||||
* @brief sets a block notify object to call for every new block
|
* @brief sets a block notify object to call for every new block
|
||||||
*
|
*
|
||||||
* @param notify the notify object to cal at every new block
|
* @param notify the notify object to call at every new block
|
||||||
*/
|
*/
|
||||||
void set_block_notify(const std::shared_ptr<tools::Notify> ¬ify) { m_block_notify = notify; }
|
void set_block_notify(const std::shared_ptr<tools::Notify> ¬ify) { m_block_notify = notify; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief sets a reorg notify object to call for every reorg
|
||||||
|
*
|
||||||
|
* @param notify the notify object to call at every reorg
|
||||||
|
*/
|
||||||
|
void set_reorg_notify(const std::shared_ptr<tools::Notify> ¬ify) { m_reorg_notify = notify; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Put DB in safe sync mode
|
* @brief Put DB in safe sync mode
|
||||||
*/
|
*/
|
||||||
|
@ -1059,6 +1066,7 @@ namespace cryptonote
|
||||||
bool m_btc_valid;
|
bool m_btc_valid;
|
||||||
|
|
||||||
std::shared_ptr<tools::Notify> m_block_notify;
|
std::shared_ptr<tools::Notify> m_block_notify;
|
||||||
|
std::shared_ptr<tools::Notify> m_reorg_notify;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief collects the keys for all outputs being "spent" as an input
|
* @brief collects the keys for all outputs being "spent" as an input
|
||||||
|
|
|
@ -173,6 +173,13 @@ namespace cryptonote
|
||||||
, "Run a program for each new block, '%s' will be replaced by the block hash"
|
, "Run a program for each new block, '%s' will be replaced by the block hash"
|
||||||
, ""
|
, ""
|
||||||
};
|
};
|
||||||
|
static const command_line::arg_descriptor<std::string> arg_reorg_notify = {
|
||||||
|
"reorg-notify"
|
||||||
|
, "Run a program for each reorg, '%s' will be replaced by the split height, "
|
||||||
|
"'%h' will be replaced by the new blockchain height, and '%n' will be "
|
||||||
|
"replaced by the number of new blocks in the new chain"
|
||||||
|
, ""
|
||||||
|
};
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------------
|
||||||
core::core(i_cryptonote_protocol* pprotocol):
|
core::core(i_cryptonote_protocol* pprotocol):
|
||||||
|
@ -283,6 +290,7 @@ namespace cryptonote
|
||||||
command_line::add_arg(desc, arg_disable_dns_checkpoints);
|
command_line::add_arg(desc, arg_disable_dns_checkpoints);
|
||||||
command_line::add_arg(desc, arg_max_txpool_weight);
|
command_line::add_arg(desc, arg_max_txpool_weight);
|
||||||
command_line::add_arg(desc, arg_block_notify);
|
command_line::add_arg(desc, arg_block_notify);
|
||||||
|
command_line::add_arg(desc, arg_reorg_notify);
|
||||||
|
|
||||||
miner::init_options(desc);
|
miner::init_options(desc);
|
||||||
BlockchainDB::init_options(desc);
|
BlockchainDB::init_options(desc);
|
||||||
|
@ -562,6 +570,16 @@ namespace cryptonote
|
||||||
MERROR("Failed to parse block notify spec");
|
MERROR("Failed to parse block notify spec");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!command_line::is_arg_defaulted(vm, arg_reorg_notify))
|
||||||
|
m_blockchain_storage.set_reorg_notify(std::shared_ptr<tools::Notify>(new tools::Notify(command_line::get_arg(vm, arg_reorg_notify).c_str())));
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
MERROR("Failed to parse reorg notify spec");
|
||||||
|
}
|
||||||
|
|
||||||
const std::pair<uint8_t, uint64_t> regtest_hard_forks[3] = {std::make_pair(1, 0), std::make_pair(Blockchain::get_hard_fork_heights(MAINNET).back().version, 1), std::make_pair(0, 0)};
|
const std::pair<uint8_t, uint64_t> regtest_hard_forks[3] = {std::make_pair(1, 0), std::make_pair(Blockchain::get_hard_fork_heights(MAINNET).back().version, 1), std::make_pair(0, 0)};
|
||||||
const cryptonote::test_options regtest_test_options = {
|
const cryptonote::test_options regtest_test_options = {
|
||||||
regtest_hard_forks,
|
regtest_hard_forks,
|
||||||
|
|
Loading…
Reference in a new issue