diff --git a/src/cryptonote_basic/cryptonote_basic_impl.cpp b/src/cryptonote_basic/cryptonote_basic_impl.cpp index 9fb76401a..8c9f48774 100644 --- a/src/cryptonote_basic/cryptonote_basic_impl.cpp +++ b/src/cryptonote_basic/cryptonote_basic_impl.cpp @@ -93,6 +93,7 @@ namespace cryptonote { return true; } #endif + uint64_t base_reward = (MONEY_SUPPLY - already_generated_coins) >> emission_speed_factor; if (base_reward < FINAL_SUBSIDY_PER_MINUTE*target_minutes) { @@ -108,7 +109,6 @@ namespace cryptonote { if (current_block_weight <= median_weight) { reward = base_reward; - reward = HAVEN_MAX_TX_VALUE; return true; } @@ -132,7 +132,6 @@ namespace cryptonote { assert(reward_lo < base_reward); reward = reward_lo; - reward = HAVEN_MAX_TX_VALUE; return true; } //------------------------------------------------------------------------------------ diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 518879b35..737e86bc1 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4753,8 +4753,8 @@ bool Blockchain::check_fee(size_t tx_weight, uint64_t fee, const offshore::prici if (fee < needed_fee - needed_fee / 50) // keep a little 2% buffer on acceptance - no integer overflow { - //MERROR_VER("transaction fee is not enough: " << print_money(fee) << ", minimum fee: " << print_money(needed_fee)); - //return false; + MERROR_VER("transaction fee is not enough: " << print_money(fee) << ", minimum fee: " << print_money(needed_fee)); + return false; } return true; }