diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 11:40:22 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:23:36 +0200 |
| commit | fa9cba7afb73c01bd2c8fefd662dfc80dd98c5e8 (patch) | |
| tree | 6783bc418a352986a77e9e2b37b844523ddf9e02 /src/policy | |
| parent | fa148602e67fe035b1b21eff6c0b656919ac2d45 (diff) | |
| download | bitcoin-fa9cba7afb73c01bd2c8fefd662dfc80dd98c5e8.tar.xz | |
Remove ::incrementalRelayFee and ::minRelayTxFee globals
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.h | 4 | ||||
| -rw-r--r-- | src/policy/settings.cpp | 2 | ||||
| -rw-r--r-- | src/policy/settings.h | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index cd98a601a3..15a66efa0d 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -47,8 +47,8 @@ static constexpr unsigned int MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE{80}; static constexpr unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE{3600}; /** The maximum size of a standard ScriptSig */ static constexpr unsigned int MAX_STANDARD_SCRIPTSIG_SIZE{1650}; -/** Min feerate for defining dust. Historically this has been based on the - * minRelayTxFee, however changing the dust limit changes which transactions are +/** Min feerate for defining dust. + * Changing the dust limit changes which transactions are * standard and should be done with care and ideally rarely. It makes sense to * only increase the dust limit after prior releases were already not creating * outputs below the new threshold */ diff --git a/src/policy/settings.cpp b/src/policy/settings.cpp index 0b67d274ce..a4177f7184 100644 --- a/src/policy/settings.cpp +++ b/src/policy/settings.cpp @@ -9,7 +9,5 @@ #include <policy/policy.h> bool fIsBareMultisigStd = DEFAULT_PERMIT_BAREMULTISIG; -CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE); CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE); -CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP; diff --git a/src/policy/settings.h b/src/policy/settings.h index 2311d01fe8..eb26a825a8 100644 --- a/src/policy/settings.h +++ b/src/policy/settings.h @@ -14,11 +14,7 @@ class CTransaction; -// Policy settings which are configurable at runtime. -extern CFeeRate incrementalRelayFee; extern CFeeRate dustRelayFee; -/** A fee rate smaller than this is considered zero fee (for relaying, mining and transaction creation) */ -extern CFeeRate minRelayTxFee; extern unsigned int nBytesPerSigOp; extern bool fIsBareMultisigStd; |