diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 57b22c0e49..f1e2b5b40c 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -60,7 +60,7 @@ static const bool DEFAULT_AVOIDPARTIALSPENDS = false; //! -txconfirmtarget default static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6; //! -walletrbf default -static const bool DEFAULT_WALLET_RBF = false; +static const bool DEFAULT_WALLET_RBF = true; static const bool DEFAULT_WALLETBROADCAST = true; static const bool DEFAULT_DISABLE_WALLET = false; diff --git a/test/bitcoin_functional/functional/test_framework/util.py b/test/bitcoin_functional/functional/test_framework/util.py index 9a0ba81041..ed16741f6d 100644 --- a/test/bitcoin_functional/functional/test_framework/util.py +++ b/test/bitcoin_functional/functional/test_framework/util.py @@ -305,10 +305,12 @@ def initialize_datadir(dirname, n, chain): f.write("discover=0\n") f.write("listenonion=0\n") f.write("printtoconsole=0\n") + # Elements: f.write("con_blocksubsidy=5000000000\n") f.write("con_connect_coinbase=0\n") f.write("anyonecanspendaremine=0\n") f.write("con_blockheightinheader=0\n") + f.write("walletrbf=0\n") # Default is 1 in Elements f.write("con_bip34height=100000000\n") f.write("con_bip65height=1351\n") f.write("con_bip66height=1251\n") diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index d250fd117d..23b2f5bc2c 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -305,9 +305,11 @@ def initialize_datadir(dirname, n, chain): f.write("discover=0\n") f.write("listenonion=0\n") f.write("printtoconsole=0\n") + # Elements: f.write("con_blocksubsidy=5000000000\n") f.write("con_connect_coinbase=0\n") f.write("anyonecanspendaremine=0\n") + f.write("walletrbf=0\n") # Default is 1 in Elements f.write("con_bip34height=100000000\n") f.write("con_bip65height=1351\n") f.write("con_bip66height=1251\n")