diff options
Diffstat (limited to 'src/policy/policy.cpp')
| -rw-r--r-- | src/policy/policy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 0a79c0a1d8..fc890bff38 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -67,7 +67,7 @@ bool IsDust(const CTxOut& txout, const CFeeRate& dustRelayFeeIn) return (txout.nValue < GetDustThreshold(txout, dustRelayFeeIn)); } -bool IsStandard(const CScript& scriptPubKey, TxoutType& whichType) +bool IsStandard(const CScript& scriptPubKey, const std::optional<unsigned>& max_datacarrier_bytes, TxoutType& whichType) { std::vector<std::vector<unsigned char> > vSolutions; whichType = Solver(scriptPubKey, vSolutions); @@ -83,7 +83,7 @@ bool IsStandard(const CScript& scriptPubKey, TxoutType& whichType) if (m < 1 || m > n) return false; } else if (whichType == TxoutType::NULL_DATA) { - if (!g_max_datacarrier_bytes || scriptPubKey.size() > *g_max_datacarrier_bytes) { + if (!max_datacarrier_bytes || scriptPubKey.size() > *max_datacarrier_bytes) { return false; } } @@ -131,7 +131,7 @@ bool IsStandardTx(const CTransaction& tx, bool permit_bare_multisig, const CFeeR unsigned int nDataOut = 0; TxoutType whichType; for (const CTxOut& txout : tx.vout) { - if (!::IsStandard(txout.scriptPubKey, whichType)) { + if (!::IsStandard(txout.scriptPubKey, g_max_datacarrier_bytes, whichType)) { reason = "scriptpubkey"; return false; } |