nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2764

Browse Source 
37c3792b wallet2 bugfix: supply missing subaddr_account arg to balance() and unlocked balance() (stoffu)
This commit is contained in:
Riccardo Spagni 2017-11-07 19:14:40 +02:00
commit a2c2f4e4b0
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View File

@ -5479,10 +5479,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
// we could also check for being within FEE_PER_KB, but if the fee calculation // we could also check for being within FEE_PER_KB, but if the fee calculation
// ever changes, this might be missed, so let this go through // ever changes, this might be missed, so let this go through
// first check overall balance is enough, then unlocked one, so we throw distinct exceptions // first check overall balance is enough, then unlocked one, so we throw distinct exceptions
THROW_WALLET_EXCEPTION_IF(needed_money > balance(), error::not_enough_money, THROW_WALLET_EXCEPTION_IF(needed_money > balance(subaddr_account), error::not_enough_money,
unlocked_balance(), needed_money, 0); unlocked_balance(subaddr_account), needed_money, 0);
THROW_WALLET_EXCEPTION_IF(needed_money > unlocked_balance(), error::not_enough_unlocked_money, THROW_WALLET_EXCEPTION_IF(needed_money > unlocked_balance(subaddr_account), error::not_enough_unlocked_money,
unlocked_balance(), needed_money, 0); unlocked_balance(subaddr_account), needed_money, 0);
// shuffle & sort output indices // shuffle & sort output indices
{ {