zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2000 from Diapolo/fix_indentation 

fix some missing indentations in main.cpp for better readability
This commit is contained in:
Pieter Wuille 2012-11-11 02:23:10 -08:00
parent 6ca2ea2fa2 b56585d067
commit 337f876cbb
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/main.cpp
View File

@ -2018,52 +2018,51 @@ bool CBlock::AcceptBlock(CDiskBlockPos *dbp)
CBlockIndex* pindexPrev = NULL; CBlockIndex* pindexPrev = NULL;
int nHeight = 0; int nHeight = 0;
if (hash != hashGenesisBlock) { if (hash != hashGenesisBlock) {
map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock);
if (mi == mapBlockIndex.end())
return DoS(10, error("AcceptBlock() : prev block not found"));
pindexPrev = (*mi).second;
nHeight = pindexPrev->nHeight+1;
map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock); // Check proof of work
if (mi == mapBlockIndex.end()) if (nBits != GetNextWorkRequired(pindexPrev, this))
return DoS(10, error("AcceptBlock() : prev block not found")); return DoS(100, error("AcceptBlock() : incorrect proof of work"));
pindexPrev = (*mi).second;
nHeight = pindexPrev->nHeight+1;
// Check proof of work // Check timestamp against prev
if (nBits != GetNextWorkRequired(pindexPrev, this)) if (GetBlockTime() <= pindexPrev->GetMedianTimePast())
return DoS(100, error("AcceptBlock() : incorrect proof of work")); return error("AcceptBlock() : block's timestamp is too early");
// Check timestamp against prev // Check that all transactions are finalized
if (GetBlockTime() <= pindexPrev->GetMedianTimePast()) BOOST_FOREACH(const CTransaction& tx, vtx)
return error("AcceptBlock() : block's timestamp is too early"); if (!tx.IsFinal(nHeight, GetBlockTime()))
return DoS(10, error("AcceptBlock() : contains a non-final transaction"));
// Check that all transactions are finalized // Check that the block chain matches the known block chain up to a checkpoint
BOOST_FOREACH(const CTransaction& tx, vtx) if (!Checkpoints::CheckBlock(nHeight, hash))
if (!tx.IsFinal(nHeight, GetBlockTime())) return DoS(100, error("AcceptBlock() : rejected by checkpoint lock-in at %d", nHeight));
return DoS(10, error("AcceptBlock() : contains a non-final transaction"));
// Check that the block chain matches the known block chain up to a checkpoint // Reject block.nVersion=1 blocks when 95% (75% on testnet) of the network has upgraded:
if (!Checkpoints::CheckBlock(nHeight, hash)) if (nVersion < 2)
return DoS(100, error("AcceptBlock() : rejected by checkpoint lock-in at %d", nHeight));
// Reject block.nVersion=1 blocks when 95% (75% on testnet) of the network has upgraded:
if (nVersion < 2)
{
if ((!fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 950, 1000)) ||
(fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 75, 100)))
{ {
return error("AcceptBlock() : rejected nVersion=1 block"); if ((!fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 950, 1000)) ||
(fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 75, 100)))
{
return error("AcceptBlock() : rejected nVersion=1 block");
}
} }
} // Enforce block.nVersion=2 rule that the coinbase starts with serialized block height
// Enforce block.nVersion=2 rule that the coinbase starts with serialized block height if (nVersion >= 2)
if (nVersion >= 2)
{
// if 750 of the last 1,000 blocks are version 2 or greater (51/100 if testnet):
if ((!fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 750, 1000)) ||
(fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 51, 100)))
{ {
CScript expect = CScript() << nHeight; // if 750 of the last 1,000 blocks are version 2 or greater (51/100 if testnet):
if (!std::equal(expect.begin(), expect.end(), vtx[0].vin[0].scriptSig.begin())) if ((!fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 750, 1000)) ||
return DoS(100, error("AcceptBlock() : block height mismatch in coinbase")); (fTestNet && CBlockIndex::IsSuperMajority(2, pindexPrev, 51, 100)))
{
CScript expect = CScript() << nHeight;
if (!std::equal(expect.begin(), expect.end(), vtx[0].vin[0].scriptSig.begin()))
return DoS(100, error("AcceptBlock() : block height mismatch in coinbase"));
}
} }
} }
}
// Write block to history file // Write block to history file
unsigned int nBlockSize = ::GetSerializeSize(*this, SER_DISK, CLIENT_VERSION); unsigned int nBlockSize = ::GetSerializeSize(*this, SER_DISK, CLIENT_VERSION);