Skip to content

Commit 1b602f6

Browse files
andrewtothandrewtoth
committed
remove extraneous scope
1 parent 6ad372a commit 1b602f6

File tree

1 file changed

+73
-75
lines changed

1 file changed

+73
-75
lines changed

‎src/wallet/wallet.cpp

Lines changed: 73 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,92 +1780,90 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
17801780

17811781
WalletLogPrintf("Rescan started from block %s...\n", start_block.ToString());
17821782

1783+
fAbortRescan = false;
1784+
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
1785+
uint256 tip_hash;
1786+
// The way the 'block_height' is initialized is just a workaround for the gcc bug #47679 since version 4.6.0.
1787+
Optional<int> block_height = MakeOptional(false, int());
1788+
double progress_begin;
1789+
double progress_end;
17831790
{
1784-
fAbortRescan = false;
1785-
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
1786-
uint256 tip_hash;
1787-
// The way the 'block_height' is initialized is just a workaround for the gcc bug #47679 since version 4.6.0.
1788-
Optional<int> block_height = MakeOptional(false, int());
1789-
double progress_begin;
1790-
double progress_end;
1791-
{
1792-
auto locked_chain = chain().lock();
1793-
if (Optional<int> tip_height = locked_chain->getHeight()) {
1794-
tip_hash = locked_chain->getBlockHash(*tip_height);
1795-
}
1796-
block_height = locked_chain->getBlockHeight(block_hash);
1797-
progress_begin = chain().guessVerificationProgress(block_hash);
1798-
progress_end = chain().guessVerificationProgress(stop_block.IsNull() ? tip_hash : stop_block);
1799-
}
1800-
double progress_current = progress_begin;
1801-
while (block_height && !fAbortRescan && !chain().shutdownRequested()) {
1802-
if (*block_height % 100 == 0 && progress_end - progress_begin > 0.0) {
1803-
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), std::max(1, std::min(99, (int)((progress_current - progress_begin) / (progress_end - progress_begin) * 100))));
1804-
}
1805-
if (GetTime() >= nNow + 60) {
1806-
nNow = GetTime();
1807-
WalletLogPrintf("Still rescanning. At block %d. Progress=%f\n", *block_height, progress_current);
1808-
}
1791+
auto locked_chain = chain().lock();
1792+
if (Optional<int> tip_height = locked_chain->getHeight()) {
1793+
tip_hash = locked_chain->getBlockHash(*tip_height);
1794+
}
1795+
block_height = locked_chain->getBlockHeight(block_hash);
1796+
progress_begin = chain().guessVerificationProgress(block_hash);
1797+
progress_end = chain().guessVerificationProgress(stop_block.IsNull() ? tip_hash : stop_block);
1798+
}
1799+
double progress_current = progress_begin;
1800+
while (block_height && !fAbortRescan && !chain().shutdownRequested()) {
1801+
if (*block_height % 100 == 0 && progress_end - progress_begin > 0.0) {
1802+
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), std::max(1, std::min(99, (int)((progress_current - progress_begin) / (progress_end - progress_begin) * 100))));
1803+
}
1804+
if (GetTime() >= nNow + 60) {
1805+
nNow = GetTime();
1806+
WalletLogPrintf("Still rescanning. At block %d. Progress=%f\n", *block_height, progress_current);
1807+
}
18091808

