Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin

This commit is contained in:
Gavin Andresen
2011-09-01 11:52:07 -04:00
13 changed files with 632 additions and 482 deletions

View File

@@ -22,14 +22,14 @@ set<CWallet*> setpwalletRegistered;
CCriticalSection cs_main;
map<uint256, CTransaction> mapTransactions;
static map<uint256, CTransaction> mapTransactions;
CCriticalSection cs_mapTransactions;
unsigned int nTransactionsUpdated = 0;
map<COutPoint, CInPoint> mapNextTx;
map<uint256, CBlockIndex*> mapBlockIndex;
uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
const int nTotalBlocksEstimate = 140700; // Conservative estimate of total nr of blocks on main chain
const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download"
CBlockIndex* pindexGenesisBlock = NULL;