kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tx_pool: ensure txes loaded from poolstate.bin have their txid cached

Browse source 
The txid is not saved, and we want to make sure the transactions
have their txid cached while in the pool, since get_transactions
copies the transaction object, so any txid calculation on those
copies would not benefit any later caller, since the original tx
would be left without a cached txid.
This commit is contained in:
moneromooo-monero 2017-03-22 20:26:56 +00:00
parent aaeb164cf6
commit 91d4109023
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cryptonote_core/tx_pool.cpp
View file

@ -718,20 +718,21 @@ namespace cryptonote
size_t tx_size_limit = get_transaction_size_limit(version); size_t tx_size_limit = get_transaction_size_limit(version);
for (auto it = m_transactions.begin(); it != m_transactions.end(); ) { for (auto it = m_transactions.begin(); it != m_transactions.end(); ) {
bool remove = false; bool remove = false;
const crypto::hash &txid = get_transaction_hash(it->second.tx);
if (it->second.blob_size >= tx_size_limit) { if (it->second.blob_size >= tx_size_limit) {
LOG_PRINT_L1("Transaction " << it->first << " is too big (" << it->second.blob_size << " bytes), removing it from pool"); LOG_PRINT_L1("Transaction " << txid << " is too big (" << it->second.blob_size << " bytes), removing it from pool");
remove = true; remove = true;
} }
else if (m_blockchain.have_tx(it->first)) { else if (m_blockchain.have_tx(txid)) {
LOG_PRINT_L1("Transaction " << it->first << " is in the blockchain, removing it from pool"); LOG_PRINT_L1("Transaction " << txid << " is in the blockchain, removing it from pool");
remove = true; remove = true;
} }
if (remove) { if (remove) {
remove_transaction_keyimages(it->second.tx); remove_transaction_keyimages(it->second.tx);
auto sorted_it = find_tx_in_sorted_container(it->first); auto sorted_it = find_tx_in_sorted_container(txid);
if (sorted_it == m_txs_by_fee_and_receive_time.end()) if (sorted_it == m_txs_by_fee_and_receive_time.end())
{ {
LOG_PRINT_L1("Removing tx " << it->first << " from tx pool, but it was not found in the sorted txs container!"); LOG_PRINT_L1("Removing tx " << txid << " from tx pool, but it was not found in the sorted txs container!");
} }
else else
{ {