Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 11:59:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disable legacy fees for now

Browse Source
This commit is contained in:
iamsmooth 2014-11-11 02:03:00 +00:00
parent cc74b43651
commit dde7897fd4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_config.h
View File

@ -60,7 +60,7 @@
#define FEE_PER_KB ((uint64_t)10000000000) // pow(10, 10) #define FEE_PER_KB ((uint64_t)10000000000) // pow(10, 10)
// temporarily to allow backward compatibility during the switch to per-kb // 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 #define ORPHANED_BLOCKS_MAX_COUNT 100

2
src/cryptonote_core/tx_pool.cpp
View File

@ -89,7 +89,7 @@ namespace cryptonote
uint64_t needed_fee = blob_size / 1024; uint64_t needed_fee = blob_size / 1024;
needed_fee += (blob_size % 1024) ? 1 : 0; needed_fee += (blob_size % 1024) ? 1 : 0;
needed_fee *= FEE_PER_KB; 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)); LOG_PRINT_L1("transaction fee is not enough: " << print_money(fee) << ", minumim fee: " << print_money(needed_fee));
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;