Skip to content

Commit

Permalink
Merge pull request #4 from singula/0.7
Browse files Browse the repository at this point in the history
Fix difference in TX criteria causing a fork
  • Loading branch information
kalgecin committed Jun 4, 2015
2 parents 808940c + a179feb commit e67d13b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,9 @@ bool CTransaction::CheckTransaction() const
const CTxOut& txout = vout[i];
if (txout.IsEmpty() && !IsCoinBase() && !IsCoinStake())
return DoS(100, error("CTransaction::CheckTransaction() : txout empty for user transaction"));
// // cachecoin: enforce minimum output amount
// if ((!txout.IsEmpty()) && txout.nValue < MIN_TXOUT_AMOUNT)
// return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue below minimum"));
// cachecoin: enforce minimum output amount
if ((!txout.IsEmpty()) && txout.nValue < MIN_TXOUT_AMOUNT)
return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue below minimum"));
if (txout.nValue > MAX_MONEY)
return DoS(100, error("CTransaction::CheckTransaction() : txout.nValue too high"));
nValueOut += txout.nValue;
Expand Down

0 comments on commit e67d13b

Please sign in to comment.