aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-09-14 12:56:01 +0200
committerRiccardo Spagni <ric@spagni.net>2018-09-14 12:56:01 +0200
commit3584a852a3d98dd82c24d4b1c41126c8b791f780 (patch)
treeaa6dacaf71564d215e029e71fbdc5e9e80fa7cf1 /src
parentMerge pull request #4253 (diff)
parenttx_pool: make the max tx size a consensus rule from v8 (diff)
downloadmonero-3584a852a3d98dd82c24d4b1c41126c8b791f780.tar.xz
Merge pull request #4372
1660b0e7 tx_pool: make the max tx size a consensus rule from v8 (moneromooo-monero)
Diffstat (limited to 'src')
-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;