Auto merge of #1620 - bitcartel:1616_z_sendmany_need_0_message_bug, r=bitcartel
Fix incorrect error message in z_sendmany Fixes one of the problems in #1616.
This commit is contained in:
commit
a1f81867f0
|
@ -196,12 +196,15 @@ bool AsyncRPCOperation_sendmany::main_impl() {
|
||||||
CAmount sendAmount = z_outputs_total + t_outputs_total;
|
CAmount sendAmount = z_outputs_total + t_outputs_total;
|
||||||
CAmount targetAmount = sendAmount + minersFee;
|
CAmount targetAmount = sendAmount + minersFee;
|
||||||
|
|
||||||
|
assert(!isfromtaddr_ || z_inputs_total == 0);
|
||||||
|
assert(!isfromzaddr_ || t_inputs_total == 0);
|
||||||
|
|
||||||
if (isfromtaddr_ && (t_inputs_total < targetAmount)) {
|
if (isfromtaddr_ && (t_inputs_total < targetAmount)) {
|
||||||
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strprintf("Insufficient transparent funds, have %ld, need %ld plus fee %ld", t_inputs_total, t_outputs_total, minersFee));
|
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strprintf("Insufficient transparent funds, have %ld, need %ld", t_inputs_total, targetAmount));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isfromzaddr_ && (z_inputs_total < targetAmount)) {
|
if (isfromzaddr_ && (z_inputs_total < targetAmount)) {
|
||||||
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strprintf("Insufficient protected funds, have %ld, need %ld plus fee %ld", z_inputs_total, z_outputs_total, minersFee));
|
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strprintf("Insufficient protected funds, have %ld, need %ld", z_inputs_total, targetAmount));
|
||||||
}
|
}
|
||||||
|
|
||||||
// If from address is a taddr, select UTXOs to spend
|
// If from address is a taddr, select UTXOs to spend
|
||||||
|
|
Loading…
Reference in New Issue