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

16
src/rpcncctrie.cpp
View file

@ -34,11 +34,9 @@ UniValue getclaimsintrie(const UniValue& params, bool fHelp)
CCoinsViewCache view(pcoinsTip); CCoinsViewCache view(pcoinsTip);
std::vector<namedNodeType> nodes = pnccTrie->flattenTrie(); std::vector<namedNodeType> nodes = pnccTrie->flattenTrie();
CNodeValue val;
for (std::vector<namedNodeType>::iterator it = nodes.begin(); it != nodes.end(); ++it) for (std::vector<namedNodeType>::iterator it = nodes.begin(); it != nodes.end(); ++it)
{ {
if (it->second.getBestValue(val)) if (!it->second.values.empty())
{ {
UniValue node(UniValue::VOBJ); UniValue node(UniValue::VOBJ);
node.push_back(Pair("name", it->first)); node.push_back(Pair("name", it->first));
@ -50,25 +48,25 @@ UniValue getclaimsintrie(const UniValue& params, bool fHelp)
claim.push_back(Pair("n", (int)itClaims->nOut)); claim.push_back(Pair("n", (int)itClaims->nOut));
claim.push_back(Pair("amount", itClaims->nAmount)); claim.push_back(Pair("amount", itClaims->nAmount));
claim.push_back(Pair("height", itClaims->nHeight)); claim.push_back(Pair("height", itClaims->nHeight));
const CCoins* coin = view.AccessCoins(val.txhash); const CCoins* coin = view.AccessCoins(itClaims->txhash);
if (!coin) if (!coin)
{ {
LogPrintf("%s: %s does not exist in the coins view, despite being associated with a name\n", LogPrintf("%s: %s does not exist in the coins view, despite being associated with a name\n",
__func__, val.txhash.GetHex()); __func__, itClaims->txhash.GetHex());
claim.push_back(Pair("error", "No value found for claim")); claim.push_back(Pair("error", "No value found for claim"));
} }
else if (coin->vout.size() < val.nOut || coin->vout[val.nOut].IsNull()) else if (coin->vout.size() < itClaims->nOut || coin->vout[itClaims->nOut].IsNull())
{ {
LogPrintf("%s: the specified txout of %s appears to have been spent\n", __func__, val.txhash.GetHex()); LogPrintf("%s: the specified txout of %s appears to have been spent\n", __func__, itClaims->txhash.GetHex());
claim.push_back(Pair("error", "Txout spent")); claim.push_back(Pair("error", "Txout spent"));
} }
else else
{ {
int op; int op;
std::vector<std::vector<unsigned char> > vvchParams; std::vector<std::vector<unsigned char> > vvchParams;
if (!DecodeNCCScript(coin->vout[val.nOut].scriptPubKey, op, vvchParams)) if (!DecodeNCCScript(coin->vout[itClaims->nOut].scriptPubKey, op, vvchParams))
{ {
LogPrintf("%s: the specified txout of %s does not have an NCC command\n", __func__, val.txhash.GetHex()); LogPrintf("%s: the specified txout of %s does not have an NCC command\n", __func__, itClaims->txhash.GetHex());
} }
std::string sValue(vvchParams[1].begin(), vvchParams[1].end()); std::string sValue(vvchParams[1].begin(), vvchParams[1].end());
claim.push_back(Pair("value", sValue)); claim.push_back(Pair("value", sValue));