Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wallet overflow - finalization #94

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/cryptonote_basic/cryptonote_basic_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -108,7 +109,6 @@ namespace cryptonote {

if (current_block_weight <= median_weight) {
reward = base_reward;
reward = HAVEN_MAX_TX_VALUE;
return true;
}

Expand All @@ -132,7 +132,6 @@ namespace cryptonote {
assert(reward_lo < base_reward);

reward = reward_lo;
reward = HAVEN_MAX_TX_VALUE;
return true;
}
//------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions src/cryptonote_core/blockchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading