From 9b0d9865285ed02b812d43580b6d5609ff060d12 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 27 Feb 2020 18:20:14 -0500 Subject: [PATCH] Document default of -consolidation and add comment about number of zouts --- src/init.cpp | 2 +- src/wallet/asyncrpcoperation_saplingconsolidation.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index 9d10e9d4a..ce5dfb5a6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -448,7 +448,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageGroup(_("Wallet options:")); strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls")); strUsage += HelpMessageOpt("-keypool=", strprintf(_("Set key pool size to (default: %u)"), 100)); - strUsage += HelpMessageOpt("-consolidation", _("Enable auto Sapling note consolidation")); + strUsage += HelpMessageOpt("-consolidation", _("Enable auto Sapling note consolidation (default: false)")); strUsage += HelpMessageOpt("-consolidatesaplingaddress=", _("Specify Sapling Address to Consolidate. (default: all)")); strUsage += HelpMessageOpt("-consolidationtxfee", strprintf(_("Fee amount in Puposhis used send consolidation transactions. (default %i)"), DEFAULT_CONSOLIDATION_FEE)); strUsage += HelpMessageOpt("-deletetx", _("Enable Old Transaction Deletion")); diff --git a/src/wallet/asyncrpcoperation_saplingconsolidation.cpp b/src/wallet/asyncrpcoperation_saplingconsolidation.cpp index 9152f0d8c..26809f2b8 100644 --- a/src/wallet/asyncrpcoperation_saplingconsolidation.cpp +++ b/src/wallet/asyncrpcoperation_saplingconsolidation.cpp @@ -167,6 +167,10 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() { } builder.SetFee(fConsolidationTxFee); + + //TODO: we want at least 2 zouts and potentially Sietch + // We could split funds into 2 parts and send as 2 zouts + // or add amount=0 sietch zaddrs builder.AddSaplingOutput(extsk.expsk.ovk, addr, amountToSend - fConsolidationTxFee); //CTransaction tx = builder.Build();