increase maximum spending transactions per block to 5 since block 58500

firoorg · Oct 16, 2017 · 2a9d2a2 · 2a9d2a2
1 parent 89f9179
commit 2a9d2a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -212,6 +212,9 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
     if(fTestNet || nHeight > 22000){
         MAX_SPEND_ZC_TX_PER_BLOCK = 1;
     }
+    if(fTestNet || nHeight > 58500){
+        MAX_SPEND_ZC_TX_PER_BLOCK = 5;
+    }
 
     // Collect memory pool transactions into the block
     CTxMemPool::setEntries inBlock;
@@ -943,6 +946,9 @@ void BlockAssembler::addPriorityTxs()
     if (nHeight + 1 > 22000) {
         MAX_SPEND_ZC_TX_PER_BLOCK = 1;
     }
+    if (nHeight + 1 > 58500) {
+        MAX_SPEND_ZC_TX_PER_BLOCK = 5;
+    }
 
     vecPriority.reserve(mempool.mapTx.size());
     for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -630,6 +630,10 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     if(chainActive.Height() + 1 > 22000){
         MAX_SPEND_ZC_TX_PER_BLOCK = 1;
     }
+
+    if(chainActive.Height() + 1 > 58500){
+        MAX_SPEND_ZC_TX_PER_BLOCK = 5;
+    }
     BOOST_FOREACH (CTransaction& tx, pblock->vtx) {
         uint256 txHash = tx.GetHash();
         setTxIndex[txHash] = i++;