neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove redundant parameter fCheckDuplicateInputs from CheckTransaction

Browse Source
This commit is contained in:
UdjinM6 2018-09-19 00:29:35 +03:00
parent d3b30e9b2f
commit f9e49c0c86
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/validation.cpp
View File

@ -507,7 +507,7 @@ int GetUTXOConfirmations(const COutPoint& outpoint)
} }
bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fCheckDuplicateInputs) bool CheckTransaction(const CTransaction& tx, CValidationState &state)
{ {
// Basic checks that don't depend on any context // Basic checks that don't depend on any context
if (tx.vin.empty()) if (tx.vin.empty())
@ -531,14 +531,12 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe
return state.DoS(100, false, REJECT_INVALID, "bad-txns-txouttotal-toolarge"); return state.DoS(100, false, REJECT_INVALID, "bad-txns-txouttotal-toolarge");
} }
// Check for duplicate inputs - note that this check is slow so we skip it in CheckBlock // Check for duplicate inputs
if (fCheckDuplicateInputs) { std::set<COutPoint> vInOutPoints;
std::set<COutPoint> vInOutPoints; for (const auto& txin : tx.vin)
for (const auto& txin : tx.vin) {
{ if (!vInOutPoints.insert(txin.prevout).second)
if (!vInOutPoints.insert(txin.prevout).second) return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
return state.DoS(100, false, REJECT_INVALID, "bad-txns-inputs-duplicate");
}
} }
if (tx.IsCoinBase()) if (tx.IsCoinBase())
@ -3366,7 +3364,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
// Check transactions // Check transactions
for (const auto& tx : block.vtx) for (const auto& tx : block.vtx)
if (!CheckTransaction(*tx, state, true)) if (!CheckTransaction(*tx, state))
return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(), return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage())); strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));

2
src/validation.h
View File

@ -386,7 +386,7 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
/** Transaction validation functions */ /** Transaction validation functions */
/** Context-independent validity checks */ /** Context-independent validity checks */
bool CheckTransaction(const CTransaction& tx, CValidationState& state, bool fCheckDuplicateInputs=true); bool CheckTransaction(const CTransaction& tx, CValidationState& state);
namespace Consensus { namespace Consensus {