Rename IsConfirmed() to IsTrusted()

[novacoin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 6e7d2a4..c4f3d17 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -309,12 +309,18 @@ bool CTransaction::IsStandard() const
             return false;
         if (!txin.scriptSig.IsPushOnly())
             return false;
+        if (fEnforceCanonical && !txin.scriptSig.HasCanonicalPushes()) {
+            return false;
+        }
     }
     BOOST_FOREACH(const CTxOut& txout, vout) {
         if (!::IsStandard(txout.scriptPubKey))
             return false;
         if (txout.nValue == 0)
             return false;
+        if (fEnforceCanonical && !txout.scriptPubKey.HasCanonicalPushes()) {
+            return false;
+        }
     }
     return true;
 }