From 9c5e5c550ccc803ff71b6c841c61c023e1961ef9 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 6 Sep 2022 09:20:53 -0400
Subject: [PATCH] Fix compile issues in z_consolidationstatus

---
 src/init.cpp                                          | 1 +
 src/wallet/asyncrpcoperation_saplingconsolidation.cpp | 1 -
 src/wallet/rpcwallet.cpp                              | 7 ++++---
 src/wallet/wallet.h                                   | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 2827a2bb9..ce03bd7fb 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2100,6 +2100,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             if (pwalletMain->fSaplingConsolidationEnabled) {
                 //Validate 1 Consolidation address only that matches the sweep address
                 vector<string>& vaddresses = mapMultiArgs["-consolidatesaplingaddress"];
+                pwalletMain->consolidationAddress = vaddresses[0];
                 if (vaddresses.size() == 0) {
                     fConsolidationMapUsed = true;
                     mapMultiArgs["-consolidatesaplingaddress"] = vSweep;
diff --git a/src/wallet/asyncrpcoperation_saplingconsolidation.cpp b/src/wallet/asyncrpcoperation_saplingconsolidation.cpp
index 5422e1715..f9f2ebe1e 100644
--- a/src/wallet/asyncrpcoperation_saplingconsolidation.cpp
+++ b/src/wallet/asyncrpcoperation_saplingconsolidation.cpp
@@ -108,7 +108,6 @@ bool AsyncRPCOperation_saplingconsolidation::main_impl() {
                 if (boost::get<libzcash::SaplingPaymentAddress>(&zAddress) != nullptr) {
                     libzcash::SaplingPaymentAddress saplingAddress = boost::get<libzcash::SaplingPaymentAddress>(zAddress);
                     addresses.insert(saplingAddress);
-                    consolidationAddress = zAddress;
                 } else {
                     LogPrintf("%s: Invalid zaddr, exiting\n", opid);
                     return false;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 749576178..745dc3ce4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3334,12 +3334,13 @@ UniValue z_consolidationstatus(const UniValue& params, bool fHelp, const CPubKey
       LOCK2(cs_main, pwalletMain->cs_wallet);
 
       UniValue ret(UniValue::VOBJ);
-      ret.push_back(Pair("consolidation", pwalletMain->fConsolidationEnabled));
+      ret.push_back(Pair("consolidation", pwalletMain->fSaplingConsolidationEnabled));
       ret.push_back(Pair("running", pwalletMain->fConsolidationRunning));
       ret.push_back(Pair("amount_consolidated", pwalletMain->amountConsolidated));
 
       if (pwalletMain->fConsolidationRunning) {
-          ret.push_back(Pair("next_consolidation", pwalletMain->consolidationInterval + chainActive.Tip()->GetHeight()));
+          // TODO: set a static consolidationInterval instead of it being non-deterministic
+          // ret.push_back(Pair("next_consolidation", pwalletMain->consolidationInterval + chainActive.Tip()->GetHeight()));
       } else {
           if (pwalletMain->nextConsolidation == 0) {
               ret.push_back(Pair("next_consolidation",  chainActive.Tip()->GetHeight() + 1));
@@ -3347,7 +3348,7 @@ UniValue z_consolidationstatus(const UniValue& params, bool fHelp, const CPubKey
               ret.push_back(Pair("next_consolidation", pwalletMain->nextConsolidation));
           }
       }
-      ret.push_back(Pair("consolidationinterval", pwalletMain->consolidationInterval));
+      // ret.push_back(Pair("consolidationinterval", pwalletMain->consolidationInterval));
       ret.push_back(Pair("consolidationaddress", pwalletMain->consolidationAddress));
       ret.push_back(Pair("consolidationtxfee",(int)fConsolidationTxFee));
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7bf0d446a..fdaee018b 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -809,6 +809,7 @@ public:
     bool fSweepRunning                = false;
     int nextSweep                     = 0;
     int amountSwept                   = 0;
+    int amountConsolidated            = 0;
     int sweepInterval                 = 20;
     int sweepFee                      = 10000;
     int sweepMaxInputs                = 200;