Permalink
Browse files

blockchain: do not try to add pruned txes back to the tpool

  • Loading branch information...
moneromooo-monero committed Jan 1, 2019
1 parent 3d80f61 commit 04e83ffea1fad63e7b0f6f7da45f9ebbe1592351
Showing with 8 additions and 0 deletions.
  1. +8 −0 src/cryptonote_core/blockchain.cpp
@@ -640,8 +640,14 @@ block Blockchain::pop_block_from_blockchain()
}

// return transactions from popped block to the tx_pool
size_t pruned = 0;
for (transaction& tx : popped_txs)
{
if (tx.pruned)
{
++pruned;
continue;
}
if (!is_coinbase(tx))
{
cryptonote::tx_verification_context tvc = AUTO_VAL_INIT(tvc);
@@ -668,6 +674,8 @@ block Blockchain::pop_block_from_blockchain()
}
}
}
if (pruned)
MWARNING(pruned << " pruned txes could not be added back to the txpool");

m_blocks_longhash_table.clear();
m_scan_table.clear();

0 comments on commit 04e83ff

Please sign in to comment.