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

Unify claimtrie tests, add some additional root hash checks #181

Closed
BrannonKing wants to merge 291 commits from unify_claimtrie_tests into master
pull from: unify_claimtrie_tests
merge into: LBRYCommunity:master
Conversation 6 Commits 291 Files changed 118 +18 -3
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0551e881f5 - Show all commits

10
src/rpc/claimtrie.cpp
View file

@ -164,7 +164,15 @@ UniValue getvalueforname(const UniValue& params, bool fHelp)
{ {
LogPrintf("%s: the specified txout of %s does not have a name claim command\n", __func__, claim.outPoint.hash.GetHex()); LogPrintf("%s: the specified txout of %s does not have a name claim command\n", __func__, claim.outPoint.hash.GetHex());
} }
std::string sValue(vvchParams[1].begin(), vvchParams[1].end()); std::string sValue;
if (op == OP_CLAIM_NAME)
{
sValue = std::string(vvchParams[1].begin(), vvchParams[1].end());
}
else if (op == OP_UPDATE_CLAIM)
{
sValue = std::string(vvchParams[2].begin(), vvchParams[2].end());
}
ret.push_back(Pair("value", sValue)); ret.push_back(Pair("value", sValue));
ret.push_back(Pair("txid", claim.outPoint.hash.GetHex())); ret.push_back(Pair("txid", claim.outPoint.hash.GetHex()));
ret.push_back(Pair("n", (int)claim.outPoint.n)); ret.push_back(Pair("n", (int)claim.outPoint.n));

11
src/wallet/rpcwallet.cpp
View file

@ -692,9 +692,16 @@ void ListNameClaims(const CWalletTx& wtx, const string& strAccount, int nMinDept
string sValue (vvchParams[1].begin(), vvchParams[1].end()); string sValue (vvchParams[1].begin(), vvchParams[1].end());
entry.push_back(Pair("value", sValue)); entry.push_back(Pair("value", sValue));
} }
else if (op == OP_UPDATE_CLAIM)
{
uint160 claimId(vvchParams[1]);
entry.push_back(Pair("claimId", claimId.GetHex()));
string sValue(vvchParams[2].begin(), vvchParams[2].end());
entry.push_back(Pair("value", sValue));
}
else if (op == OP_SUPPORT_CLAIM) else if (op == OP_SUPPORT_CLAIM)
{ {
uint256 claimId(vvchParams[1]); uint160 claimId(vvchParams[1]);
entry.push_back(Pair("supported_claimid", claimId.GetHex())); entry.push_back(Pair("supported_claimid", claimId.GetHex()));
} }
entry.push_back(Pair("txid", wtx.GetHash().ToString())); entry.push_back(Pair("txid", wtx.GetHash().ToString()));
@ -849,7 +856,7 @@ UniValue supportclaim(const UniValue& params, bool fHelp)
EnsureWalletIsUnlocked(); EnsureWalletIsUnlocked();
CScript supportScript = CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << OP_2DROP << OP_2DROP; CScript supportScript = CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << OP_2DROP << OP_DROP;
CreateClaim(supportScript, nAmount, wtx); CreateClaim(supportScript, nAmount, wtx);