Browse Source

Do not add to amountConsolidated until we successfully create the tx and only do it once

pull/195/head
Duke Leto 2 years ago
parent
commit
57baf25b02
  1. 3
      src/wallet/asyncrpcoperation_saplingconsolidation.cpp

3
src/wallet/asyncrpcoperation_saplingconsolidation.cpp

@ -157,7 +157,6 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
if (fromNotes.size() < minQuantity)
continue;
amountConsolidated += amountToSend;
auto builder = TransactionBuilder(consensusParams, targetHeight_, pwalletMain);
builder.SetExpiryHeight(targetHeight_ + CONSOLIDATION_EXPIRY_DELTA);
auto actualAmountToSend = amountToSend < fConsolidationTxFee ? 0 : amountToSend - fConsolidationTxFee;
@ -219,8 +218,6 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
}
}
LogPrint("zrpcunsafe", "%s: Done adding %d sietch zouts\n", opid, MIN_ZOUTS);
//CTransaction tx = builder.Build();
auto maybe_tx = builder.Build();
if (!maybe_tx) {
LogPrintf("%s: Failed to build transaction.\n",opid);

Loading…
Cancel
Save