Merge pull request #4372

1660b0e7 tx_pool: make the max tx size a consensus rule from v8 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-14 12:56:01 +02:00
commit 3584a852a3
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -185,7 +185,7 @@ namespace cryptonote
} }
size_t tx_weight_limit = get_transaction_weight_limit(version); size_t tx_weight_limit = get_transaction_weight_limit(version);
if (!kept_by_block && tx_weight > tx_weight_limit) if ((!kept_by_block || version >= HF_VERSION_PER_BYTE_FEE) && tx_weight > tx_weight_limit)
{ {
LOG_PRINT_L1("transaction is too heavy: " << tx_weight << " bytes, maximum weight: " << tx_weight_limit); LOG_PRINT_L1("transaction is too heavy: " << tx_weight << " bytes, maximum weight: " << tx_weight_limit);
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;