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 +15 -4
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dffd498152 - Show all commits

19
src/claimtrie.cpp
View file

@ -1220,14 +1220,24 @@ bool CClaimTrieCache::empty() const
CClaimTrieNode* CClaimTrieCache::addNodeToCache(const std::string& position, CClaimTrieNode* original) const CClaimTrieNode* CClaimTrieCache::addNodeToCache(const std::string& position, CClaimTrieNode* original) const
{ {
if (!original) // create a copy of the node in the cache, if new node, create empty node
original = new CClaimTrieNode(); CClaimTrieNode* cacheCopy;
CClaimTrieNode* cacheCopy = new CClaimTrieNode(*original); if(!original)
cacheCopy = new CClaimTrieNode();
else
cacheCopy = new CClaimTrieNode(*original);
cache[position] = cacheCopy; cache[position] = cacheCopy;
// check to see if there is the original node in block_originals,
// if not, add it to block_originals cache
nodeCacheType::const_iterator itOriginals = block_originals.find(position); nodeCacheType::const_iterator itOriginals = block_originals.find(position);
if (block_originals.end() == itOriginals) if (block_originals.end() == itOriginals)
{ {
CClaimTrieNode* originalCopy = new CClaimTrieNode(*original); CClaimTrieNode* originalCopy;
if(!original)
originalCopy = new CClaimTrieNode();
else
originalCopy = new CClaimTrieNode(*original);
block_originals[position] = originalCopy; block_originals[position] = originalCopy;
} }
return cacheCopy; return cacheCopy;
@ -2457,6 +2467,7 @@ bool CClaimTrieCache::clear() const
supportCache.clear(); supportCache.clear();
supportQueueCache.clear(); supportQueueCache.clear();
supportQueueNameCache.clear(); supportQueueNameCache.clear();
supportExpirationQueueCache.clear();
namesToCheckForTakeover.clear(); namesToCheckForTakeover.clear();
cacheTakeoverHeights.clear(); cacheTakeoverHeights.clear();
return true; return true;