diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-11-26 22:45:39 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-11-26 22:45:44 +0200 |
| commit | 40971b4ee61944fa9d010d65a45df1b8096c43f7 (patch) | |
| tree | 1a45998e33d7914eba009bddb4446529e33503e5 /src/cryptonote_core/tx_pool.cpp | |
| parent | Merge pull request #180 (diff) | |
| parent | Disable legacy fees for now (diff) | |
| download | monero-40971b4ee61944fa9d010d65a45df1b8096c43f7.tar.xz | |
Merge pull request #188
dde7897 Disable legacy fees for now (iamsmooth)
cc74b43 Remove DEFAULT_FEE, add temporary acceptance of too-small per-kb fee >= 0.1, denominations based on DEFAULT_DUST_THRESHOLD, document fee arg to create_transactions as unused, se DEFAULT_DUST_THRESHOLD for wallet dust collection instead of calcualted tx fee (iamsmooth)
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index f623037ee..96c6ebed9 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -89,7 +89,7 @@ namespace cryptonote uint64_t needed_fee = blob_size / 1024; needed_fee += (blob_size % 1024) ? 1 : 0; needed_fee *= FEE_PER_KB; - if (!kept_by_block && fee < needed_fee) + if (!kept_by_block && fee < needed_fee /*&& fee < MINING_ALLOWED_LEGACY_FEE*/) { LOG_PRINT_L1("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(needed_fee)); tvc.m_verifivation_failed = true; |