aboutsummaryrefslogtreecommitdiff
path: root/src/policy/policy.h
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-04-29 19:34:57 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-05-29 16:49:52 -0400
commitfa7a6cf1b36284db70e941bd2915fd6edbb0f9d6 (patch)
tree7a69ae65066c91fec3f7a0c23debf8905d793f55 /src/policy/policy.h
parent3a8e3f480612e29f5a8b208f31cedc687f66b9df (diff)
downloadbitcoin-fa7a6cf1b36284db70e941bd2915fd6edbb0f9d6.tar.xz
policy: Treat segwit as always active
Diffstat (limited to 'src/policy/policy.h')
-rw-r--r--src/policy/policy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 5ce019df4c..035627bd60 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -79,12 +79,12 @@ CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee);
bool IsDust(const CTxOut& txout, const CFeeRate& dustRelayFee);
-bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool witnessEnabled = false);
+bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
/**
* Check for standard transaction types
* @return True if all outputs (scriptPubKeys) use only standard transaction forms
*/
-bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnessEnabled = false);
+bool IsStandardTx(const CTransaction& tx, std::string& reason);
/**
* Check for standard transaction types
* @param[in] mapInputs Map of previous transactions that have outputs we're spending