diff options
| author | Matt Corallo <matt@bluematt.me> | 2012-07-04 00:04:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-07-04 00:04:57 -0400 |
| commit | 96929a5515bb0ffee67aab7283b5ae9fcc1641d5 (patch) | |
| tree | 66215f6328fd1a9fc6cc6c5d0a8b847b6b4653ce | |
| parent | c729dbb6d2b63d9c0b32e3937be0ebf528d4c753 (diff) | |
| download | bitcoin-96929a5515bb0ffee67aab7283b5ae9fcc1641d5.tar.xz | |
Remove duplicate GetHash() in ConnectBlock
| -rw-r--r-- | src/main.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/main.cpp b/src/main.cpp index d2cb154c1f..c1ca96bfd2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1325,19 +1325,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool // already refuses previously-known transaction id's entirely. // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC. - if (pindex->nTime > 1331769600) - { - BOOST_FOREACH(CTransaction& tx, vtx) - { - CTxIndex txindexOld; - if (txdb.ReadTxIndex(tx.GetHash(), txindexOld)) - { - BOOST_FOREACH(CDiskTxPos &pos, txindexOld.vSpent) - if (pos.IsNull()) - return false; - } - } - } + int64 nBIP30SwitchTime = 1331769600; + bool fEnforceBIP30 = (pindex->nTime > nBIP30SwitchTime); // BIP16 didn't become active until Apr 1 2012 int64 nBIP16SwitchTime = 1333238400; @@ -1351,6 +1340,17 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) unsigned int nSigOps = 0; BOOST_FOREACH(CTransaction& tx, vtx) { + uint256 hashTx = tx.GetHash(); + + if (fEnforceBIP30) { + CTxIndex txindexOld; + if (txdb.ReadTxIndex(hashTx, txindexOld)) { + BOOST_FOREACH(CDiskTxPos &pos, txindexOld.vSpent) + if (pos.IsNull()) + return false; + } + } + nSigOps += tx.GetLegacySigOpCount(); if (nSigOps > MAX_BLOCK_SIGOPS) return DoS(100, error("ConnectBlock() : too many sigops")); @@ -1381,7 +1381,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) return false; } - mapQueuedChanges[tx.GetHash()] = CTxIndex(posThisTx, tx.vout.size()); + mapQueuedChanges[hashTx] = CTxIndex(posThisTx, tx.vout.size()); } // Write queued txindex changes |