Skip to content
Permalink
Browse files

build 13.2.3

  • Loading branch information...
licobc committed Jun 6, 2019
1 parent 427f1ae commit 5905d170f426313f9e11d59cc61c6b8865f75aaa
Showing with 934 additions and 844 deletions.
  1. +1 −1 configure.ac
  2. +9 −0 depends/.gitignore
  3. +1 −0 doc/.gitignore
  4. +2 −0 qa/rpc-tests/.gitignore
  5. +1 −0 qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/.gitignore
  6. +0 −1 src/blocksignature.h
  7. +19 −1 src/chainparams.cpp
  8. +1 −1 src/chainparams.h
  9. +1 −1 src/coins.cpp
  10. +2 −2 src/init.cpp
  11. +13 −0 src/leveldb/.gitignore
  12. +18 −15 src/main.cpp
  13. +150 −404 src/miner.cpp
  14. +6 −13 src/miner.h
  15. +5 −0 src/net.cpp
  16. +44 −17 src/qt/bitcoingui.cpp
  17. +11 −23 src/qt/bitcoinunits.cpp
  18. +140 −126 src/qt/forms/overviewpage.ui
  19. +13 −1 src/qt/forms/receivecoinsdialog.ui
  20. +18 −9 src/qt/forms/sendcoinsdialog.ui
  21. +17 −2 src/qt/forms/transactiondescdialog.ui
  22. +6 −3 src/qt/guiconstants.h
  23. +57 −44 src/qt/overviewpage.cpp
  24. +2 −0 src/qt/receivecoinsdialog.cpp
  25. +149 −66 src/qt/res/css/default.css
  26. BIN src/qt/res/icons/connect0_16.png
  27. BIN src/qt/res/icons/connect1_16.png
  28. BIN src/qt/res/icons/connect2_16.png
  29. BIN src/qt/res/icons/connect3_16.png
  30. BIN src/qt/res/icons/connect4_16.png
  31. BIN src/qt/res/icons/explorer.png
  32. BIN src/qt/res/icons/lock_closed.png
  33. BIN src/qt/res/icons/lock_open.png
  34. BIN src/qt/res/icons/notsynced.png
  35. BIN src/qt/res/icons/staking_active.png
  36. BIN src/qt/res/icons/staking_inactive.png
  37. BIN src/qt/res/icons/synced.png
  38. BIN src/qt/res/icons/transaction2.png
  39. BIN src/qt/res/icons/tx_inout.png
  40. BIN src/qt/res/icons/tx_input.png
  41. BIN src/qt/res/icons/tx_mined.png
  42. BIN src/qt/res/icons/tx_output.png
  43. BIN src/qt/res/icons/unit_kore.png
  44. BIN src/qt/res/icons/unit_kore_10.png
  45. BIN src/qt/res/icons/unit_mkore.png
  46. BIN src/qt/res/icons/unit_mkore_10.png
  47. BIN src/qt/res/icons/unit_tkore.png
  48. BIN src/qt/res/icons/unit_tmkore.png
  49. BIN src/qt/res/icons/unit_tukore.png
  50. BIN src/qt/res/icons/unit_ukore.png
  51. BIN src/qt/res/icons/unit_ukore_10.png
  52. BIN src/qt/res/images/about.png
  53. BIN src/qt/res/images/splash1.png
  54. BIN src/qt/res/images/splash1_testnet.png
  55. BIN src/qt/res/images/splash_testnet.png
  56. BIN src/qt/res/movies/spinner-000.png
  57. BIN src/qt/res/movies/spinner-001.png
  58. BIN src/qt/res/movies/spinner-002.png
  59. BIN src/qt/res/movies/spinner-003.png
  60. BIN src/qt/res/movies/spinner-004.png
  61. BIN src/qt/res/movies/spinner-005.png
  62. BIN src/qt/res/movies/spinner-006.png
  63. BIN src/qt/res/movies/spinner-007.png
  64. BIN src/qt/res/movies/spinner-008.png
  65. BIN src/qt/res/movies/spinner-009.png
  66. BIN src/qt/res/movies/spinner-010.png
  67. BIN src/qt/res/movies/spinner-011.png
  68. BIN src/qt/res/movies/spinner-012.png
  69. BIN src/qt/res/movies/spinner-013.png
  70. BIN src/qt/res/movies/spinner-014.png
  71. BIN src/qt/res/movies/spinner-015.png
  72. BIN src/qt/res/movies/spinner-016.png
  73. BIN src/qt/res/movies/spinner-017.png
  74. BIN src/qt/res/movies/spinner-018.png
  75. BIN src/qt/res/movies/spinner-019.png
  76. BIN src/qt/res/movies/spinner-020.png
  77. BIN src/qt/res/movies/spinner-021.png
  78. BIN src/qt/res/movies/spinner-022.png
  79. BIN src/qt/res/movies/spinner-023.png
  80. BIN src/qt/res/movies/spinner-024.png
  81. BIN src/qt/res/movies/spinner-025.png
  82. BIN src/qt/res/movies/spinner-026.png
  83. BIN src/qt/res/movies/spinner-027.png
  84. BIN src/qt/res/movies/spinner-028.png
  85. BIN src/qt/res/movies/spinner-029.png
  86. BIN src/qt/res/movies/spinner-030.png
  87. BIN src/qt/res/movies/spinner-031.png
  88. BIN src/qt/res/movies/spinner-032.png
  89. BIN src/qt/res/movies/spinner-033.png
  90. BIN src/qt/res/movies/spinner-034.png
  91. BIN src/qt/res/movies/spinner-035.png
  92. BIN src/qt/res/movies/spinner-036.png
  93. +5 −3 src/qt/transactionrecord.cpp
  94. +1 −3 src/qt/transactionrecord.h
  95. +39 −32 src/qt/transactiontablemodel.cpp
  96. +2 −0 src/qt/transactiontablemodel.h
  97. +11 −1 src/qt/transactionview.cpp
  98. +1 −1 src/qt/transactionview.h
  99. +1 −1 src/qt/walletmodel.cpp
  100. +1 −0 src/qt/walletview.cpp
  101. +1 −1 src/rpc/rpcmining.cpp
  102. +1 −1 src/rpc/rpcrawtransaction.cpp
  103. +8 −7 src/rpc/rpcwallet.cpp
  104. +2 −2 src/test/pos_tests.cpp
  105. +9 −9 src/test/tests_util.cpp
  106. +32 −0 src/univalue/.gitignore
  107. +1 −0 src/univalue/build-aux/m4/.gitignore
  108. +84 −0 src/univalue/gen/gen.cpp
  109. +2 −0 src/univalue/lib/.gitignore
  110. +8 −0 src/univalue/test/.gitignore
  111. +32 −43 src/wallet.cpp
  112. +6 −9 src/wallet.h
  113. +1 −1 tools/masternode/masternode_creation.sh
