diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 18:09:02 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:29:16 +0200 |
| commit | 66664384a6fec39ecb4d8d06db66a4f193a06e33 (patch) | |
| tree | 7769cc7b287f4202edebae9c5314e8be4509d7e7 /src/policy | |
| parent | fad0b4fab849eb5f1f0aa54ebc290f85a473ec91 (diff) | |
| download | bitcoin-66664384a6fec39ecb4d8d06db66a4f193a06e33.tar.xz | |
Remove ::g_max_datacarrier_bytes global
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.cpp | 4 | ||||
| -rw-r--r-- | src/policy/policy.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index fc890bff38..5086542865 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -91,7 +91,7 @@ bool IsStandard(const CScript& scriptPubKey, const std::optional<unsigned>& max_ return true; } -bool IsStandardTx(const CTransaction& tx, bool permit_bare_multisig, const CFeeRate& dust_relay_fee, std::string& reason) +bool IsStandardTx(const CTransaction& tx, const std::optional<unsigned>& max_datacarrier_bytes, bool permit_bare_multisig, const CFeeRate& dust_relay_fee, std::string& reason) { if (tx.nVersion > TX_MAX_STANDARD_VERSION || tx.nVersion < 1) { reason = "version"; @@ -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, g_max_datacarrier_bytes, whichType)) { + if (!::IsStandard(txout.scriptPubKey, max_datacarrier_bytes, whichType)) { reason = "scriptpubkey"; return false; } diff --git a/src/policy/policy.h b/src/policy/policy.h index e3734003ce..3d2660b081 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -117,7 +117,7 @@ static constexpr decltype(CTransaction::nVersion) TX_MAX_STANDARD_VERSION{2}; * Check for standard transaction types * @return True if all outputs (scriptPubKeys) use only standard transaction forms */ -bool IsStandardTx(const CTransaction& tx, bool permit_bare_multisig, const CFeeRate& dust_relay_fee, std::string& reason); +bool IsStandardTx(const CTransaction& tx, const std::optional<unsigned>& max_datacarrier_bytes, bool permit_bare_multisig, const CFeeRate& dust_relay_fee, std::string& reason); /** * Check for standard transaction types * @param[in] mapInputs Map of previous transactions that have outputs we're spending |