@@ -507,7 +507,7 @@ void UpdateMempoolForReorg(DisconnectedBlockTransactions &disconnectpool, bool f
507
507
508
508
// Used to avoid mempool polluting consensus critical paths if CCoinsViewMempool
509
509
// were somehow broken and returning the wrong scriptPubKeys
510
- static bool CheckInputsFromMempoolAndCache (const CTransaction& tx, CValidationState & state, const CCoinsViewCache & view, CTxMemPool& pool,
510
+ static bool CheckInputsFromMempoolAndCache (const CTransaction& tx, CValidationState& state, const CCoinsViewCache& view, const CTxMemPool& pool,
511
511
unsigned int flags, bool cacheSigStore, PrecomputedTransactionData& txdata) {
512
512
AssertLockHeld (cs_main);
513
513
@@ -917,8 +917,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
917
917
// invalid blocks (using TestBlockValidity), however allowing such
918
918
// transactions into the mempool can be exploited as a DoS attack.
919
919
unsigned int currentBlockScriptVerifyFlags = GetBlockScriptFlags (chainActive.Tip (), Params ().GetConsensus ());
920
- if (!CheckInputsFromMempoolAndCache (tx, state, view, pool, currentBlockScriptVerifyFlags, true , txdata))
921
- {
920
+ if (!CheckInputsFromMempoolAndCache (tx, state, view, pool, currentBlockScriptVerifyFlags, true , txdata)) {
922
921
// If we're using promiscuousmempoolflags, we may hit this normally
923
922
// Check if current block has some flags that scriptVerifyFlags
924
923
// does not before printing an ominous warning
0 commit comments