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

Rename CClaimTrieCache to CClaimTrieUpdateBuffer #156

Closed
kaykurokawa wants to merge 276 commits from cclaimtriecache_change into master
pull from: cclaimtriecache_change
merge into: LBRYCommunity:master
Conversation 3 Commits 276 Files changed 116 +7 -7
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dfa15c9df1 - Show all commits

2
configure.ac
View file

@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 99)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, false) define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2015) define(_COPYRIGHT_YEAR, 2015)
AC_INIT([LBRYcrd Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[lbrycrd]) AC_INIT([LBRYcrd Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/lbryio/lbrycrd/issues],[lbrycrd])
AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])

2
src/main.cpp
View file

@ -1104,7 +1104,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
{ {
if (nHeight == 0) if (nHeight == 0)
{ {
return 400000000 * COIN; return 350000000 * COIN;
} }
CAmount nStartingSubsidy = 500 * COIN; CAmount nStartingSubsidy = 500 * COIN;
int nLevel = (nHeight - 1) / consensusParams.nSubsidyLevelInterval; int nLevel = (nHeight - 1) / consensusParams.nSubsidyLevelInterval;

8
src/miner.cpp
View file

@ -562,7 +562,7 @@ static bool ProcessBlockFound(const CBlock* pblock, const CChainParams& chainpar
void static BitcoinMiner(const CChainParams& chainparams) void static BitcoinMiner(const CChainParams& chainparams)
{ {
LogPrintf("BitcoinMiner started\n"); LogPrintf("LBRYcrdMiner started\n");
SetThreadPriority(THREAD_PRIORITY_LOWEST); SetThreadPriority(THREAD_PRIORITY_LOWEST);
RenameThread("bitcoin-miner"); RenameThread("bitcoin-miner");
@ -630,7 +630,7 @@ void static BitcoinMiner(const CChainParams& chainparams)
assert(hash == pblock->GetHash()); assert(hash == pblock->GetHash());
SetThreadPriority(THREAD_PRIORITY_NORMAL); SetThreadPriority(THREAD_PRIORITY_NORMAL);
LogPrintf("BitcoinMiner:\n"); LogPrintf("LBRYcrdMiner:\n");
LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex()); LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex());
ProcessBlockFound(pblock, chainparams); ProcessBlockFound(pblock, chainparams);
SetThreadPriority(THREAD_PRIORITY_LOWEST); SetThreadPriority(THREAD_PRIORITY_LOWEST);
@ -670,12 +670,12 @@ void static BitcoinMiner(const CChainParams& chainparams)
} }
catch (const boost::thread_interrupted&) catch (const boost::thread_interrupted&)
{ {
LogPrintf("BitcoinMiner terminated\n"); LogPrintf("LBRYcrdMiner terminated\n");
throw; throw;
} }
catch (const std::runtime_error &e) catch (const std::runtime_error &e)
{ {
LogPrintf("BitcoinMiner runtime error: %s\n", e.what()); LogPrintf("LBRYcrdMiner runtime error: %s\n", e.what());
return; return;
} }
} }

2
src/test/main_tests.cpp
View file

@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(subsidy_limit_test)
nSum += nSubsidy * 1000; nSum += nSubsidy * 1000;
BOOST_CHECK(MoneyRange(nSum)); BOOST_CHECK(MoneyRange(nSum));
} }
BOOST_CHECK_EQUAL(nSum, 107091600000000000LL); BOOST_CHECK_EQUAL(nSum, 102091600000000000LL);
} }
bool ReturnFalse() { return false; } bool ReturnFalse() { return false; }