Merge pull request #2186 from Diapolo/misc_stuff
small changes in init, main, checkpoints.h and bitcoin-qt.pro
This commit is contained in:
commit
0bd573d666
5 changed files with 19 additions and 23 deletions
|
@ -208,7 +208,8 @@ HEADERS += src/qt/bitcoingui.h \
|
|||
src/leveldb.h \
|
||||
src/threadsafety.h
|
||||
|
||||
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
|
||||
SOURCES += src/qt/bitcoin.cpp \
|
||||
src/qt/bitcoingui.cpp \
|
||||
src/qt/transactiontablemodel.cpp \
|
||||
src/qt/addresstablemodel.cpp \
|
||||
src/qt/optionsdialog.cpp \
|
||||
|
@ -272,11 +273,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
|
|||
src/leveldb.cpp \
|
||||
src/txdb.cpp
|
||||
|
||||
RESOURCES += \
|
||||
src/qt/bitcoin.qrc
|
||||
RESOURCES += src/qt/bitcoin.qrc
|
||||
|
||||
FORMS += \
|
||||
src/qt/forms/sendcoinsdialog.ui \
|
||||
FORMS += src/qt/forms/sendcoinsdialog.ui \
|
||||
src/qt/forms/addressbookpage.ui \
|
||||
src/qt/forms/signverifymessagedialog.ui \
|
||||
src/qt/forms/aboutdialog.ui \
|
||||
|
|
18
src/main.cpp
18
src/main.cpp
|
@ -455,8 +455,7 @@ bool CTransaction::AreInputsStandard(CCoinsViewCache& mapInputs) const
|
|||
return true;
|
||||
}
|
||||
|
||||
unsigned int
|
||||
CTransaction::GetLegacySigOpCount() const
|
||||
unsigned int CTransaction::GetLegacySigOpCount() const
|
||||
{
|
||||
unsigned int nSigOps = 0;
|
||||
BOOST_FOREACH(const CTxIn& txin, vin)
|
||||
|
@ -1177,7 +1176,7 @@ int GetNumBlocksOfPeers()
|
|||
|
||||
bool IsInitialBlockDownload()
|
||||
{
|
||||
if (pindexBest == NULL || nBestHeight < Checkpoints::GetTotalBlocksEstimate() || fReindex || fImporting)
|
||||
if (pindexBest == NULL || fImporting || fReindex || nBestHeight < Checkpoints::GetTotalBlocksEstimate())
|
||||
return true;
|
||||
static int64 nLastUpdate;
|
||||
static CBlockIndex* pindexLastBest;
|
||||
|
@ -1634,7 +1633,6 @@ bool CBlock::ConnectBlock(CValidationState &state, CBlockIndex* pindex, CCoinsVi
|
|||
vPos.reserve(vtx.size());
|
||||
for (unsigned int i=0; i<vtx.size(); i++)
|
||||
{
|
||||
|
||||
const CTransaction &tx = vtx[i];
|
||||
|
||||
nInputs += tx.vin.size();
|
||||
|
@ -2449,7 +2447,7 @@ bool AbortNode(const std::string &strMessage) {
|
|||
fRequestShutdown = true;
|
||||
strMiscWarning = strMessage;
|
||||
printf("*** %s\n", strMessage.c_str());
|
||||
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR | CClientUIInterface::MODAL);
|
||||
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR);
|
||||
StartShutdown();
|
||||
return false;
|
||||
}
|
||||
|
@ -2548,9 +2546,9 @@ bool static LoadBlockIndexDB()
|
|||
|
||||
// Load block file info
|
||||
pblocktree->ReadLastBlockFile(nLastBlockFile);
|
||||
printf("LoadBlockIndex(): last block file = %i\n", nLastBlockFile);
|
||||
printf("LoadBlockIndexDB(): last block file = %i\n", nLastBlockFile);
|
||||
if (pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile))
|
||||
printf("LoadBlockIndex(): last block file: %s\n", infoLastBlockFile.ToString().c_str());
|
||||
printf("LoadBlockIndexDB(): last block file info: %s\n", infoLastBlockFile.ToString().c_str());
|
||||
|
||||
// Load bnBestInvalidWork, OK if it doesn't exist
|
||||
pblocktree->ReadBestInvalidWork(bnBestInvalidWork);
|
||||
|
@ -2562,7 +2560,7 @@ bool static LoadBlockIndexDB()
|
|||
|
||||
// Check whether we have a transaction index
|
||||
pblocktree->ReadFlag("txindex", fTxIndex);
|
||||
printf("LoadBlockIndex(): transaction index %s\n", fTxIndex ? "enabled" : "disabled");
|
||||
printf("LoadBlockIndexDB(): transaction index %s\n", fTxIndex ? "enabled" : "disabled");
|
||||
|
||||
// Load hashBestChain pointer to end of best chain
|
||||
pindexBest = pcoinsTip->GetBestBlock();
|
||||
|
@ -2579,7 +2577,7 @@ bool static LoadBlockIndexDB()
|
|||
pindexPrev->pnext = pindex;
|
||||
pindex = pindexPrev;
|
||||
}
|
||||
printf("LoadBlockIndex(): hashBestChain=%s height=%d date=%s\n",
|
||||
printf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s\n",
|
||||
BlockHashStr(hashBestChain).c_str(), nBestHeight,
|
||||
DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str());
|
||||
|
||||
|
@ -2748,7 +2746,7 @@ bool InitBlockIndex() {
|
|||
CDiskBlockPos blockPos;
|
||||
CValidationState state;
|
||||
if (!FindBlockPos(state, blockPos, nBlockSize+8, 0, block.nTime))
|
||||
return error("AcceptBlock() : FindBlockPos failed");
|
||||
return error("LoadBlockIndex() : FindBlockPos failed");
|
||||
if (!block.WriteToDisk(blockPos))
|
||||
return error("LoadBlockIndex() : writing genesis block to disk failed");
|
||||
if (!block.AddToBlockIndex(state, blockPos))
|
||||
|
|
|
@ -28,7 +28,7 @@ struct CBlockIndexWorkComparator;
|
|||
static const unsigned int MAX_BLOCK_SIZE = 1000000;
|
||||
/** The maximum size for mined blocks */
|
||||
static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2;
|
||||
/** The maximum size for transactions we're willing to relay/mine **/
|
||||
/** The maximum size for transactions we're willing to relay/mine */
|
||||
static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5;
|
||||
/** The maximum allowed number of signature check operations in a block (network rule) */
|
||||
static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
|
||||
|
@ -118,7 +118,6 @@ class CValidationState;
|
|||
|
||||
struct CBlockTemplate;
|
||||
|
||||
|
||||
/** Register a wallet to receive updates from core */
|
||||
void RegisterWallet(CWallet* pwalletIn);
|
||||
/** Unregister a wallet from core */
|
||||
|
@ -1558,7 +1557,7 @@ public:
|
|||
}
|
||||
|
||||
std::string ToString() const {
|
||||
return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u..%u, time=%s..%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str());
|
||||
return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str());
|
||||
}
|
||||
|
||||
// update statistics (does not update nSize)
|
||||
|
|
Loading…
Reference in a new issue