Merge pull request #70 from aizensou/master

Urgent fix for pool owners to prevent malicious zerospend txs
firoorg · Feb 18, 2017 · 81a6678 · 81a6678
2 parents 33796c8 + b20c177
commit 81a6678
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -5913,7 +5913,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
     nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
 
     unsigned int COUNT_SPEND_ZC_TX = 0;
-    unsigned int MAX_SPEND_ZC_TX_PER_BLOCK = 1;
+    unsigned int MAX_SPEND_ZC_TX_PER_BLOCK = 0;
 
     // Collect memory pool transactions into the block
     int64 nFees = 0;

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
@@ -503,7 +503,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
     map<uint256, int64_t> setTxIndex;
     int i = 0;
     unsigned int COUNT_SPEND_ZC_TX = 0;
-    unsigned int MAX_SPEND_ZC_TX_PER_BLOCK = 1;
+    unsigned int MAX_SPEND_ZC_TX_PER_BLOCK = 0;
     BOOST_FOREACH (CTransaction& tx, pblock->vtx)
     {
         uint256 txHash = tx.GetHash();