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 +32 -20
2 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bc266a1677 - Show all commits

44
src/ncctrie.cpp
View file

@ -137,14 +137,6 @@ bool CNCCTrie::recursiveCheckConsistency(CNCCTrieNode* node)
{ {
std::string stringToHash; std::string stringToHash;
CNodeValue val;
bool hasValue = node->getValue(val);
if (hasValue)
{
stringToHash += val.ToString();
}
for (nodeMapType::iterator it = node->children.begin(); it != node->children.end(); ++it) for (nodeMapType::iterator it = node->children.begin(); it != node->children.end(); ++it)
{ {
std::stringstream ss; std::stringstream ss;
@ -157,6 +149,20 @@ bool CNCCTrie::recursiveCheckConsistency(CNCCTrieNode* node)
else else
return false; return false;
} }
CNodeValue val;
bool hasValue = node->getValue(val);
if (hasValue)
{
CHash256 valHasher;
std::vector<unsigned char> vchValHash(valHasher.OUTPUT_SIZE);
valHasher.Write((const unsigned char*) val.ToString().data(), val.ToString().size());
valHasher.Finalize(&(vchValHash[0]));
uint256 valHash(vchValHash);
stringToHash += valHash.ToString();
}
CHash256 hasher; CHash256 hasher;
std::vector<unsigned char> vchHash(hasher.OUTPUT_SIZE); std::vector<unsigned char> vchHash(hasher.OUTPUT_SIZE);
hasher.Write((const unsigned char*) stringToHash.data(), stringToHash.size()); hasher.Write((const unsigned char*) stringToHash.data(), stringToHash.size());
@ -383,14 +389,6 @@ bool CNCCTrieCache::recursiveComputeMerkleHash(CNCCTrieNode* tnCurrent, std::str
} }
std::string stringToHash; std::string stringToHash;
CNodeValue val;
bool hasValue = tnCurrent->getValue(val);
if (hasValue)
{
stringToHash += val.ToString();
}
nodeCacheType::iterator cachedNode; nodeCacheType::iterator cachedNode;
@ -415,6 +413,20 @@ bool CNCCTrieCache::recursiveComputeMerkleHash(CNCCTrieNode* tnCurrent, std::str
else else
stringToHash += it->second->hash.ToString(); stringToHash += it->second->hash.ToString();
} }
CNodeValue val;
bool hasValue = tnCurrent->getValue(val);
if (hasValue)
{
CHash256 valHasher;
std::vector<unsigned char> vchValHash(valHasher.OUTPUT_SIZE);
valHasher.Write((const unsigned char*) val.ToString().data(), val.ToString().size());
valHasher.Finalize(&(vchValHash[0]));
uint256 valHash(vchValHash);
stringToHash += valHash.ToString();
}
CHash256 hasher; CHash256 hasher;
std::vector<unsigned char> vchHash(hasher.OUTPUT_SIZE); std::vector<unsigned char> vchHash(hasher.OUTPUT_SIZE);
hasher.Write((const unsigned char*) stringToHash.data(), stringToHash.size()); hasher.Write((const unsigned char*) stringToHash.data(), stringToHash.size());

8
src/test/ncctrie_tests.cpp
View file

@ -42,16 +42,16 @@ BOOST_AUTO_TEST_CASE(ncctrie_create_insert_remove)
CMutableTransaction tx6 = BuildTransaction(tx5.GetHash()); CMutableTransaction tx6 = BuildTransaction(tx5.GetHash());
uint256 hash1; uint256 hash1;
hash1.SetHex("81727ef4dd44787941b9bba2c143a3607d92ee1f0d1d24d0da5aac6aa44ae12f"); hash1.SetHex("2f3ae25e923dfa6fc24f0ff5d4367239425effaf47b703857436947a2dbfdda1");
uint256 hash2; uint256 hash2;
hash2.SetHex("653304cb35e66280b52ee6c52fcf2b8b1032ced6fea7a6e1548f24c47b1a3910"); hash2.SetHex("833c0a897d1e32b16a7988c574dbcd750ed6695b947dea7b16e7782eac070a5d");
uint256 hash3; uint256 hash3;
hash3.SetHex("48c0f04ab06338b25c66a6f237084eec49a5d761b5bfbe125d213fce33948242"); hash3.SetHex("5ea4c62fb56bbca0cdf6fe4b2668c737641b4f48af8ef5041faa42df12aa3078");
uint256 hash4; uint256 hash4;
hash4.SetHex("a79e8a5b28f7fa5e8836a4b48da9988bdf56ce749f81f413cb754f963a516200"); hash4.SetHex("47ae7f3ab9c0e9b13d08d5535a76fd36cecad0529baca390cea77b5bd3d99290");
BOOST_CHECK(pnccTrie->empty()); BOOST_CHECK(pnccTrie->empty());