diff --git a/configure.ac b/configure.ac index 1be6dadb9ae..93ea370b19a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 23) define(_CLIENT_VERSION_MINOR, 2) -define(_CLIENT_VERSION_BUILD, 4) -define(_CLIENT_VERSION_RC, 0) +define(_CLIENT_VERSION_BUILD, 5) +define(_CLIENT_VERSION_RC, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2024) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/doc/man/elements-cli.1 b/doc/man/elements-cli.1 index 7397871bcb4..04d552f0715 100644 --- a/doc/man/elements-cli.1 +++ b/doc/man/elements-cli.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTS-CLI "1" "August 2024" "elements-cli v23.2.3" "User Commands" +.TH ELEMENTS-CLI "1" "November 2024" "elements-cli v23.2.5" "User Commands" .SH NAME -elements-cli \- manual page for elements-cli v23.2.3 +elements-cli \- manual page for elements-cli v23.2.5 .SH SYNOPSIS .B elements-cli [\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Elements Core\/\fR @@ -15,7 +15,7 @@ elements-cli \- manual page for elements-cli v23.2.3 .B elements-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Elements Core RPC client version v23.2.3 +Elements Core RPC client version v23.2.5 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-qt.1 b/doc/man/elements-qt.1 index b302625e828..f427778c511 100644 --- a/doc/man/elements-qt.1 +++ b/doc/man/elements-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTS-QT "1" "August 2024" "elements-qt v23.2.3" "User Commands" +.TH ELEMENTS-QT "1" "November 2024" "elements-qt v23.2.5" "User Commands" .SH NAME -elements-qt \- manual page for elements-qt v23.2.3 +elements-qt \- manual page for elements-qt v23.2.5 .SH SYNOPSIS .B elements-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Elements Core version v23.2.3 +Elements Core version v23.2.5 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-tx.1 b/doc/man/elements-tx.1 index 2c366ef6fe5..2e4055d19e3 100644 --- a/doc/man/elements-tx.1 +++ b/doc/man/elements-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTS-TX "1" "August 2024" "elements-tx v23.2.3" "User Commands" +.TH ELEMENTS-TX "1" "November 2024" "elements-tx v23.2.5" "User Commands" .SH NAME -elements-tx \- manual page for elements-tx v23.2.3 +elements-tx \- manual page for elements-tx v23.2.5 .SH SYNOPSIS .B elements-tx [\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded Elements transaction\/\fR @@ -9,7 +9,7 @@ elements-tx \- manual page for elements-tx v23.2.3 .B elements-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded Elements transaction\/\fR .SH DESCRIPTION -Elements Core elements\-tx utility version v23.2.3 +Elements Core elements\-tx utility version v23.2.5 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-util.1 b/doc/man/elements-util.1 index c2dc8ab7db0..bf2730c6d2b 100644 --- a/doc/man/elements-util.1 +++ b/doc/man/elements-util.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTS-UTIL "1" "August 2024" "elements-util v23.2.3" "User Commands" +.TH ELEMENTS-UTIL "1" "November 2024" "elements-util v23.2.5" "User Commands" .SH NAME -elements-util \- manual page for elements-util v23.2.3 +elements-util \- manual page for elements-util v23.2.5 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Elements Core bitcoin\-util utility version v23.2.3 +Elements Core bitcoin\-util utility version v23.2.5 .SH OPTIONS .HP \-? diff --git a/doc/man/elements-wallet.1 b/doc/man/elements-wallet.1 index e1745ef7abd..9769e7ab6b0 100644 --- a/doc/man/elements-wallet.1 +++ b/doc/man/elements-wallet.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTS-WALLET "1" "August 2024" "elements-wallet v23.2.3" "User Commands" +.TH ELEMENTS-WALLET "1" "November 2024" "elements-wallet v23.2.5" "User Commands" .SH NAME -elements-wallet \- manual page for elements-wallet v23.2.3 +elements-wallet \- manual page for elements-wallet v23.2.5 .SH DESCRIPTION -Elements Core elements\-wallet version v23.2.3 +Elements Core elements\-wallet version v23.2.5 .PP elements\-wallet is an offline tool for creating and interacting with Elements Core wallet files. By default elements\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/elementsd.1 b/doc/man/elementsd.1 index 74e9bf4b25a..393e0b5a1d8 100644 --- a/doc/man/elementsd.1 +++ b/doc/man/elementsd.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTSD "1" "August 2024" "elementsd v23.2.3" "User Commands" +.TH ELEMENTSD "1" "November 2024" "elementsd v23.2.5" "User Commands" .SH NAME -elementsd \- manual page for elementsd v23.2.3 +elementsd \- manual page for elementsd v23.2.5 .SH SYNOPSIS .B elementsd [\fI\,options\/\fR] \fI\,Start Elements Core\/\fR .SH DESCRIPTION -Elements Core version v23.2.3 +Elements Core version v23.2.5 .SH OPTIONS .HP \-? diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b6ea30e5dcb..0b40f181b11 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1133,7 +1133,7 @@ class CLiquidV1Params : public CChainParams { multi_data_permitted = true; create_discount_ct = args.GetBoolArg("-creatediscountct", false); - accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct; + accept_discount_ct = args.GetBoolArg("-acceptdiscountct", true) || create_discount_ct; parentGenesisBlockHash = uint256S("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); const bool parent_genesis_is_null = parentGenesisBlockHash == uint256(); diff --git a/src/init.cpp b/src/init.cpp index 423b5647873..42a4d15b0b4 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -640,7 +640,7 @@ void SetupServerArgs(ArgsManager& argsman) argsman.AddArg("-initialreissuancetokens=", "The amount of reissuance tokens created in the genesis block. (default: 0)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); argsman.AddArg("-ct_bits", strprintf("The default number of hiding bits in a rangeproof. Will be exceeded to cover amounts exceeding the maximum hiding value. (default: %d)", 52), ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); argsman.AddArg("-ct_exponent", strprintf("The hiding exponent. (default: %s)", 0), ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); - argsman.AddArg("-acceptdiscountct", "Accept discounted fees for Confidential Transactions (default: false)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); + argsman.AddArg("-acceptdiscountct", "Accept discounted fees for Confidential Transactions (default: true in liquidtestnet and liquidv1, false otherwise)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); argsman.AddArg("-creatediscountct", "Create Confidential Transactions with discounted fees (default: false). Setting this to true will also set 'acceptdiscountct' to true.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); #if defined(USE_SYSCALL_SANDBOX) diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 540512a7709..e378195adc4 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -60,10 +60,10 @@ QString BitcoinUnits::longName(int unit) } switch(unit) { - case BTC: return QString("L-BTC"); - case mBTC: return QString("mL-BTC"); - case uBTC: return QString::fromUtf8("μL-BTC"); - case SAT: return QString("Satoshi (L-sat)"); + case BTC: return QString("LBTC"); + case mBTC: return QString("mLBTC"); + case uBTC: return QString::fromUtf8("μLBTC"); + case SAT: return QString("Satoshi (Lsat)"); default: return QString("???"); } } @@ -75,8 +75,8 @@ QString BitcoinUnits::shortName(int unit) } switch(unit) { - case uBTC: return QString::fromUtf8("L-bits"); - case SAT: return QString("L-sat"); + case uBTC: return QString::fromUtf8("Lbits"); + case SAT: return QString("Lsat"); default: return longName(unit); } }