zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wallet: Throw error if `ReadBlockFromDisk` fails

This commit is contained in:
Jack Grigg 2022-07-14 16:06:13 +00:00
parent 12c3cfd339
commit 847ce5375f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wallet/wallet.cpp
View File

@ -2680,7 +2680,10 @@ void CWallet::IncrementNoteWitnesses(
const CBlock* pblock {pblockIn}; const CBlock* pblock {pblockIn};
CBlock block; CBlock block;
if (!pblock) { if (!pblock) {
ReadBlockFromDisk(block, pindex, consensus); if (!ReadBlockFromDisk(block, pindex, consensus)) {
throw std::runtime_error(
strprintf("Can't read block %d from disk (%s)", pindex->nHeight, pindex->GetBlockHash().GetHex()));
}
pblock = █ pblock = █
} }
@ -4408,7 +4411,12 @@ void CWallet::WitnessNoteCommitment(std::vector<uint256> commitments,
while (pindex) { while (pindex) {
CBlock block; CBlock block;
ReadBlockFromDisk(block, pindex, Params().GetConsensus()); if (!ReadBlockFromDisk(block, pindex, Params().GetConsensus())) {
// CWallet::WitnessNoteCommitment is only called from the deprecated RPC
// methods `zc_raw_receive` and `zc_raw_joinsplit`.
throw std::runtime_error(
strprintf("Can't read block %d from disk (%s)", pindex->nHeight, pindex->GetBlockHash().GetHex()));
}
for (const CTransaction& tx : block.vtx) for (const CTransaction& tx : block.vtx)
{ {
@ -4534,7 +4542,10 @@ int CWallet::ScanForWalletTransactions(
ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
CBlock block; CBlock block;
ReadBlockFromDisk(block, pindex, consensus); if (!ReadBlockFromDisk(block, pindex, consensus)) {
throw std::runtime_error(
strprintf("Can't read block %d from disk (%s)", pindex->nHeight, pindex->GetBlockHash().GetHex()));
}
for (CTransaction& tx : block.vtx) for (CTransaction& tx : block.vtx)
{ {
if (AddToWalletIfInvolvingMe(consensus, tx, &block, pindex->nHeight, fUpdate)) { if (AddToWalletIfInvolvingMe(consensus, tx, &block, pindex->nHeight, fUpdate)) {