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

Implement a hard fork for extended/infinite claim expiration times #112

Closed
lbrynaut wants to merge 247 commits from claim-expiration into master
pull from: claim-expiration
merge into: LBRYCommunity:master
Conversation 3 Commits 247 Files changed 113 +4 -6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7af9e6dc93 - Show all commits

10
src/claimtrie.cpp
View file

@ -603,7 +603,10 @@ bool CClaimTrie::updateHash(const std::string& name, uint256& hash)
void CClaimTrie::BatchWriteNode(CLevelDBBatch& batch, const std::string& name, const CClaimTrieNode* pNode) const void CClaimTrie::BatchWriteNode(CLevelDBBatch& batch, const std::string& name, const CClaimTrieNode* pNode) const
{ {
LogPrintf("%s: Writing %s to disk with %d values\n", __func__, name, pNode->values.size()); uint32_t num_values = 0;
if (pNode)
num_values = pNode->values.size();
LogPrintf("%s: Writing %s to disk with %d values\n", __func__, name, num_values);
if (pNode) if (pNode)
batch.Write(std::make_pair(TRIE_NODE, name), *pNode); batch.Write(std::make_pair(TRIE_NODE, name), *pNode);
else else
@ -710,13 +713,10 @@ bool CClaimTrie::InsertFromDisk(const std::string& name, CClaimTrieNode* node)
bool CClaimTrie::ReadFromDisk(bool check) bool CClaimTrie::ReadFromDisk(bool check)
{ {
std::cout << "Trying to read the claim trie from disk" << std::endl;
if (!db.Read(HASH_BLOCK, hashBlock)) if (!db.Read(HASH_BLOCK, hashBlock))
LogPrintf("%s: Couldn't read the best block's hash\n", __func__); LogPrintf("%s: Couldn't read the best block's hash\n", __func__);
std::cout << "Read the best block's hash" << std::endl;
if (!db.Read(CURRENT_HEIGHT, nCurrentHeight)) if (!db.Read(CURRENT_HEIGHT, nCurrentHeight))
LogPrintf("%s: Couldn't read the current height\n", __func__); LogPrintf("%s: Couldn't read the current height\n", __func__);
std::cout << "Read the current height" << std::endl;
boost::scoped_ptr<CLevelDBIterator> pcursor(const_cast<CLevelDBWrapper*>(&db)->NewIterator()); boost::scoped_ptr<CLevelDBIterator> pcursor(const_cast<CLevelDBWrapper*>(&db)->NewIterator());
pcursor->SeekToFirst(); pcursor->SeekToFirst();
@ -725,10 +725,8 @@ bool CClaimTrie::ReadFromDisk(bool check)
std::pair<char, std::string> key; std::pair<char, std::string> key;
if (pcursor->GetKey(key)) if (pcursor->GetKey(key))
{ {
std::cout << "Got a key that looks good" << std::endl;
if (key.first == TRIE_NODE) if (key.first == TRIE_NODE)
{ {
std::cout << "Got a trie node. name: " << key.second << std::endl;
CClaimTrieNode* node = new CClaimTrieNode(); CClaimTrieNode* node = new CClaimTrieNode();
if (pcursor->GetValue(*node)) if (pcursor->GetValue(*node))
{ {