DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix

Browse Source
This commit is contained in:
blackjok3r
2018-12-20 23:58:26 +08:00
parent 5a09ff96c5
commit 2a60644323
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/rpcwallet.cpp
View File

@@ -4878,6 +4878,8 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
continue; continue;
} }
CAmount nValue = out.tx->vout[out.i].nValue;
if (maximum_utxo_size != 0) { if (maximum_utxo_size != 0) {
if (nValue > maximum_utxo_size) { if (nValue > maximum_utxo_size) {
continue; continue;
@@ -4936,7 +4938,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
// Find unspent notes and update estimated size // Find unspent notes and update estimated size
for (const CSproutNotePlaintextEntry& entry : sproutEntries) { for (const CSproutNotePlaintextEntry& entry : sproutEntries) {
noteCounter++; noteCounter++;
CAmount nValue = entry.plaintext.value(); nValue = entry.plaintext.value();
if (!maxedOutNotesFlag) { if (!maxedOutNotesFlag) {
// If we haven't added any notes yet and the merge is to a // If we haven't added any notes yet and the merge is to a
@@ -4963,7 +4965,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
for (const SaplingNoteEntry& entry : saplingEntries) { for (const SaplingNoteEntry& entry : saplingEntries) {
noteCounter++; noteCounter++;
CAmount nValue = entry.note.value(); nValue = entry.note.value();
if (!maxedOutNotesFlag) { if (!maxedOutNotesFlag) {
size_t increase = SPENDDESCRIPTION_SIZE; size_t increase = SPENDDESCRIPTION_SIZE;
if (estimatedTxSize + increase >= max_tx_size || if (estimatedTxSize + increase >= max_tx_size ||