Skip to content

Commit ba24915

Browse files
jhfrontzjhfrontz
authored
Merge pull request #1379 from psgreco/elem-23.2.5-rc1
Prepare 23.2.5 rc1
2 parents d5c9e24 + 081e121 commit ba24915

File tree

10 files changed

+28
-28
lines changed

10 files changed

+28
-28
lines changed

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 23)
33
define(_CLIENT_VERSION_MINOR, 2)
4-
define(_CLIENT_VERSION_BUILD, 4)
5-
define(_CLIENT_VERSION_RC, 0)
4+
define(_CLIENT_VERSION_BUILD, 5)
5+
define(_CLIENT_VERSION_RC, 1)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2024)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎doc/man/elements-cli.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-CLI "1" "August 2024" "elements-cli v23.2.3" "User Commands"
2+
.TH ELEMENTS-CLI "1" "November 2024" "elements-cli v23.2.5" "User Commands"
33
.SH NAME
4-
elements-cli \- manual page for elements-cli v23.2.3
4+
elements-cli \- manual page for elements-cli v23.2.5
55
.SH SYNOPSIS
66
.B elements-cli
77
[\fI\,options\/\fR] \fI\,<command> \/\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
1515
.B elements-cli
1616
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
1717
.SH DESCRIPTION
18-
Elements Core RPC client version v23.2.3
18+
Elements Core RPC client version v23.2.5
1919
.SH OPTIONS
2020
.HP
2121
\-?

‎doc/man/elements-qt.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-QT "1" "August 2024" "elements-qt v23.2.3" "User Commands"
2+
.TH ELEMENTS-QT "1" "November 2024" "elements-qt v23.2.5" "User Commands"
33
.SH NAME
4-
elements-qt \- manual page for elements-qt v23.2.3
4+
elements-qt \- manual page for elements-qt v23.2.5
55
.SH SYNOPSIS
66
.B elements-qt
77
[\fI\,command-line options\/\fR]
88
.SH DESCRIPTION
9-
Elements Core version v23.2.3
9+
Elements Core version v23.2.5
1010
.SH OPTIONS
1111
.HP
1212
\-?

‎doc/man/elements-tx.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-TX "1" "August 2024" "elements-tx v23.2.3" "User Commands"
2+
.TH ELEMENTS-TX "1" "November 2024" "elements-tx v23.2.5" "User Commands"
33
.SH NAME
4-
elements-tx \- manual page for elements-tx v23.2.3
4+
elements-tx \- manual page for elements-tx v23.2.5
55
.SH SYNOPSIS
66
.B elements-tx
77
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded Elements transaction\/\fR
88
.br
99
.B elements-tx
1010
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded Elements transaction\/\fR
1111
.SH DESCRIPTION
12-
Elements Core elements\-tx utility version v23.2.3
12+
Elements Core elements\-tx utility version v23.2.5
1313
.SH OPTIONS
1414
.HP
1515
\-?

‎doc/man/elements-util.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-UTIL "1" "August 2024" "elements-util v23.2.3" "User Commands"
2+
.TH ELEMENTS-UTIL "1" "November 2024" "elements-util v23.2.5" "User Commands"
33
.SH NAME
4-
elements-util \- manual page for elements-util v23.2.3
4+
elements-util \- manual page for elements-util v23.2.5
55
.SH SYNOPSIS
66
.B bitcoin-util
77
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
88
.SH DESCRIPTION
9-
Elements Core bitcoin\-util utility version v23.2.3
9+
Elements Core bitcoin\-util utility version v23.2.5
1010
.SH OPTIONS
1111
.HP
1212
\-?

‎doc/man/elements-wallet.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-WALLET "1" "August 2024" "elements-wallet v23.2.3" "User Commands"
2+
.TH ELEMENTS-WALLET "1" "November 2024" "elements-wallet v23.2.5" "User Commands"
33
.SH NAME
4-
elements-wallet \- manual page for elements-wallet v23.2.3
4+
elements-wallet \- manual page for elements-wallet v23.2.5
55
.SH DESCRIPTION
6-
Elements Core elements\-wallet version v23.2.3
6+
Elements Core elements\-wallet version v23.2.5
77
.PP
88
elements\-wallet is an offline tool for creating and interacting with Elements Core wallet files.
99
By default elements\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

‎doc/man/elementsd.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTSD "1" "August 2024" "elementsd v23.2.3" "User Commands"
2+
.TH ELEMENTSD "1" "November 2024" "elementsd v23.2.5" "User Commands"
33
.SH NAME
4-
elementsd \- manual page for elementsd v23.2.3
4+
elementsd \- manual page for elementsd v23.2.5
55
.SH SYNOPSIS
66
.B elementsd
77
[\fI\,options\/\fR] \fI\,Start Elements Core\/\fR
88
.SH DESCRIPTION
9-
Elements Core version v23.2.3
9+
Elements Core version v23.2.5
1010
.SH OPTIONS
1111
.HP
1212
\-?

‎src/chainparams.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ class CLiquidV1Params : public CChainParams {
11331133

11341134
multi_data_permitted = true;
11351135
create_discount_ct = args.GetBoolArg("-creatediscountct", false);
1136-
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct;
1136+
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", true) || create_discount_ct;
11371137

11381138
parentGenesisBlockHash = uint256S("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
11391139
const bool parent_genesis_is_null = parentGenesisBlockHash == uint256();

‎src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ void SetupServerArgs(ArgsManager& argsman)
640640
argsman.AddArg("-initialreissuancetokens=<n>", "The amount of reissuance tokens created in the genesis block. (default: 0)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
641641
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);
642642
argsman.AddArg("-ct_exponent", strprintf("The hiding exponent. (default: %s)", 0), ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
643-
argsman.AddArg("-acceptdiscountct", "Accept discounted fees for Confidential Transactions (default: false)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
643+
argsman.AddArg("-acceptdiscountct", "Accept discounted fees for Confidential Transactions (default: true in liquidtestnet and liquidv1, false otherwise)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
644644
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);
645645

646646
#if defined(USE_SYSCALL_SANDBOX)

‎src/qt/bitcoinunits.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ QString BitcoinUnits::longName(int unit)
6060
}
6161
switch(unit)
6262
{
63-
case BTC: return QString("L-BTC");
64-
case mBTC: return QString("mL-BTC");
65-
case uBTC: return QString::fromUtf8("μL-BTC");
66-
case SAT: return QString("Satoshi (L-sat)");
63+
case BTC: return QString("LBTC");
64+
case mBTC: return QString("mLBTC");
65+
case uBTC: return QString::fromUtf8("μLBTC");
66+
case SAT: return QString("Satoshi (Lsat)");
6767
default: return QString("???");
6868
}
6969
}
@@ -75,8 +75,8 @@ QString BitcoinUnits::shortName(int unit)
7575
}
7676
switch(unit)
7777
{
78-
case uBTC: return QString::fromUtf8("L-bits");
79-
case SAT: return QString("L-sat");
78+
case uBTC: return QString::fromUtf8("Lbits");
79+
case SAT: return QString("Lsat");
8080
default: return longName(unit);
8181
}
8282
}

0 commit comments

Comments
 (0)