@@ -1487,7 +1487,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
14871487
14881488 bool ignoreFees = false ;
14891489 bool fMissingInputs = false ;
1490- bool fMissingZerocoinInputs = false ;
14911490 CValidationState state;
14921491
14931492 mapAlreadyAskedFor.erase (inv);
@@ -1498,7 +1497,7 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
14981497 LogPrint (BCLog::NET, " misbehaving peer, received a zc transaction, peer: %s\n " , pfrom->GetAddrName ());
14991498 }
15001499
1501- if (!tx. HasZerocoinSpendInputs () && AcceptToMemoryPool (mempool, state, ptx, true , &fMissingInputs , false , ignoreFees)) {
1500+ if (AcceptToMemoryPool (mempool, state, ptx, true , &fMissingInputs , false , ignoreFees)) {
15021501 mempool.check (pcoinsTip);
15031502 RelayTransaction (tx, connman);
15041503 for (unsigned int i = 0 ; i < tx.vout .size (); i++) {
@@ -1559,14 +1558,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
15591558
15601559 for (uint256& hash : vEraseQueue) EraseOrphanTx (hash);
15611560
1562- } else if (tx.HasZerocoinSpendInputs () && AcceptToMemoryPool (mempool, state, ptx, true , &fMissingZerocoinInputs , false , false , ignoreFees)) {
1563- // Presstab: ZCoin has a bunch of code commented out here. Is this something that should have more going on?
1564- // Also there is nothing that handles fMissingZerocoinInputs. Does there need to be?
1565- RelayTransaction (tx, connman);
1566- LogPrint (BCLog::MEMPOOL, " AcceptToMemoryPool: Zerocoinspend peer=%d %s : accepted %s (poolsz %u)\n " ,
1567- pfrom->id , pfrom->cleanSubVer ,
1568- tx.GetHash ().ToString (),
1569- mempool.mapTx .size ());
15701561 } else if (fMissingInputs ) {
15711562 bool fRejectedParents = false ; // It may be the case that the orphans parents have all been rejected
15721563 for (const CTxIn& txin : ptx->vin ) {
0 commit comments