diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-27 11:19:57 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-27 11:19:57 -0400 |
| commit | a8c108bca1a2e67bd7c335119d9b04c87552c159 (patch) | |
| tree | b4a5bbd7d4be7272aafbec877378fd465376fffc /src/main.cpp | |
| parent | 9a1ce869690fe87fbce169a4b685695dc9e575f6 (diff) | |
| download | bitcoin-a8c108bca1a2e67bd7c335119d9b04c87552c159.tar.xz | |
Remove DoS penalty for SigOpCount or immature transactions
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index be6fc9c53f..f129d7c7b1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -364,7 +364,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi // 34 bytes because a TxOut is: // 20-byte address + 8 byte bitcoin amount + 5 bytes of ops + 1 byte script length if (GetSigOpCount() > nSize / 34 || nSize < 100) - return DoS(10, error("AcceptToMemoryPool() : transaction with out-of-bounds SigOpCount")); + return error("AcceptToMemoryPool() : transaction with out-of-bounds SigOpCount"); // Rather not work on nonstandard transactions (unless -testnet) if (!fTestNet && !IsStandard()) @@ -864,7 +864,7 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, map<uint256, CTxIndex>& mapTestPoo if (txPrev.IsCoinBase()) for (CBlockIndex* pindex = pindexBlock; pindex && pindexBlock->nHeight - pindex->nHeight < COINBASE_MATURITY; pindex = pindex->pprev) if (pindex->nBlockPos == txindex.pos.nBlockPos && pindex->nFile == txindex.pos.nFile) - return DoS(10, error("ConnectInputs() : tried to spend coinbase at depth %d", pindexBlock->nHeight - pindex->nHeight)); + return error("ConnectInputs() : tried to spend coinbase at depth %d", pindexBlock->nHeight - pindex->nHeight); // Skip ECDSA signature verification when connecting blocks (fBlock=true) during initial download // (before the last blockchain checkpoint). This is safe because block merkle hashes are |