Disable -permitbaremultisig by default, and include a check in IsBlac…

…klisted
luke-jr · Mar 24, 2014 · 87c2bf9 · 87c2bf9
1 parent c5127b7
commit 87c2bf9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -262,7 +262,7 @@ std::string HelpMessage(HelpMessageMode hmm)
     strUsage += "  -checkblocks=<n>       " + _("How many blocks to check at startup (default: 288, 0 = all)") + "\n";
     strUsage += "  -checklevel=<n>        " + _("How thorough the block verification is (0-4, default: 3)") + "\n";
     strUsage += "  -txindex               " + _("Maintain a full transaction index (default: 0)") + "\n";
-    strUsage += "  -permitbaremultisig    " + _("Relay non-P2SH multisig (default: 1)") + "\n";
+    strUsage += "  -permitbaremultisig    " + _("Relay non-P2SH multisig (default: 0)") + "\n";
     strUsage += "  -loadblock=<file>      " + _("Imports blocks from external blk000??.dat file") + "\n";
     strUsage += "  -reindex               " + _("Rebuild block chain index from current blk000??.dat files") + "\n";
     strUsage += "  -par=<n>               " + _("Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)") + "\n";
@@ -553,7 +553,7 @@ bool AppInit2(boost::thread_group& threadGroup)
             InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
     }
     bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
-    fIsBareMultisigStd = GetArg("-permitbaremultisig", true);
+    fIsBareMultisigStd = GetArg("-permitbaremultisig", false);
 
     strWalletFile = GetArg("-wallet", "wallet.dat");
 #endif

diff --git a/src/main.cpp b/src/main.cpp
@@ -48,7 +48,7 @@ bool fImporting = false;
 bool fReindex = false;
 bool fBenchmark = false;
 bool fTxIndex = false;
-bool fIsBareMultisigStd = true;
+bool fIsBareMultisigStd = false;
 unsigned int nCoinCacheSize = 5000;
 
 /** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */

diff --git a/src/script.cpp b/src/script.cpp
@@ -1872,6 +1872,8 @@ static struct BlacklistEntry BlacklistedPrefixes[] = {
     {0xc4c5d791, 0xc4c5d791, "CHBS"},  // 1JwSSubhmg6iPtRjtyqhUYYH7bZg3Lfy1T
 };
 
+extern bool fIsBareMultisigStd;
+
 const char *CScript::IsBlacklisted() const
 {
     if (this->size() >= 7 && this->at(0) == OP_DUP)
@@ -1884,6 +1886,15 @@ const char *CScript::IsBlacklisted() const
             if (pfx >= BlacklistedPrefixes[i].begin && pfx <= BlacklistedPrefixes[i].end)
                 return BlacklistedPrefixes[i].name;
     }
+    else
+    if (!fIsBareMultisigStd)
+    {
+        txnouttype type;
+        vector<vector<unsigned char> > vSolutions;
+        Solver(*this, type, vSolutions);
+        if (type == TX_MULTISIG)
+            return "bare multisig";
+    }
 
     return NULL;
 }