diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-08 22:33:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-08 22:33:13 +0200 |
| commit | 0fa6cbef3fa19ea2b187d18941b28a98b4c7a9ab (patch) | |
| tree | 5d5f81d69f559f124441fc3f0b36d2e839200921 /src/cryptonote_core/tx_pool.cpp | |
| parent | 1372f255af12564d41d8a9bbe247ce7b0fda78be (diff) | |
| parent | 18f66f44ef1df99f972e7c48dee4d4e9e5d0ca7e (diff) | |
| download | monzero-core-0fa6cbef3fa19ea2b187d18941b28a98b4c7a9ab.tar.gz monzero-core-0fa6cbef3fa19ea2b187d18941b28a98b4c7a9ab.tar.xz monzero-core-0fa6cbef3fa19ea2b187d18941b28a98b4c7a9ab.zip | |
Merge pull request #1276
18f66f4 wallet: use the dynamic per kB fee (moneromooo-monero)
e6deb8a rpc: add a dynamic fee estimation RPC call (moneromooo-monero)
82dbba1 core: dynamic fee algorithm from ArticMine (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index dba05a539..e72a592ca 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -133,12 +133,8 @@ namespace cryptonote fee = tx.rct_signatures.txnFee; } - 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 && !m_blockchain.check_fee(blob_size, fee)) { - LOG_PRINT_L1("transaction fee is not enough: " << print_money(fee) << ", minimum fee: " << print_money(needed_fee)); tvc.m_verifivation_failed = true; tvc.m_fee_too_low = true; return false; |