Merge 7cb85f19c4 into merged_master (Elements PR #1477)

This commit is contained in:
Byron Hambly 2025-08-08 08:50:30 +02:00
commit bce7648fca
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
2 changed files with 2 additions and 5 deletions

View file

@ -1130,10 +1130,6 @@ bool MemPoolAccept::PolicyScriptChecks(const ATMPArgs& args, Workspace& ws)
scriptVerifyFlags |= SCRIPT_SIGHASH_RANGEPROOF;
}
if (DeploymentActiveAfter(m_active_chainstate.m_chain.Tip(), m_active_chainstate.m_chainman, Consensus::DEPLOYMENT_SIMPLICITY)) {
scriptVerifyFlags |= SCRIPT_VERIFY_SIMPLICITY;
}
// Check input scripts and signatures.
// This is done last to help prevent CPU exhaustion denial-of-service attacks.
if (!CheckInputScripts(tx, state, m_view, scriptVerifyFlags, true, false, ws.m_precomputed_txdata)) {