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

Add more logging for consolidation + sweeping

Browse Source
This commit is contained in:
Duke Leto
2022-09-10 19:38:08 -04:00
parent 1259dd512d
commit 772160af6d
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/asyncrpcoperation_saplingconsolidation.cpp
View File

@@ -50,7 +50,7 @@ void AsyncRPCOperation_saplingconsolidation::main() {
set_error_code(code);
set_error_message(message);
} catch (const runtime_error& e) {
std::cerr << boost::stacktrace::stacktrace() << '\n';
std::cerr << "Consolidation stacktrace:" << '\n' << boost::stacktrace::stacktrace() << '\n';
set_error_code(-1);
set_error_code(-1);
set_error_message("runtime error: " + string(e.what()));
@@ -73,7 +73,7 @@ void AsyncRPCOperation_saplingconsolidation::main() {
set_state(OperationStatus::FAILED);
}
std::string s = strprintf("%s: Sapling Consolidation transaction created. (status=%s", getId(), getStateAsString());
std::string s = strprintf("%s: Sapling Consolidation operation complete. (status=%s", getId(), getStateAsString());
if (success) {
s += strprintf(", success)\n");
} else {

13
src/wallet/wallet.cpp
View File

@@ -515,13 +515,14 @@ void CWallet::RunSaplingSweep(int blockHeight) {
return;
}
LogPrintf("%s: Sweep enabled at blockHeight=%d nextSweep=%d\n", __func__, blockHeight, nextSweep);
if (nextSweep > blockHeight) {
return;
}
//Don't Run if consolidation will run soon.
if (fSaplingConsolidationEnabled && nextConsolidation - 5 <= blockHeight) {
LogPrintf("%s: not consolidating since next sweep is within 5 blocks\n", __func__);
LogPrintf("%s: not sweeping since next consolidation is within 5 blocks, nextConsolidation=%d , blockHeight=%d\n", __func__, nextConsolidation, blockHeight);
return;
}
@@ -545,9 +546,10 @@ void CWallet::RunSaplingSweep(int blockHeight) {
}
void CWallet::RunSaplingConsolidation(int blockHeight) {
if (!NetworkUpgradeActive(blockHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) {
return;
}
// Sapling is always active on HUSH+HSCs
//if (!NetworkUpgradeActive(blockHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) {
// return;
//}
LOCK(cs_wallet);
@@ -555,6 +557,8 @@ void CWallet::RunSaplingConsolidation(int blockHeight) {
return;
}
LogPrintf("%s: consolidation enabled at blockHeight=%d fSweepRunning=%d\n", __func__, blockHeight, fSweepRunning );
if (fSweepRunning) {
return;
}
@@ -565,6 +569,7 @@ void CWallet::RunSaplingConsolidation(int blockHeight) {
fprintf(stderr,"%s: height=%d interval=%d\n", __func__, blockHeight, consolidateInterval);
if (blockHeight % consolidateInterval == 0) {
LogPrintf("%s: creating consolidation operation at blockHeight=%d\n", __func__, blockHeight);
std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
std::shared_ptr<AsyncRPCOperation> lastOperation = q->getOperationForId(saplingConsolidationOperationId);
if (lastOperation != nullptr) {