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

fingers crossed

Browse Source
This commit is contained in:
blackjok3r
2018-10-01 23:09:36 +08:00
parent 4bdd7e26cd
commit dfba8357f3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/rpcwallet.cpp
View File

@@ -4164,7 +4164,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
+ strprintf("%d", MERGE_TO_ADDRESS_DEFAULT_TRANSPARENT_LIMIT) + ") Limit on the maximum number of UTXOs to merge. Set to 0 to use node option -mempooltxinputlimit.\n" + strprintf("%d", MERGE_TO_ADDRESS_DEFAULT_TRANSPARENT_LIMIT) + ") Limit on the maximum number of UTXOs to merge. Set to 0 to use node option -mempooltxinputlimit.\n"
"4. shielded_limit (numeric, optional, default=" "4. shielded_limit (numeric, optional, default="
+ strprintf("%d", MERGE_TO_ADDRESS_DEFAULT_SHIELDED_LIMIT) + ") Limit on the maximum number of notes to merge. Set to 0 to merge as many as will fit in the transaction.\n" + strprintf("%d", MERGE_TO_ADDRESS_DEFAULT_SHIELDED_LIMIT) + ") Limit on the maximum number of notes to merge. Set to 0 to merge as many as will fit in the transaction.\n"
"5. maximum_utxo_size (int, optional) eg, 10000 anything under 10000 satoshies will be merged.\n" "5. maximum_utxo_size (numeric, optional) eg, 0.0001 anything under 10000 satoshies will be merged.\n"
"6. \"memo\" (string, optional) Encoded as hex. When toaddress is a z-addr, this will be stored in the memo field of the new note.\n" "6. \"memo\" (string, optional) Encoded as hex. When toaddress is a z-addr, this will be stored in the memo field of the new note.\n"
"\nResult:\n" "\nResult:\n"
@@ -4289,7 +4289,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
maximum_utxo_size = AmountFromValue( params[5] ); maximum_utxo_size = AmountFromValue( params[5] );
printf("maximum utxo size = %ld\n", maximum_utxo_size); printf("maximum utxo size = %ld\n", maximum_utxo_size);
if (maximum_utxo_size < 10) { if (maximum_utxo_size < 10) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Maximum size must be bigger than 10 satoshies."); throw JSONRPCError(RPC_INVALID_PARAMETER, "Maximum size must be bigger than 0.00000010.");
} }
} else { } else {
maximum_utxo_size = 0; maximum_utxo_size = 0;
@@ -4358,7 +4358,12 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
if (maximum_utxo_size != 0) { if (maximum_utxo_size != 0) {
printf("maximum utxo size = %ld \n", maximum_utxo_size); printf("maximum utxo size = %ld \n", maximum_utxo_size);
printf("nValue = %ld\n", nValue); if (nValue > maximum_utxo_size) {
printf("nValue = %ld which is over maximum size so we will ignore it!\n", nValue);
continue;
} else {
printf("utxo found under maximum size so we will add it!\n", );
}
} }
if (!maxedOutUTXOsFlag) { if (!maxedOutUTXOsFlag) {