Skip to content

Commit 700af94

Browse files
committed
Enable RBF transactions in wallet by default
Suggested by Gregory Maxwell <[email protected]> in #8456 (comment)
1 parent e2e624d commit 700af94

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

qa/rpc-tests/listtransactions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def __init__(self):
2525
def setup_nodes(self):
2626
#This test requires mocktime
2727
enable_mocktime()
28-
return start_nodes(self.num_nodes, self.options.tmpdir)
28+
return start_nodes(self.num_nodes, self.options.tmpdir, [["-walletrbf=0"]] * self.num_nodes)
2929

3030
def run_test(self):
3131
# Simple send, 0 to 1:

qa/rpc-tests/txn_clone.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ def add_options(self, parser):
2121
parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true",
2222
help="Test double-spend of 1-confirmed transaction")
2323

24+
def setup_nodes(self):
25+
return start_nodes(self.num_nodes, self.options.tmpdir, [["-walletrbf=0"]] * self.num_nodes)
26+
2427
def setup_network(self):
2528
# Start with split network:
2629
return super(TxnMallTest, self).setup_network(True)

src/wallet/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false;
6161
//! -txconfirmtarget default
6262
static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
6363
//! -walletrbf default
64-
static const bool DEFAULT_WALLET_RBF = false;
64+
static const bool DEFAULT_WALLET_RBF = true;
6565
//! Largest (in bytes) free transaction we're willing to create
6666
static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
6767
static const bool DEFAULT_WALLETBROADCAST = true;

0 commit comments

Comments
 (0)