From cc74b43651710fd37284b0c33e6c5423e5ab8537 Mon Sep 17 00:00:00 2001 From: iamsmooth Date: Sun, 9 Nov 2014 10:53:29 +0000 Subject: 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 --- src/cryptonote_core/tx_pool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cryptonote_core/tx_pool.cpp') diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index f623037ee..1a57a2b5e 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; -- cgit v1.2.3 From dde7897fd47063275063452cc1a425c6856f6739 Mon Sep 17 00:00:00 2001 From: iamsmooth Date: Tue, 11 Nov 2014 02:03:00 +0000 Subject: Disable legacy fees for now --- src/cryptonote_config.h | 2 +- src/cryptonote_core/tx_pool.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cryptonote_core/tx_pool.cpp') diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 5e58aa757..7864b974e 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -60,7 +60,7 @@ #define FEE_PER_KB ((uint64_t)10000000000) // pow(10, 10) // temporarily to allow backward compatibility during the switch to per-kb -#define MINING_ALLOWED_LEGACY_FEE ((uint64_t)100000000000) // pow(10, 11) +//#define MINING_ALLOWED_LEGACY_FEE ((uint64_t)100000000000) // pow(10, 11) #define ORPHANED_BLOCKS_MAX_COUNT 100 diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 1a57a2b5e..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 && fee < MINING_ALLOWED_LEGACY_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; -- cgit v1.2.3