1810-
CBlock block;
1811-
if (chain().findBlock(block_hash, &block) && !block.IsNull()) {
1812-
auto locked_chain = chain().lock();
1813-
LOCK(cs_wallet);
1814-
if (!locked_chain->getBlockHeight(block_hash)) {
1815-
// Abort scan if current block is no longer active, to prevent
1816-
// marking transactions as coming from the wrong block.
1817-
// TODO: This should return success instead of failure, see
1818-
// https://github.com/bitcoin/bitcoin/pull/14711#issuecomment-458342518
1819-
result.last_failed_block = block_hash;
1820-
result.status = ScanResult::FAILURE;
1821-
break;
1822-
}
1823-
for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {
1824-
SyncTransaction(block.vtx[posInBlock], block_hash, posInBlock, fUpdate);
1825-
}
1826-
// scan succeeded, record block as most recent successfully scanned
1827-
result.last_scanned_block = block_hash;
1828-
result.last_scanned_height = *block_height;
1829-
} else {
1830-
// could not scan block, keep scanning but record this block as the most recent failure
1809+
CBlock block;
1810+
if (chain().findBlock(block_hash, &block) && !block.IsNull()) {
1811+
auto locked_chain = chain().lock();
1812+
LOCK(cs_wallet);
1813+
if (!locked_chain->getBlockHeight(block_hash)) {
1814+
// Abort scan if current block is no longer active, to prevent
1815+
// marking transactions as coming from the wrong block.
1816+
// TODO: This should return success instead of failure, see
1817+
// https://github.com/bitcoin/bitcoin/pull/14711#issuecomment-458342518
18311818
result.last_failed_block = block_hash;
18321819
result.status = ScanResult::FAILURE;
1820+
break;
1821+
}
1822+
for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {
1823+
SyncTransaction(block.vtx[posInBlock], block_hash, posInBlock, fUpdate);
18331824
}
1834-
if (block_hash == stop_block) {
1825+
// scan succeeded, record block as most recent successfully scanned
1826+
result.last_scanned_block = block_hash;
1827+
result.last_scanned_height = *block_height;
1828+
} else {
1829+
// could not scan block, keep scanning but record this block as the most recent failure
1830+
result.last_failed_block = block_hash;
1831+
result.status = ScanResult::FAILURE;
1832+
}
1833+
if (block_hash == stop_block) {
1834+
break;
1835+
}
1836+
{
1837+
auto locked_chain = chain().lock();
1838+
Optional<int> tip_height = locked_chain->getHeight();
1839+
if (!tip_height || *tip_height <= block_height || !locked_chain->getBlockHeight(block_hash)) {
1840+
// break successfully when rescan has reached the tip, or
1841+
// previous block is no longer on the chain due to a reorg
18351842
break;
18361843
}
1837-
{
1838-
auto locked_chain = chain().lock();
1839-
Optional<int> tip_height = locked_chain->getHeight();
1840-
if (!tip_height || *tip_height <= block_height || !locked_chain->getBlockHeight(block_hash)) {
1841-
// break successfully when rescan has reached the tip, or
1842-
// previous block is no longer on the chain due to a reorg
1843-
break;
1844-
}
18451844

1846-
// increment block and verification progress
1847-
block_hash = locked_chain->getBlockHash(++*block_height);
1848-
progress_current = chain().guessVerificationProgress(block_hash);
1845+
// increment block and verification progress
1846+
block_hash = locked_chain->getBlockHash(++*block_height);
1847+
progress_current = chain().guessVerificationProgress(block_hash);
18491848

1850-
// handle updated tip hash
1851-
const uint256 prev_tip_hash = tip_hash;
1852-
tip_hash = locked_chain->getBlockHash(*tip_height);
1853-
if (stop_block.IsNull() && prev_tip_hash != tip_hash) {
1854-
// in case the tip has changed, update progress max
1855-
progress_end = chain().guessVerificationProgress(tip_hash);
1856-
}
1849+
// handle updated tip hash
1850+
const uint256 prev_tip_hash = tip_hash;
1851+
tip_hash = locked_chain->getBlockHash(*tip_height);
1852+
if (stop_block.IsNull() && prev_tip_hash != tip_hash) {
1853+
// in case the tip has changed, update progress max
1854+
progress_end = chain().guessVerificationProgress(tip_hash);
18571855
}
18581856
}
1859-
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI
1860-
if (block_height && fAbortRescan) {
1861-
WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", *block_height, progress_current);
1862-
result.status = ScanResult::USER_ABORT;
1863-
} else if (block_height && chain().shutdownRequested()) {
1864-
WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", *block_height, progress_current);
1865-
result.status = ScanResult::USER_ABORT;
1866-
} else {
1867-
WalletLogPrintf("Rescan completed in %15dms\n", GetTimeMillis() - start_time);
1868-
}
1857+
}
1858+
ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI
1859+
if (block_height && fAbortRescan) {
1860+
WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", *block_height, progress_current);
1861+
result.status = ScanResult::USER_ABORT;
1862+
} else if (block_height && chain().shutdownRequested()) {
1863+
WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", *block_height, progress_current);
1864+
result.status = ScanResult::USER_ABORT;
1865+
} else {
1866+
WalletLogPrintf("Rescan completed in %15dms\n", GetTimeMillis() - start_time);
18691867
}
18701868
return result;
18711869
}

0 commit comments

Comments
 (0)