@@ -3,7 +3,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 13)
define(_CLIENT_VERSION_REVISION, 2)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
AC_INIT([Kore Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.kore.org],[kore])
@@ -0,0 +1,9 @@
SDKs/
work/
built/
sources/
config.site
x86_64*
i686*
mips*
arm*
@@ -0,0 +1 @@
Doxyfile
@@ -0,0 +1,2 @@
*.pyc
cache
@@ -0,0 +1 @@
*.pyc
@@ -12,7 +12,6 @@
bool SignBlockWithKey(CBlock& block, const CKey& key);
bool SignBlock(CBlock& block, const CKeyStore& keystore);
bool CheckBlockSignature(const CBlock& block);

bool CheckBlockSignature_Legacy(const CBlock& block, const uint256& hash);

#endif //KORE_BLOCKSIGNATURE_H
@@ -123,7 +123,7 @@ class CMainParams : public CChainParams
nCoinMaturity = 25;
nMaxMoneyOut = MAX_MONEY;
nMaxReorganizationDepth = 25;
nMaxTipAge = 24 * 60 * 60;
nMaxTipAge = 2 * 60 * 60;
nMinerConfirmationWindow = 50; // nPowTargetTimespan / nPowTargetSpacing
nMinerThreads = 0;
nPastBlocksMax = 128;
@@ -248,6 +248,24 @@ class CTestNetParams : public CMainParams
/* nTxCount */ 0,
/* dTxRate */ 0
};

//
checkpointData = {
{
{ 0, nHashGenesisBlock},
{ 25000, uint256S("0xdf692454f3b24470af3fe9d3e4591ae16a98f2d9709e33889001c2df3b27c747")}
}
};

