GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 250c8e59d5 into merged_master (Elements PR ElementsProject/elements#1030)

Browse source
This commit is contained in:
Andrew Poelstra 2021-09-18 02:57:56 +00:00
commit e4c9cc06dc
10 changed files with 164 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/txdb.cpp
View file

@ -32,7 +32,7 @@ static constexpr uint8_t DB_LAST_BLOCK{'l'};
// ELEMENTS:
static const char DB_PEGIN_FLAG = 'w';
static const char DB_INVALID_BLOCK_Q = 'q';
// static const char DB_INVALID_BLOCK_Q = 'q'; // No longer used, but avoid reuse.
static const char DB_PAK = 'p';
namespace {
@ -297,14 +297,6 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) {
return true;
}
// ELEMENTS:
bool CBlockTreeDB::ReadInvalidBlockQueue(std::vector<uint256> &vBlocks) {
return Read(std::make_pair(DB_INVALID_BLOCK_Q, uint256S("0")), vBlocks);//FIXME: why uint 56 and not ""
}
bool CBlockTreeDB::WriteInvalidBlockQueue(const std::vector<uint256> &vBlocks) {
return Write(std::make_pair(DB_INVALID_BLOCK_Q, uint256S("0")), vBlocks);
}
bool CBlockTreeDB::ReadPAKList(std::vector<std::vector<unsigned char> >& offline_list, std::vector<std::vector<unsigned char> >& online_list, bool& reject)
{
return Read(std::make_pair(DB_PAK, uint256S("1")), offline_list) && Read(std::make_pair(DB_PAK, uint256S("2")), online_list) && Read(std::make_pair(DB_PAK, uint256S("3")), reject);