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

Merge branch 'bugfix_areinpstd' of https://github.com/luke-jr/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen 2012-01-23 13:09:34 -05:00
commit b8056dc5d0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@ -277,11 +277,8 @@ bool CTransaction::IsStandard() const
// //
bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const
{ {
if (fTestNet)
return true; // Allow non-standard on testnet
if (IsCoinBase()) if (IsCoinBase())
return true; // Coinbases are allowed to have any input return true; // Coinbases don't use vin normally
for (int i = 0; i < vin.size(); i++) for (int i = 0; i < vin.size(); i++)
{ {
@ -503,7 +500,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
} }
// Check for non-standard pay-to-script-hash in inputs // Check for non-standard pay-to-script-hash in inputs
if (!AreInputsStandard(mapInputs)) if (!AreInputsStandard(mapInputs) && !fTestNet)
return error("AcceptToMemoryPool() : nonstandard transaction input"); return error("AcceptToMemoryPool() : nonstandard transaction input");
int64 nFees = GetValueIn(mapInputs)-GetValueOut(); int64 nFees = GetValueIn(mapInputs)-GetValueOut();