// Getting info from
// getchaintxstats 24999 df692454f3b24470af3fe9d3e4591ae16a98f2d9709e33889001c2df3b27c747
chainTxData = ChainTxData{
// Data from rpc: getchaintxstats
/* nTime */ 1559712610,
/* nTxCount */ 50376,
/* dTxRate */ 0.02124285951644177
};

}
};
static CTestNetParams testNetParams;
@@ -98,7 +98,7 @@ class CChainParams
int64_t GetBudgetFeeConfirmations() const { return nBudgetFeeConfirmations; }
int64_t GetBudgetVoteUpdate() const { return nBudgetVoteUpdate; }
int32_t GetCoinMaturity() const { return nCoinMaturity; }
/** Used if GenerateBitcoins is called with a negative number of threads */
/** Used if GenerateKores is called with a negative number of threads */
int32_t GetDefaultMinerThreads() const { return nMinerThreads; }
int32_t GetDefaultPort() const { return nDefaultPort; }
std::string GetDevFundPubKey() const { return strDevFundPubKey; }
@@ -155,7 +155,7 @@ CCoinsModifier CCoinsViewCache::ModifyCoins(const uint256& txid)
size_t cachedCoinUsage = 0;
if (fDebug) {
LogPrintf("Coins in the cache : %d \n", cacheCoins.size());
LogPrintf("ModifyCoins_Legacy txid: %s inserted ? %s \n", txid.ToString().c_str(), ret.second ? "true" : "false");
LogPrintf("ModifyCoins txid: %s inserted ? %s \n", txid.ToString().c_str(), ret.second ? "true" : "false");
}
if (ret.second) {
if (!base->GetCoins(txid, ret.first->second.coins)) {
@@ -197,7 +197,7 @@ void PrepareShutdown()
#ifdef ENABLE_WALLET
if (pwalletMain)
bitdb.Flush(false);
GenerateBitcoins(false, NULL, 0);
GenerateKores(false, 0);
#endif
StopNode();
StopTorControl();
@@ -1738,7 +1738,7 @@ bool AppInit2()
#ifdef ENABLE_WALLET
// Mine proof-of-stake blocks in the background
if (pwalletMain)
GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", 1));
GenerateKores(GetBoolArg("-gen", false), GetArg("-genproclimit", 1));
// Mine proof-of-stake blocks in the background
if (!GetBoolArg("-staking", false))
LogPrintf("Staking disabled\n");
@@ -0,0 +1,13 @@
build_config.mk
*.a
*.o
*.dylib*
*.so
*.so.*
*_test
db_bench
leveldbutil
Release
Debug
Benchmark
vs2010.*
@@ -2089,7 +2089,7 @@ bool IsInitialBlockDownload()
static bool lockIBDState = false;
if (lockIBDState)
return false;
bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 60 || // 60 => Blocks per hour
bool state = (chainActive.Height() < pindexBestHeader->nHeight - 2 * 60 || // 60 Blocks per hour
pindexBestHeader->GetBlockTime() < GetTime() - chainParams.GetMaxTipAge()); // ~1440 blocks behind -> 2 x fork detection time
if (!state)
lockIBDState = true;
@@ -2891,7 +2891,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin

int64_t nTime1 = GetTimeMicros();
nTimeConnect += nTime1 - nTimeStart;
LogPrint("bench", " - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs]\n",
LogPrint("bench", " - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs]\n",
(unsigned)block.vtx.size(), 0.001 * (nTime1 - nTimeStart), 0.001 * (nTime1 - nTimeStart) / block.vtx.size(),
nInputs <= 1 ? 0 : 0.001 * (nTime1 - nTimeStart) / (nInputs - 1), nTimeConnect * 0.000001);

@@ -2909,7 +2909,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin

int64_t nTime2 = GetTimeMicros();
nTimeVerify += nTime2 - nTimeStart;
LogPrint("bench", " - Verify %u txins: %.2fms (%.3fms/txin) [%.2fs]\n", nInputs - 1, 0.001 * (nTime2 - nTimeStart),
LogPrint("bench", " - Verify %u txins: %.2fms (%.3fms/txin) [%.2fs]\n", nInputs - 1, 0.001 * (nTime2 - nTimeStart),
nInputs <= 1 ? 0 : 0.001 * (nTime2 - nTimeStart) / (nInputs - 1), nTimeVerify * 0.000001);

//IMPORTANT NOTE: Nothing before this point should actually store to disk (or even memory)
@@ -2942,7 +2942,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin

int64_t nTime3 = GetTimeMicros();
nTimeIndex += nTime3 - nTime2;
LogPrint("bench", " - Index writing: %.2fms [%.2fs]\n", 0.001 * (nTime3 - nTime2), nTimeIndex * 0.000001);
LogPrint("bench", " - Index writing: %.2fms [%.2fs]\n", 0.001 * (nTime3 - nTime2), nTimeIndex * 0.000001);

// Watch for changes to the previous coinbase transaction.
static uint256 hashPrevBestCoinBase;
@@ -2951,7 +2951,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin

int64_t nTime4 = GetTimeMicros();
nTimeCallbacks += nTime4 - nTime3;
LogPrint("bench", " - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime4 - nTime3), nTimeCallbacks * 0.000001);
LogPrint("bench", " - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime4 - nTime3), nTimeCallbacks * 0.000001);

return true;
}
@@ -3532,11 +3532,14 @@ void static UpdateTip(CBlockIndex* pindexNew)
mempool.AddTransactionsUpdated(1);

if (fDebug)
LogPrintf("%s: new best=%s height=%d log2_work=%.8g tx=%lu date=%s progress=%f cache=%.1fMiB(%utx)\n", __func__,
chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble()) / log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
Checkpoints::GuessVerificationProgress(Params().GetTxData(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1 << 20)), pcoinsTip->GetCacheSize());

LogPrintf("%s:\n", __func__);
LogPrintf("New Best Block: %s\n", chainActive.Tip()->GetBlockHash().ToString());
LogPrintf("Height: %d\n", chainActive.Height());
LogPrintf("log2_work: %.8g\n", log(chainActive.Tip()->nChainWork.getdouble()) / log(2.0));
LogPrintf("tx: %lu\n", (unsigned long)chainActive.Tip()->nChainTx);
LogPrintf("date: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()));
LogPrintf("progress: %f\n", Checkpoints::GuessVerificationProgress(Params().GetTxData(), chainActive.Tip()));
LogPrintf("cache: %.1fMiB(%utx)\n", pcoinsTip->DynamicMemoryUsage() * (1.0 / (1 << 20)), pcoinsTip->GetCacheSize());
cvBlockChange.notify_all();

// Check the version of the last 100 blocks to see if we need to upgrade:
@@ -3679,7 +3682,7 @@ bool static ConnectTip(CValidationState& state, CBlockIndex* pindexNew, const CB
int64_t nTime6 = GetTimeMicros();
nTimePostConnect += nTime6 - nTime5;
nTimeTotal += nTime6 - nTime1;
LogPrint("bench", " - Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001);
LogPrint("bench", "- Connect postprocess: %.2fms [%.2fs]\n", (nTime6 - nTime5) * 0.001, nTimePostConnect * 0.000001);
LogPrint("bench", "- Connect block: %.2fms [%.2fs]\n", (nTime6 - nTime1) * 0.001, nTimeTotal * 0.000001);

return true;
@@ -4972,8 +4975,8 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
CAmount stakedBalance;

if (!CheckProofOfStake(block, hashProofOfStake, listStake, stakedBalance)){
if (nHeight < 493000)
return state.DoS(1, error("%s: proof of stake check failed", __func__));
if (IsInitialBlockDownload())
return state.DoS(0, error("%s: proof of stake check failed", __func__));
return state.DoS(100, error("%s: proof of stake check failed", __func__));
}

@@ -5034,7 +5037,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
}

if (fDebug) {
LogPrintf("AcceptBlock block: %d<-- \n",nHeight);
LogPrintf("AcceptBlock block: %d \n",nHeight);
}
return true;
}
@@ -6530,7 +6533,7 @@ bool static ProcessMessageGetHeaders(CNode* pfrom, string strCommand, CDataStrea
// we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end
vector<CBlock> vHeaders;
int nLimit = MAX_HEADERS_RESULTS;
if (pindex != NULL)
if (pindex != NULL)
LogPrint("net", "getheaders for block %d with hash %s from peerId=%d\n", pindex->nHeight, (locator.IsNull() ? hashStop.ToString() : pindex->GetBlockHash().ToString()), pfrom->id);
for (; pindex; pindex = chainActive.Next(pindex)) {
vHeaders.push_back(pindex->GetBlockHeader());

0 comments on commit 5905d17

Please sign in to comment.
You can’t perform that action at this time.