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

all tests pass

Browse source
This commit is contained in:
Brannon King 2019-12-06 12:14:12 -07:00
parent 5e32ef1b75
commit 8b4197570d
1 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/claimtrie/trie.cpp
View file

@ -565,14 +565,18 @@ CUint256 CClaimTrieCacheBase::getMerkleHash()
bool CClaimTrieCacheBase::getLastTakeoverForName(const std::string& name, CUint160& claimId, int& takeoverHeight) const bool CClaimTrieCacheBase::getLastTakeoverForName(const std::string& name, CUint160& claimId, int& takeoverHeight) const
{ {
auto query = db << "SELECT t.height, t.claimID FROM takeover t JOIN claims c " auto query = db << "SELECT t.height, t.claimID FROM takeover t "
"ON t.claimID = c.claimID AND c.expirationHeight > ?1 "
"WHERE t.name = ?2 ORDER BY t.height DESC LIMIT 1" << nNextHeight << name; "WHERE t.name = ?2 ORDER BY t.height DESC LIMIT 1" << nNextHeight << name;
auto it = query.begin(); auto it = query.begin();
if (it == query.end()) if (it != query.end()) {
std::unique_ptr<CUint160> claimIdOrNull;
*it >> takeoverHeight >> claimIdOrNull;
if (claimIdOrNull) {
claimId = *claimIdOrNull;
return true;
}
}
return false; return false;
*it >> takeoverHeight >> claimId;
return !claimId.IsNull();
} }
bool CClaimTrieCacheBase::addClaim(const std::string& name, const CTxOutPoint& outPoint, const CUint160& claimId, bool CClaimTrieCacheBase::addClaim(const std::string& name, const CTxOutPoint& outPoint, const CUint160& claimId,
@ -1153,8 +1157,11 @@ bool CClaimTrieCacheBase::incrementBlock()
// now that they're all in get the winner: // now that they're all in get the winner:
CUint160 existingID; CUint160 existingID;
int existingHeight = 0; int existingHeight = 0;
auto hasBeenSetBefore = getLastTakeoverForName(nameWithTakeover, existingID, existingHeight); auto hasCurrentWinner = getLastTakeoverForName(nameWithTakeover, existingID, existingHeight);
auto takeoverHappening = !hasCandidate || (hasBeenSetBefore && existingID != candidateValue.claimId); // we have a takeover if we had a winner and its changing or we never had a winner
auto takeoverHappening = hasCandidate && hasCurrentWinner && existingID != candidateValue.claimId;
takeoverHappening |= !hasCandidate && hasCurrentWinner;
takeoverHappening |= hasCandidate && !hasCurrentWinner;
if (takeoverHappening && activateAllFor(nameWithTakeover)) if (takeoverHappening && activateAllFor(nameWithTakeover))
hasCandidate = getInfoForName(nameWithTakeover, candidateValue, 1); hasCandidate = getInfoForName(nameWithTakeover, candidateValue, 1);
@ -1166,13 +1173,13 @@ bool CClaimTrieCacheBase::incrementBlock()
takeoverHappening |= wit != takeoverWorkarounds.end(); takeoverHappening |= wit != takeoverWorkarounds.end();
} }
logPrint << "Takeover on " << nameWithTakeover << " at " << nNextHeight << ", happening: " << takeoverHappening << ", set before: " << hasBeenSetBefore << Clog::endl; logPrint << "Takeover on " << nameWithTakeover << " at " << nNextHeight << ", happening: " << takeoverHappening << ", set before: " << hasCurrentWinner << Clog::endl;
if (takeoverHappening || !hasBeenSetBefore) { if (takeoverHappening) {
if (hasCandidate) if (hasCandidate)
db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, ?)" db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, ?)"
<< nameWithTakeover << nNextHeight << candidateValue.claimId; << nameWithTakeover << nNextHeight << candidateValue.claimId;
else if (hasBeenSetBefore) else
db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, NULL)" db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, NULL)"
<< nameWithTakeover << nNextHeight; << nameWithTakeover << nNextHeight;
} }
@ -1202,11 +1209,14 @@ bool CClaimTrieCacheBase::decrementBlock()
nNextHeight--; nNextHeight--;
db << "INSERT INTO nodes(name) SELECT name FROM claims " db << "INSERT INTO nodes(name) SELECT nodeName FROM claims "
"WHERE expirationHeight = ?1 OR activationHeight = ?1 " "WHERE expirationHeight = ? ON CONFLICT(name) DO UPDATE SET hash = NULL"
"UNION SELECT name FROM supports " << nNextHeight;
"WHERE expirationHeight = ?1 OR activationHeight = ?1 "
"ON CONFLICT(name) DO UPDATE SET hash = NULL" db << "UPDATE nodes SET hash = NULL WHERE name IN("
"SELECT nodeName FROM supports WHERE expirationHeight = ?1 "
"UNION SELECT nodeName FROM supports WHERE activationHeight = ?1 "
"UNION SELECT nodeName FROM claims WHERE activationHeight = ?1)"
<< nNextHeight; << nNextHeight;
db << "UPDATE claims SET activationHeight = validHeight WHERE activationHeight = ?" db << "UPDATE claims SET activationHeight = validHeight WHERE activationHeight = ?"
@ -1234,8 +1244,8 @@ int CClaimTrieCacheBase::getDelayForName(const std::string& name, const CUint160
{ {
CUint160 winningClaimId; CUint160 winningClaimId;
int winningTakeoverHeight; int winningTakeoverHeight;
auto found = getLastTakeoverForName(name, winningClaimId, winningTakeoverHeight); auto hasCurrentWinner = getLastTakeoverForName(name, winningClaimId, winningTakeoverHeight);
if (found && winningClaimId == claimId) { if (hasCurrentWinner && winningClaimId == claimId) {
assert(winningTakeoverHeight <= nNextHeight); assert(winningTakeoverHeight <= nNextHeight);
return 0; return 0;
} }
@ -1247,7 +1257,7 @@ int CClaimTrieCacheBase::getDelayForName(const std::string& name, const CUint160
removalWorkaround.erase(hit); removalWorkaround.erase(hit);
return 0; return 0;
} }
return found ? std::min((nNextHeight - winningTakeoverHeight) / base->nProportionalDelayFactor, 4032) : 0; return hasCurrentWinner ? std::min((nNextHeight - winningTakeoverHeight) / base->nProportionalDelayFactor, 4032) : 0;
} }
std::string CClaimTrieCacheBase::adjustNameForValidHeight(const std::string& name, int validHeight) const std::string CClaimTrieCacheBase::adjustNameForValidHeight(const std::string& name, int validHeight) const