Remove enforcecanonical option, it's always active from now.

diff --git a/src/init.cpp b/src/init.cpp
index 6243f40..37c43a5 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -31,7 +31,6 @@ CWallet* pwalletMain;
 CClientUIInterface uiInterface;
 std::string strWalletFileName;
 bool fConfChange;
-bool fEnforceCanonical;
 unsigned int nNodeLifespan;
 unsigned int nDerivationMethodIndex;
 unsigned int nMinerSleep;
@@ -293,7 +292,6 @@ std::string HelpMessage()
         "  -blocknotify=<cmd>     " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" +
         "  -walletnotify=<cmd>    " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" +
         "  -confchange            " + _("Require a confirmations for change (default: 0)") + "\n" +
-        "  -enforcecanonical      " + _("Enforce transaction scripts to use canonical PUSH operators (default: 1)") + "\n" +
         "  -upgradewallet         " + _("Upgrade wallet to latest format") + "\n" +
         "  -keypool=<n>           " + _("Set key pool size to <n> (default: 100)") + "\n" +
         "  -rescan                " + _("Rescan the block chain for missing wallet transactions") + "\n" +
@@ -475,7 +473,6 @@ bool AppInit2()
     }
 
     fConfChange = GetBoolArg("-confchange", false);
-    fEnforceCanonical = GetBoolArg("-enforcecanonical", true);
 
     if (mapArgs.count("-mininput"))
     {

diff --git a/src/main.cpp b/src/main.cpp
index cdc33c1..c434e7a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -311,7 +311,7 @@ bool CTransaction::IsStandard() const
             return false;
         if (!txin.scriptSig.IsPushOnly())
             return false;
-        if (fEnforceCanonical && !txin.scriptSig.HasCanonicalPushes()) {
+        if (!txin.scriptSig.HasCanonicalPushes()) {
             return false;
         }
     }
@@ -325,7 +325,7 @@ bool CTransaction::IsStandard() const
             if (txout.nValue == 0) {
                 return false;
             }
-            if (fEnforceCanonical && !txout.scriptPubKey.HasCanonicalPushes()) {
+            if (!txout.scriptPubKey.HasCanonicalPushes()) {
                 return false;
             }
         }

diff --git a/src/main.h b/src/main.h
index 84f93f7..7497bfa 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -88,8 +88,6 @@ extern int64 nMinimumInputValue;
 extern bool fUseFastIndex;
 extern unsigned int nDerivationMethodIndex;
 
-extern bool fEnforceCanonical;
-
 // Minimum disk space required - used in CheckDiskSpace()
 static const uint64 nMinDiskSpace = 52428800;