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

Merge remote-tracking branch 'origin/dev' into jahway603

Browse Source
This commit is contained in:
jahway603
2022-11-12 08:58:24 -05:00
parent 337d6d1e4f fcfe09d196
commit eb82ae0b3f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/init.cpp
View File

@@ -2042,7 +2042,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
} }
pwalletMain->consolidationInterval = consolidationInterval; pwalletMain->consolidationInterval = consolidationInterval;
pwalletMain->nextConsolidation = pwalletMain->consolidationInterval + chainActive.Tip()->GetHeight(); pwalletMain->nextConsolidation = pwalletMain->consolidationInterval + chainActive.Height();
LogPrintf("%s: set nextConsolidation=%d\n", __func__, pwalletMain->nextConsolidation ); LogPrintf("%s: set nextConsolidation=%d\n", __func__, pwalletMain->nextConsolidation );
//Validate Sapling Addresses //Validate Sapling Addresses
@@ -2066,7 +2066,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
sweepInterval = 10; sweepInterval = 10;
} }
pwalletMain->sweepInterval = sweepInterval; pwalletMain->sweepInterval = sweepInterval;
pwalletMain->nextSweep = pwalletMain->sweepInterval + chainActive.Tip()->GetHeight(); pwalletMain->nextSweep = pwalletMain->sweepInterval + chainActive.Height();
LogPrintf("%s: set nextSweep=%d with sweepInterval=%d\n", __func__, pwalletMain->nextSweep, pwalletMain->sweepInterval ); LogPrintf("%s: set nextSweep=%d with sweepInterval=%d\n", __func__, pwalletMain->nextSweep, pwalletMain->sweepInterval );
fSweepTxFee = GetArg("-zsweepfee", DEFAULT_SWEEP_FEE); fSweepTxFee = GetArg("-zsweepfee", DEFAULT_SWEEP_FEE);
fSweepMapUsed = !mapMultiArgs["-zsweepaddress"].empty(); fSweepMapUsed = !mapMultiArgs["-zsweepaddress"].empty();