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

Fix some issues in z_sweepstatus

Browse Source
This commit is contained in:
Duke Leto
2022-08-27 13:57:00 -04:00
parent 4aedeb557b
commit 4eec81b191
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/rpcwallet.cpp
View File

@@ -3334,10 +3334,9 @@ UniValue z_sweepstatus(const UniValue& params, bool fHelp, const CPubKey& mypk)
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);
UniValue ret(UniValue::VOBJ); UniValue ret(UniValue::VOBJ);
auto amount_swept;
ret.push_back(Pair("zsweep", pwalletMain->fSweepEnabled)); ret.push_back(Pair("zsweep", pwalletMain->fSweepEnabled));
ret.push_back(Pair("running", pwalletMain->fSweepRunning)); ret.push_back(Pair("running", pwalletMain->fSweepRunning));
ret.push_back(Pair("amount_swept", amount_swept)); ret.push_back(Pair("amount_swept", pwalletMain->amountSwept));
if (pwalletMain->fConsolidationRunning) { if (pwalletMain->fConsolidationRunning) {
ret.push_back(Pair("next_zsweep", pwalletMain->sweepInterval + chainActive.Tip()->GetHeight())); ret.push_back(Pair("next_zsweep", pwalletMain->sweepInterval + chainActive.Tip()->GetHeight()));

2
src/wallet/wallet.h
View File

@@ -808,7 +808,9 @@ public:
bool fSweepExternalEnabled = false; bool fSweepExternalEnabled = false;
bool fSweepRunning = false; bool fSweepRunning = false;
int nextSweep = 0; int nextSweep = 0;
int amountSwept = 0;
int sweepInterval = 20; int sweepInterval = 20;
int sweepFee = 10000;
int sweepMaxInputs = 200; int sweepMaxInputs = 200;
std::string sweepAddress = ""; std::string sweepAddress = "";