diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:23:41 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:32:03 +0100 |
| commit | 77beab70deae8ad821cc069c1ce80fc809c89c33 (patch) | |
| tree | d2d9aa3be7959400c2176d0d6c2e75a4f3925d6f /src/wallet | |
| parent | 503ff6e1ae6932b63892099b4c63e92a9263fed6 (diff) | |
| parent | 87cbdb8b41eee4067023cfa0d9d68722da74a5eb (diff) | |
| download | bitcoin-77beab70deae8ad821cc069c1ce80fc809c89c33.tar.xz | |
Merge pull request #6163
87cbdb8 Globals: Explicit Consensus::Params arg for main: (Jorge Timón)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index cce3e40f38..d51b8ddaef 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1078,7 +1078,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); CBlock block; - ReadBlockFromDisk(block, pindex); + ReadBlockFromDisk(block, pindex, Params().GetConsensus()); BOOST_FOREACH(CTransaction& tx, block.vtx) { if (AddToWalletIfInvolvingMe(tx, &block, fUpdate)) |