Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move CHistoryWriter into CCustomCSView #1700

Merged
merged 8 commits into from
Feb 6, 2023
Merged

Move CHistoryWriter into CCustomCSView #1700

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c2960b
Discard bespoke DBs on VerifyDB
Bushstar Jan 18, 2023
eff6854
Make CHistoryWriter a member of CCuscomCSView
Bushstar Jan 26, 2023
d8aa60e
Merge branch 'master' into discard-on-verifydb
Bushstar Jan 26, 2023
0b8a590
lint: Circular deps
Bushstar Jan 26, 2023
a5dbba4
Pass block hash to account change and print TX type
Bushstar Jan 30, 2023
908a695
Merge branch 'master' into discard-on-verifydb
Bushstar Jan 31, 2023
2dc1cbf
lint: circular deps
Bushstar Jan 31, 2023
97a8f64
Merge branch 'master' into discard-on-verifydb
prasannavl Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,17 +1695,17 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI

CBlockUndo blockUndo;
if (!UndoReadFromDisk(blockUndo, pindex)) {
error("DisconnectBlock(): failure reading undo data");
error("%s: failure reading undo data", __func__);
return DISCONNECT_FAILED;
}

if (blockUndo.vtxundo.size() + 1 != block.vtx.size()) {
error("DisconnectBlock(): block and undo data inconsistent");
error("%s: block and undo data inconsistent", __func__);
return DISCONNECT_FAILED;
}

if (mnview.GetLastHeight() != pindex->nHeight) {
error("DisconnectBlock(): mnview: wrong last processed block hash (view: %d, current: %d)", mnview.GetLastHeight(), pindex->nHeight);
error("%s: mnview: wrong last processed block hash (view: %d, current: %d)", __func__, mnview.GetLastHeight(), pindex->nHeight);
return DISCONNECT_FAILED;
}

Expand Down Expand Up @@ -1819,7 +1819,7 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
if (i > 0 && !IsAnchorRewardTx(tx, dummy) && !IsAnchorRewardTxPlus(tx, dummy) && !IsTokenSplitTx(tx, dummy)) { // not coinbases
CTxUndo &txundo = blockUndo.vtxundo[i-1];
if (txundo.vprevout.size() != tx.vin.size()) {
error("DisconnectBlock(): transaction and undo data inconsistent");
error("%s: transaction and undo data inconsistent", __func__);
return DISCONNECT_FAILED;
}
for (unsigned int j = tx.vin.size(); j-- > 0;) {
Expand Down Expand Up @@ -3170,7 +3170,7 @@ bool CChainState::DisconnectTip(CValidationState& state, const CChainParams& cha
int64_t nStart = GetTimeMicros();
{
CCoinsViewCache view(&CoinsTip());
CCustomCSView mnview(*pcustomcsview.get());
CCustomCSView mnview(*pcustomcsview);
assert(view.GetBestBlock() == pindexDelete->GetBlockHash());
std::vector<CAnchorConfirmMessage> disconnectedConfirms;
if (DisconnectBlock(block, pindexDelete, view, mnview, disconnectedConfirms) != DISCONNECT_OK) {
Expand Down Expand Up @@ -5280,7 +5280,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
nCheckLevel = std::max(0, std::min(4, nCheckLevel));
LogPrintf("Verifying last %i blocks at level %i\n", nCheckDepth, nCheckLevel);
CCoinsViewCache coins(coinsview);
CCustomCSView mnview(*pcustomcsview.get());
CCustomCSView mnview(*pcustomcsview);
CBlockIndex* pindex;
CBlockIndex* pindexFailure = nullptr;
int nGoodTransactions = 0;
Expand Down Expand Up @@ -5326,6 +5326,14 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
assert(coins.GetBestBlock() == pindex->GetBlockHash());
std::vector<CAnchorConfirmMessage> disconnectedConfirms; // dummy
DisconnectResult res = ::ChainstateActive().DisconnectBlock(block, pindex, coins, mnview, disconnectedConfirms);
// Discard results from bespoke DBs
pburnHistoryDB->Discard();
if (paccountHistoryDB) {
paccountHistoryDB->Discard();
}
if (pvaultHistoryDB) {
pvaultHistoryDB->Discard();
}
if (res == DISCONNECT_FAILED) {
return error("VerifyDB(): *** irrecoverable inconsistency in block data at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
}
Expand Down