diff options
| author | Alex Morcos <morcos@chaincode.com> | 2016-12-13 13:43:35 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-01-16 08:39:03 -0500 |
| commit | 7b1add3c28aae8caf2e1517f15cd953eacbb4931 (patch) | |
| tree | 275ed3876e984eaa5ffa35ac2780dfc6fb420b78 /src/policy | |
| parent | daec955fd68bd0da036a5b446b54ffb01108adcd (diff) | |
| download | bitcoin-7b1add3c28aae8caf2e1517f15cd953eacbb4931.tar.xz | |
Introduce -incrementalrelayfee
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.cpp | 1 | ||||
| -rw-r--r-- | src/policy/policy.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index d318a0997c..4dacd6b545 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -206,6 +206,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) return true; } +CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE); unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP; int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost) diff --git a/src/policy/policy.h b/src/policy/policy.h index 5c6a7b1865..039122a59e 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -30,6 +30,8 @@ static const unsigned int MAX_P2SH_SIGOPS = 15; static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5; /** Default for -maxmempool, maximum megabytes of mempool memory usage */ static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300; +/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/ +static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000; /** Default for -bytespersigop */ static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20; /** The maximum number of witness stack items in a standard P2WSH script */ @@ -85,6 +87,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) */ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs); +extern CFeeRate incrementalRelayFee; extern unsigned int nBytesPerSigOp; /** Compute the virtual transaction size (weight reinterpreted as bytes). */ |