mirror of
https://github.com/oxen-io/oxen-core.git
synced 2023-12-14 02:22:56 +01:00
Log db exception, fix relation operators for vote/deregister lifetime (#207)
This commit is contained in:
parent
a0e8229928
commit
7a39586536
3 changed files with 6 additions and 6 deletions
|
@ -3071,7 +3071,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t delta_height = curr_height - deregister.block_height;
|
uint64_t delta_height = curr_height - deregister.block_height;
|
||||||
if (delta_height > loki::service_node_deregister::DEREGISTER_LIFETIME_BY_HEIGHT)
|
if (delta_height >= loki::service_node_deregister::DEREGISTER_LIFETIME_BY_HEIGHT)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L1("Received deregister tx for height: " << deregister.block_height
|
LOG_PRINT_L1("Received deregister tx for height: " << deregister.block_height
|
||||||
<< " and service node: " << deregister.service_node_index
|
<< " and service node: " << deregister.service_node_index
|
||||||
|
|
|
@ -1706,7 +1706,7 @@ namespace cryptonote
|
||||||
uint64_t latest_block_height = std::max(get_current_blockchain_height(), get_target_blockchain_height());
|
uint64_t latest_block_height = std::max(get_current_blockchain_height(), get_target_blockchain_height());
|
||||||
uint64_t delta_height = latest_block_height - vote.block_height;
|
uint64_t delta_height = latest_block_height - vote.block_height;
|
||||||
|
|
||||||
if (vote.block_height < latest_block_height && delta_height > loki::service_node_deregister::VOTE_LIFETIME_BY_HEIGHT)
|
if (vote.block_height < latest_block_height && delta_height >= loki::service_node_deregister::VOTE_LIFETIME_BY_HEIGHT)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L1("Received vote for height: " << vote.block_height
|
LOG_PRINT_L1("Received vote for height: " << vote.block_height
|
||||||
<< " and service node: " << vote.service_node_index
|
<< " and service node: " << vote.service_node_index
|
||||||
|
|
|
@ -1014,7 +1014,7 @@ namespace cryptonote
|
||||||
|
|
||||||
// Check if deregister is too old and we should stop relaying it.
|
// Check if deregister is too old and we should stop relaying it.
|
||||||
uint64_t delta_height = new_block_height - deregister.block_height;
|
uint64_t delta_height = new_block_height - deregister.block_height;
|
||||||
if (delta_height > loki::service_node_deregister::DEREGISTER_LIFETIME_BY_HEIGHT)
|
if (delta_height >= loki::service_node_deregister::DEREGISTER_LIFETIME_BY_HEIGHT)
|
||||||
{
|
{
|
||||||
txpool_tx_meta_t updated_meta = meta;
|
txpool_tx_meta_t updated_meta = meta;
|
||||||
updated_meta.do_not_relay = true;
|
updated_meta.do_not_relay = true;
|
||||||
|
@ -1061,7 +1061,7 @@ namespace cryptonote
|
||||||
|
|
||||||
// Check if deregister became valid again
|
// Check if deregister became valid again
|
||||||
uint64_t delta_height = new_block_height - deregister.block_height;
|
uint64_t delta_height = new_block_height - deregister.block_height;
|
||||||
if (delta_height <= loki::service_node_deregister::DEREGISTER_LIFETIME_BY_HEIGHT)
|
if (delta_height < loki::service_node_deregister::DEREGISTER_LIFETIME_BY_HEIGHT)
|
||||||
{
|
{
|
||||||
txpool_tx_meta_t updated_meta = meta;
|
txpool_tx_meta_t updated_meta = meta;
|
||||||
updated_meta.do_not_relay = false;
|
updated_meta.do_not_relay = false;
|
||||||
|
@ -1089,9 +1089,9 @@ namespace cryptonote
|
||||||
m_txpool_size -= bd.size();
|
m_txpool_size -= bd.size();
|
||||||
remove_transaction_keyimages(tx);
|
remove_transaction_keyimages(tx);
|
||||||
}
|
}
|
||||||
catch (const std::exception &e)
|
catch (const DB_EXCEPTION &e)
|
||||||
{
|
{
|
||||||
// ignore error, it doesn't exist anymore for whatever reason
|
MERROR("Failed to remove txid: " << txid << " from db: " << e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue