diff options
| author | Thomas Winget <tewinget@gmail.com> | 2014-10-02 16:44:55 -0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-11-06 22:09:07 -0700 |
| commit | 557e27fd2150953ce175ec123013faddcabcccde (patch) | |
| tree | a89402f98540f93b7038294c5ad896d5033ecd6a /src/crypto | |
| parent | Merge pull request #182 (diff) | |
| download | monero-557e27fd2150953ce175ec123013faddcabcccde.tar.xz | |
per kb fees
Diffstat (limited to '')
| -rw-r--r-- | src/cryptonote_config.h | 1 | ||||
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 1ac8ab328..fd52f2e87 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -57,6 +57,7 @@ // COIN - number of smallest units in one coin #define COIN ((uint64_t)1000000000000) // pow(10, 12) #define DEFAULT_FEE ((uint64_t)100000000000) // 5 * pow(10, 11) +#define FEE_PER_KB ((uint64_t)10000000000) // pow(10, 10) #define ORPHANED_BLOCKS_MAX_COUNT 100 diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 81f932014..f623037ee 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -86,9 +86,12 @@ namespace cryptonote } uint64_t fee = inputs_amount - outputs_amount; - if (!kept_by_block && fee < DEFAULT_FEE) + 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) { - LOG_PRINT_L1("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(DEFAULT_FEE)); + LOG_PRINT_L1("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(needed_fee)); tvc.m_verifivation_failed = true; return false; } |