diff --git a/README.md b/README.md index 218c98f6c3..a842fbbae1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Zcoin v0.13.7.2 -============= +Zcoin v0.13.7.3 +=============== [![Build Status](https://travis-ci.com/zcoinofficial/zcoin.svg?branch=CI)](https://travis-ci.com/zcoinofficial/zcoin) diff --git a/configure.ac b/configure.ac index 462f7cac4b..ff2675e666 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 13) define(_CLIENT_VERSION_REVISION, 7) -define(_CLIENT_VERSION_BUILD, 2) +define(_CLIENT_VERSION_BUILD, 3) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/src/miner.cpp b/src/miner.cpp index d4e6fc16f6..e6ed50a9aa 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -915,15 +915,6 @@ void BlockAssembler::addPriorityTxs() typedef std::map::iterator waitPriIter; double actualPriority = -1; - unsigned int COUNT_SPEND_ZC_TX = 0; - unsigned int MAX_SPEND_ZC_TX_PER_BLOCK = 0; - if (chainActive.Height() + 1 > HF_ZEROSPEND_FIX) { - MAX_SPEND_ZC_TX_PER_BLOCK = 1; - } - if (nHeight + 1 > SWITCH_TO_MORE_SPEND_TXS) { - MAX_SPEND_ZC_TX_PER_BLOCK = ZC_SPEND_LIMIT; - } - vecPriority.reserve(mempool.mapTx.size()); for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin(); mi != mempool.mapTx.end(); ++mi) @@ -937,11 +928,6 @@ void BlockAssembler::addPriorityTxs() if (tx.IsCoinBase() || !CheckFinalTx(tx)) continue; if (tx.IsZerocoinSpend()) { - - if ((COUNT_SPEND_ZC_TX + tx.vin.size()) > MAX_SPEND_ZC_TX_PER_BLOCK) { - continue; - } - //mempool.countZCSpend--; // Size limits unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); @@ -970,7 +956,6 @@ void BlockAssembler::addPriorityTxs() ++nBlockTx; nBlockSigOpsCost += nTxSigOps; nFees += nTxFees; - COUNT_SPEND_ZC_TX+=tx.vin.size(); continue; } } diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 717f3aa0da..4157a152f5 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -645,15 +645,6 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) UniValue transactions(UniValue::VARR); map setTxIndex; int i = 0; - unsigned int COUNT_SPEND_ZC_TX = 0; - unsigned int MAX_SPEND_ZC_TX_PER_BLOCK = 0; - if(chainActive.Height() + 1 > OLD_LIMIT_SPEND_TXS){ - MAX_SPEND_ZC_TX_PER_BLOCK = 0; - } - - if(chainActive.Height() + 1 > SWITCH_TO_MORE_SPEND_TXS){ - MAX_SPEND_ZC_TX_PER_BLOCK = 5; - } BOOST_FOREACH (CTransaction& tx, pblock->vtx) { uint256 txHash = tx.GetHash(); @@ -662,17 +653,6 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) if (tx.IsCoinBase()) continue; - // https://github.com/zcoinofficial/zcoin/pull/26 - // make order independence - // and easy to read for other people - if (tx.IsZerocoinSpend()) { - if (COUNT_SPEND_ZC_TX >= MAX_SPEND_ZC_TX_PER_BLOCK) { - continue; - } - - COUNT_SPEND_ZC_TX++; - } - UniValue entry(UniValue::VOBJ); entry.push_back(Pair("data", EncodeHexTx(tx))); diff --git a/src/versionbits.cpp b/src/versionbits.cpp index bf32ae6627..7a4ed64772 100644 --- a/src/versionbits.cpp +++ b/src/versionbits.cpp @@ -18,6 +18,10 @@ const struct BIP9DeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION { /*.name =*/ "segwit", /*.gbt_force =*/ false, + }, + { + /*.name =*/ "mtp", + /*.gbt_force=*/ true } };