LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

fix data corruption of block_info::hash

Browse source
This commit is contained in:
Brannon King 2020-02-26 14:11:03 -07:00
parent a568691c10
commit 96bf1c4afa
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chain.h
View file

@ -292,7 +292,7 @@ public:
return block; return block;
} }
uint256 GetBlockHash() const const uint256& GetBlockHash() const
{ {
return hash; return hash;
} }

3
src/txdb.cpp
View file

@ -315,11 +315,12 @@ bool CBlockTreeDB::BatchWrite(const std::vector<std::pair<int, const CBlockFileI
db << "INSERT OR REPLACE INTO flag VALUES('last_block', ?)" << nLastFile; // TODO: is this always max(file column)? db << "INSERT OR REPLACE INTO flag VALUES('last_block', ?)" << nLastFile; // TODO: is this always max(file column)?
if(!blockInfo.empty()) { if(!blockInfo.empty()) {
const static uint256 empty;
auto ibi = db << "INSERT OR REPLACE INTO block_info(hash, prevHash, height, file, dataPos, undoPos, " auto ibi = db << "INSERT OR REPLACE INTO block_info(hash, prevHash, height, file, dataPos, undoPos, "
"txCount, status, version, rootTxHash, rootTrieHash, time, bits, nonce) " "txCount, status, version, rootTxHash, rootTrieHash, time, bits, nonce) "
"VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
for (auto &bi: blockInfo) { for (auto &bi: blockInfo) {
ibi << bi->GetBlockHash() << (bi->pprev ? bi->pprev->GetBlockHash() : uint256()) ibi << bi->hash << (bi->pprev ? bi->pprev->hash : empty)
<< bi->nHeight << bi->nFile << bi->nDataPos << bi->nUndoPos << bi->nTx << bi->nHeight << bi->nFile << bi->nDataPos << bi->nUndoPos << bi->nTx
<< bi->nStatus << bi->nVersion << bi->hashMerkleRoot << bi->hashClaimTrie << bi->nStatus << bi->nVersion << bi->hashMerkleRoot << bi->hashClaimTrie
<< bi->nTime << bi->nBits << bi->nNonce; << bi->nTime << bi->nBits << bi->nNonce;