Skip to content

Commit c82fbe7

Browse files
committed
Reduce wallet and relay min rate to 100 sat/vkB
1 parent 591a493 commit c82fbe7

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

src/policy/policy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern CAsset policyAsset;
2222
/** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/
2323
static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = MAX_BLOCK_WEIGHT - 4000;
2424
/** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/
25-
static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000;
25+
static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 100;
2626
/** The maximum weight for transactions we're willing to relay/mine */
2727
static const unsigned int MAX_STANDARD_TX_WEIGHT = 400000;
2828
/** The minimum non-witness size for transactions we're willing to relay/mine (1 segwit input + 1 P2WPKH output = 82 bytes) */
@@ -34,7 +34,7 @@ static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
3434
/** Default for -maxmempool, maximum megabytes of mempool memory usage */
3535
static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
3636
/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/
37-
static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000;
37+
static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 100;
3838
/** Default for -bytespersigop */
3939
static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
4040
/** The maximum number of witness stack items in a standard P2WSH script */

src/validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static const bool DEFAULT_WHITELISTRELAY = true;
5555
/** Default for -whitelistforcerelay. */
5656
static const bool DEFAULT_WHITELISTFORCERELAY = false;
5757
/** Default for -minrelaytxfee, minimum relay fee for transactions */
58-
static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
58+
static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 100;
5959
//! -maxtxfee default
6060
static const CAmount DEFAULT_TRANSACTION_MAXFEE = COIN / 10;
6161
//! Discourage users to set fees higher than this amount (in satoshis) per kB

src/wallet/wallet.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ static const CAmount DEFAULT_FALLBACK_FEE = 20000;
7878
//! -discardfee default
7979
static const CAmount DEFAULT_DISCARD_FEE = 10000;
8080
//! -mintxfee default
81-
static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
81+
static const CAmount DEFAULT_TRANSACTION_MINFEE = 100;
8282
//! minimum recommended increment for BIP 125 replacement txs
83-
static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
83+
static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 500;
8484
//! Default for -spendzeroconfchange
8585
static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
8686
//! Default for -walletrejectlongchains

test/functional/feature_bip68_sequence.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def test_sequence_lock_confirmed_inputs(self):
185185
value += utxos[j]["amount"]*COIN
186186
# Overestimate the size of the tx - signatures should be less than 120 bytes, and leave 50 for the output
187187
tx_size = len(ToHex(tx))//2 + 120*num_inputs + 150 # ELEMENTS: overestimate more for output witnesses
188-
tx.vout.append(CTxOut(int(value-self.relayfee*tx_size*COIN/1000), CScript([b'a'])))
188+
tx.vout.append(CTxOut(int(value)-int(self.relayfee*tx_size*COIN/1000), CScript([b'a'])))
189189
tx.vout.append(CTxOut(int(self.relayfee*tx_size*COIN/1000))) # fee
190190
rawtx = self.nodes[0].signrawtransactionwithwallet(ToHex(tx))["hex"]
191191

test/functional/mempool_limit.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def run_test(self):
2323
relayfee = self.nodes[0].getnetworkinfo()['relayfee']
2424

2525
self.log.info('Check that mempoolminfee is minrelytxfee')
26-
assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
27-
assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
26+
assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00000100'))
27+
assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00000100'))
2828

2929
txids = []
3030
utxos = create_confirmed_utxos(relayfee, self.nodes[0], 91)
@@ -52,8 +52,8 @@ def run_test(self):
5252
assert(txdata['confirmations'] == 0) #confirmation should still be 0
5353

5454
self.log.info('Check that mempoolminfee is larger than minrelytxfee')
55-
assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
56-
assert_greater_than(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
55+
assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00000100'))
56+
assert_greater_than(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00000100'))
5757

5858
self.log.info('Create a mempool tx that will not pass mempoolminfee')
5959
us0 = utxos.pop()

test/functional/rpc_fundrawtransaction.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def run_test(self):
5454
# than a minimum sized signature.
5555

5656
# = 2 bytes * minRelayTxFeePerByte
57-
feeTolerance = 2 * min_relay_tx_fee/1000
57+
feeTolerance = 2 * min_relay_tx_fee/100
5858
# ELEMENTS NOTE: fee deltas will be negative due to blinding and no blinding in rawtransaction
5959

6060
self.nodes[2].generate(1)
@@ -472,7 +472,6 @@ def run_test(self):
472472

473473
mSigObj = self.nodes[2].addmultisigaddress(2, [addr1Obj['pubkey'], addr2Obj['pubkey']])['address']
474474

475-
476475
# send 1.2 BTC to msig addr
477476
txId = self.nodes[0].sendtoaddress(mSigObj, 1.2)
478477
self.sync_all()

test/functional/wallet_bumpfee.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ def test_dust_to_fee(rbf_node, dest_address):
194194

195195

196196
def test_settxfee(rbf_node, dest_address):
197-
assert_raises_rpc_error(-8, "txfee cannot be less than min relay tx fee", rbf_node.settxfee, Decimal('0.000005'))
198-
assert_raises_rpc_error(-8, "txfee cannot be less than wallet min fee", rbf_node.settxfee, Decimal('0.000015'))
197+
assert_raises_rpc_error(-8, "txfee cannot be less than min relay tx fee", rbf_node.settxfee, Decimal('0.0000005'))
198+
assert_raises_rpc_error(-8, "txfee cannot be less than wallet min fee", rbf_node.settxfee, Decimal('0.0000015'))
199199
# check that bumpfee reacts correctly to the use of settxfee (paytxfee)
200200
rbfid = spend_one_input(rbf_node, dest_address)
201201
requested_feerate = Decimal("0.00025000")

0 commit comments

Comments
 (0)