Disable legacy fees for now

monero-project · Nov 11, 2014 · dde7897 · dde7897
1 parent cc74b43
commit dde7897
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;