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

2
share/seeds/nodes_main.txt
View file

@ -1 +1 @@
104.236.42.182 52.27.78.56

2
src/chainparams.cpp
View file

@ -115,6 +115,8 @@ public:
vSeeds.clear(); vSeeds.clear();
vFixedSeeds.clear(); vFixedSeeds.clear();
vSeeds.push_back(CDNSSeedData("lbrycrd.lbry.io", "testseed.lbrycrd.lbry.io")); // lbry.io
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0); base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5); base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,128); base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,128);

2
src/chainparamsseeds.h
View file

@ -8,7 +8,7 @@
* IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
*/ */
static SeedSpec6 pnSeed6_main[] = { static SeedSpec6 pnSeed6_main[] = {
{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x2a,0xb6}, 8333} {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x1b,0x4e,0x38}, 8333}
}; };
static SeedSpec6 pnSeed6_test[] = { static SeedSpec6 pnSeed6_test[] = {

2
src/main.cpp
View file

@ -3628,7 +3628,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
} }
// process in case the block isn't known yet // process in case the block isn't known yet
if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) { if (hash != chainparams.GetConsensus().hashGenesisBlock && (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0)) {
CValidationState state; CValidationState state;
if (ProcessNewBlock(state, NULL, &block, true, dbp)) if (ProcessNewBlock(state, NULL, &block, true, dbp))
nLoaded++; nLoaded++;

3
src/ncctrie.cpp
View file

@ -573,7 +573,8 @@ bool CNCCTrie::updateHash(const std::string& name, uint256& hash)
void CNCCTrie::BatchWriteNode(CLevelDBBatch& batch, const std::string& name, const CNCCTrieNode* pNode) const void CNCCTrie::BatchWriteNode(CLevelDBBatch& batch, const std::string& name, const CNCCTrieNode* pNode) const
{ {
LogPrintf("%s: Writing %s to disk with %d values\n", __func__, name, pNode->values.size()); if (pNode)
LogPrintf("%s: Writing %s to disk with %d values\n", __func__, name, pNode->values.size());
if (pNode) if (pNode)
batch.Write(std::make_pair('n', name), *pNode); batch.Write(std::make_pair('n', name), *pNode);
else else