Skip to content

Commit 10bca21

Browse files
committed
Set walletrbf default to 1
1 parent 2dbf44a commit 10bca21

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

src/wallet/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static const bool DEFAULT_AVOIDPARTIALSPENDS = false;
6060
//! -txconfirmtarget default
6161
static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6;
6262
//! -walletrbf default
63-
static const bool DEFAULT_WALLET_RBF = false;
63+
static const bool DEFAULT_WALLET_RBF = true;
6464
static const bool DEFAULT_WALLETBROADCAST = true;
6565
static const bool DEFAULT_DISABLE_WALLET = false;
6666

test/bitcoin_functional/functional/test_framework/util.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,12 @@ def initialize_datadir(dirname, n, chain):
305305
f.write("discover=0\n")
306306
f.write("listenonion=0\n")
307307
f.write("printtoconsole=0\n")
308+
# Elements:
308309
f.write("con_blocksubsidy=5000000000\n")
309310
f.write("con_connect_coinbase=0\n")
310311
f.write("anyonecanspendaremine=0\n")
311312
f.write("con_blockheightinheader=0\n")
313+
f.write("walletrbf=0\n") # Default is 1 in Elements
312314
os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
313315
os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
314316
return datadir

test/functional/test_framework/util.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,11 @@ def initialize_datadir(dirname, n, chain):
305305
f.write("discover=0\n")
306306
f.write("listenonion=0\n")
307307
f.write("printtoconsole=0\n")
308+
# Elements:
308309
f.write("con_blocksubsidy=5000000000\n")
309310
f.write("con_connect_coinbase=0\n")
310311
f.write("anyonecanspendaremine=0\n")
312+
f.write("walletrbf=0\n") # Default is 1 in Elements
311313
os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
312314
os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)
313315
return datadir

0 commit comments

Comments
 (0)