highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-01 03:16:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

policy: Treat taproot as always active

Browse Source
This commit is contained in:
MarcoFalke
2021-11-15 10:56:16 +01:00
parent 15d109802a
commit fa3e0da06b
13 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/validation.cpp
View File

@@ -723,8 +723,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
}
// Check for non-standard pay-to-script-hash in inputs
const bool taproot_active = DeploymentActiveAfter(m_active_chainstate.m_chain.Tip(), args.m_chainparams.GetConsensus(), Consensus::DEPLOYMENT_TAPROOT);
if (fRequireStandard && !AreInputsStandard(tx, m_view, taproot_active)) {
if (fRequireStandard && !AreInputsStandard(tx, m_view)) {
return state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs");
}