Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

txpool: Don't bail out when blob_size == tx_size_limit 

Previously, when blob_size == tx_size_limit, the "m_too_big" property was set
and the transaction was rejected. This should not have been the case.
This commit is contained in:
Leon Klingele 2018-01-30 16:16:54 +01:00
parent ef91d6e61e
commit 7c1a607c40
No known key found for this signature in database
GPG Key ID: 83AEC0FEBAA5D483
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_core/tx_pool.cpp
View File

@ -181,7 +181,7 @@ namespace cryptonote
} }
size_t tx_size_limit = get_transaction_size_limit(version); size_t tx_size_limit = get_transaction_size_limit(version);
if (!kept_by_block && blob_size >= tx_size_limit) if (!kept_by_block && blob_size > tx_size_limit)
{ {
LOG_PRINT_L1("transaction is too big: " << blob_size << " bytes, maximum size: " << tx_size_limit); LOG_PRINT_L1("transaction is too big: " << blob_size << " bytes, maximum size: " << tx_size_limit);
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;
@ -1207,7 +1207,7 @@ namespace cryptonote
m_txpool_size = 0; m_txpool_size = 0;
m_blockchain.for_all_txpool_txes([this, &remove, tx_size_limit](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) { m_blockchain.for_all_txpool_txes([this, &remove, tx_size_limit](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata*) {
m_txpool_size += meta.blob_size; m_txpool_size += meta.blob_size;
if (meta.blob_size >= tx_size_limit) { if (meta.blob_size > tx_size_limit) {
LOG_PRINT_L1("Transaction " << txid << " is too big (" << meta.blob_size << " bytes), removing it from pool"); LOG_PRINT_L1("Transaction " << txid << " is too big (" << meta.blob_size << " bytes), removing it from pool");
remove.insert(txid); remove.insert(txid);
} }