oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

Log db exception, fix relation operators for vote/deregister lifetime (#207)

Browse source
This commit is contained in:
Doyle 2018-09-04 19:17:17 +10:00 committed by GitHub
parent a0e8229928
commit 7a39586536
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View file

@ -3071,7 +3071,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
}
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
<< " and service node: " << deregister.service_node_index

2
src/cryptonote_core/cryptonote_core.cpp
View file

@ -1706,7 +1706,7 @@ namespace cryptonote
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;
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
<< " and service node: " << vote.service_node_index

8
src/cryptonote_core/tx_pool.cpp
View file

@ -1014,7 +1014,7 @@ namespace cryptonote
// Check if deregister is too old and we should stop relaying it.
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;
updated_meta.do_not_relay = true;
@ -1061,7 +1061,7 @@ namespace cryptonote
// Check if deregister became valid again
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;
updated_meta.do_not_relay = false;
@ -1089,9 +1089,9 @@ namespace cryptonote
m_txpool_size -= bd.size();
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());
}
}