aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-09-13 09:01:05 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-09-13 09:43:29 +0000
commit1660b0e72c3facac887ab4ccc38a4c87851364c2 (patch)
tree7b21ed3eb7c6c039b73e5c04ab8df7ea80493c7d /src/cryptonote_core
parentMerge pull request #4219 (diff)
downloadmonero-1660b0e72c3facac887ab4ccc38a4c87851364c2.tar.xz
tx_pool: make the max tx size a consensus rule from v8
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/tx_pool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index b12a329bb..a725eac6e 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -185,7 +185,7 @@ namespace cryptonote
}
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);
tvc.m_verifivation_failed = true;