Skip to content

Commit 4b8daa9

Browse files
jamesdorfmanjamesdorfman
authored
Merge pull request #1344 from psgreco/elements-23.2.2-final
Prepare 23.2.2 final
2 parents 87ac5b1 + 329cfcd commit 4b8daa9

11 files changed

+47
-24
lines changed

Diff for: ‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 23)
33
define(_CLIENT_VERSION_MINOR, 2)
44
define(_CLIENT_VERSION_BUILD, 2)
5-
define(_CLIENT_VERSION_RC, 2)
5+
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2024)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

Diff for: ‎doc/man/elements-cli.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-CLI "1" "April 2024" "elements-cli v23.2.2" "User Commands"
2+
.TH ELEMENTS-CLI "1" "July 2024" "elements-cli v23.2.2" "User Commands"
33
.SH NAME
44
elements-cli \- manual page for elements-cli v23.2.2
55
.SH SYNOPSIS
@@ -271,8 +271,8 @@ pre\-dynamic federations. Only used for testing in custom chains.
271271
Per\-chain parameter that sets how long a particular fedpegscript is in
272272
effect for.
273273
.SH COPYRIGHT
274-
Copyright (C) 2009-2023 The Elements Project developers
275-
Copyright (C) 2009-2023 The Bitcoin Core developers
274+
Copyright (C) 2009-2024 The Elements Project developers
275+
Copyright (C) 2009-2024 The Bitcoin Core developers
276276

277277
Please contribute if you find Elements Core useful. Visit
278278
<https://elementsproject.org/> for further information about the software.

Diff for: ‎doc/man/elements-qt.1

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-QT "1" "April 2024" "elements-qt v23.2.2" "User Commands"
2+
.TH ELEMENTS-QT "1" "July 2024" "elements-qt v23.2.2" "User Commands"
33
.SH NAME
44
elements-qt \- manual page for elements-qt v23.2.2
55
.SH SYNOPSIS
@@ -635,6 +635,10 @@ Append comment to the user agent string
635635
.PP
636636
Chain selection options:
637637
.HP
638+
\fB\-acceptdiscountct\fR
639+
.IP
640+
Accept discounted fees for Confidential Transactions (default: false)
641+
.HP
638642
\fB\-bech32_hrp\fR
639643
.IP
640644
The human\-readable part of the chain's bech32 encoding. (default: ex)
@@ -683,6 +687,11 @@ The proof\-of\-work limit value for the parent chain.
683687
Signed blockchain. Uses input of `\-signblockscript` to define what
684688
signatures are necessary to solve it.
685689
.HP
690+
\fB\-creatediscountct\fR
691+
.IP
692+
Create Confidential Transactions with discounted fees (default: false).
693+
Setting this to true will also set 'acceptdiscountct' to true.
694+
.HP
686695
\fB\-ct_bits\fR
687696
.IP
688697
The default number of hiding bits in a rangeproof. Will be exceeded to
@@ -1054,8 +1063,8 @@ trusted mainchain daemon using the `mainchain*` settings below.
10541063
All functionaries must run this enabled. (default: true if chain
10551064
has federated peg)
10561065
.SH COPYRIGHT
1057-
Copyright (C) 2009-2023 The Elements Project developers
1058-
Copyright (C) 2009-2023 The Bitcoin Core developers
1066+
Copyright (C) 2009-2024 The Elements Project developers
1067+
Copyright (C) 2009-2024 The Bitcoin Core developers
10591068

10601069
Please contribute if you find Elements Core useful. Visit
10611070
<https://elementsproject.org/> for further information about the software.

Diff for: ‎doc/man/elements-tx.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-TX "1" "April 2024" "elements-tx v23.2.2" "User Commands"
2+
.TH ELEMENTS-TX "1" "July 2024" "elements-tx v23.2.2" "User Commands"
33
.SH NAME
44
elements-tx \- manual page for elements-tx v23.2.2
55
.SH SYNOPSIS
@@ -240,8 +240,8 @@ set=NAME:JSON\-STRING
240240
.IP
241241
Set register NAME to given JSON\-STRING
242242
.SH COPYRIGHT
243-
Copyright (C) 2009-2023 The Elements Project developers
244-
Copyright (C) 2009-2023 The Bitcoin Core developers
243+
Copyright (C) 2009-2024 The Elements Project developers
244+
Copyright (C) 2009-2024 The Bitcoin Core developers
245245

246246
Please contribute if you find Elements Core useful. Visit
247247
<https://elementsproject.org/> for further information about the software.

Diff for: ‎doc/man/elements-util.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-UTIL "1" "April 2024" "elements-util v23.2.2" "User Commands"
2+
.TH ELEMENTS-UTIL "1" "July 2024" "elements-util v23.2.2" "User Commands"
33
.SH NAME
44
elements-util \- manual page for elements-util v23.2.2
55
.SH SYNOPSIS
@@ -155,8 +155,8 @@ grind
155155
.IP
156156
Perform proof of work on hex header string
157157
.SH COPYRIGHT
158-
Copyright (C) 2009-2023 The Elements Project developers
159-
Copyright (C) 2009-2023 The Bitcoin Core developers
158+
Copyright (C) 2009-2024 The Elements Project developers
159+
Copyright (C) 2009-2024 The Bitcoin Core developers
160160

161161
Please contribute if you find Elements Core useful. Visit
162162
<https://elementsproject.org/> for further information about the software.

Diff for: ‎doc/man/elements-wallet.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTS-WALLET "1" "April 2024" "elements-wallet v23.2.2" "User Commands"
2+
.TH ELEMENTS-WALLET "1" "July 2024" "elements-wallet v23.2.2" "User Commands"
33
.SH NAME
44
elements-wallet \- manual page for elements-wallet v23.2.2
55
.SH DESCRIPTION
@@ -211,8 +211,8 @@ salvage
211211
Attempt to recover private keys from a corrupt wallet. Warning:
212212
\&'salvage' is experimental.
213213
.SH COPYRIGHT
214-
Copyright (C) 2009-2023 The Elements Project developers
215-
Copyright (C) 2009-2023 The Bitcoin Core developers
214+
Copyright (C) 2009-2024 The Elements Project developers
215+
Copyright (C) 2009-2024 The Bitcoin Core developers
216216

217217
Please contribute if you find Elements Core useful. Visit
218218
<https://elementsproject.org/> for further information about the software.

Diff for: ‎doc/man/elementsd.1

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
2-
.TH ELEMENTSD "1" "April 2024" "elementsd v23.2.2" "User Commands"
2+
.TH ELEMENTSD "1" "July 2024" "elementsd v23.2.2" "User Commands"
33
.SH NAME
44
elementsd \- manual page for elementsd v23.2.2
55
.SH SYNOPSIS
@@ -635,6 +635,10 @@ Append comment to the user agent string
635635
.PP
636636
Chain selection options:
637637
.HP
638+
\fB\-acceptdiscountct\fR
639+
.IP
640+
Accept discounted fees for Confidential Transactions (default: false)
641+
.HP
638642
\fB\-bech32_hrp\fR
639643
.IP
640644
The human\-readable part of the chain's bech32 encoding. (default: ex)
@@ -683,6 +687,11 @@ The proof\-of\-work limit value for the parent chain.
683687
Signed blockchain. Uses input of `\-signblockscript` to define what
684688
signatures are necessary to solve it.
685689
.HP
690+
\fB\-creatediscountct\fR
691+
.IP
692+
Create Confidential Transactions with discounted fees (default: false).
693+
Setting this to true will also set 'acceptdiscountct' to true.
694+
.HP
686695
\fB\-ct_bits\fR
687696
.IP
688697
The default number of hiding bits in a rangeproof. Will be exceeded to
@@ -1032,8 +1041,8 @@ trusted mainchain daemon using the `mainchain*` settings below.
10321041
All functionaries must run this enabled. (default: true if chain
10331042
has federated peg)
10341043
.SH COPYRIGHT
1035-
Copyright (C) 2009-2023 The Elements Project developers
1036-
Copyright (C) 2009-2023 The Bitcoin Core developers
1044+
Copyright (C) 2009-2024 The Elements Project developers
1045+
Copyright (C) 2009-2024 The Bitcoin Core developers
10371046

10381047
Please contribute if you find Elements Core useful. Visit
10391048
<https://elementsproject.org/> for further information about the software.

Diff for: ‎src/chainparams.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ class CCustomParams : public CRegTestParams {
896896
consensus.fedpegScript = StrHexToScriptWithDefault(args.GetArg("-fedpegscript", ""), default_script);
897897
consensus.start_p2wsh_script = args.GetIntArg("-con_start_p2wsh_script", consensus.start_p2wsh_script);
898898
create_discount_ct = args.GetBoolArg("-creatediscountct", false);
899-
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", create_discount_ct);
899+
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct;
900900

901901
// Calculate pegged Bitcoin asset
902902
std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID);
@@ -1129,7 +1129,7 @@ class CLiquidV1Params : public CChainParams {
11291129

11301130
multi_data_permitted = true;
11311131
create_discount_ct = args.GetBoolArg("-creatediscountct", false);
1132-
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false);
1132+
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct;
11331133

11341134
parentGenesisBlockHash = uint256S("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
11351135
const bool parent_genesis_is_null = parentGenesisBlockHash == uint256();
@@ -1479,7 +1479,7 @@ class CLiquidV1TestParams : public CLiquidV1Params {
14791479

14801480
multi_data_permitted = args.GetBoolArg("-multi_data_permitted", multi_data_permitted);
14811481
create_discount_ct = args.GetBoolArg("-creatediscountct", create_discount_ct);
1482-
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", accept_discount_ct || create_discount_ct);
1482+
accept_discount_ct = args.GetBoolArg("-acceptdiscountct", accept_discount_ct) || create_discount_ct;
14831483

14841484
if (args.IsArgSet("-parentgenesisblockhash")) {
14851485
parentGenesisBlockHash = uint256S(args.GetArg("-parentgenesisblockhash", ""));

Diff for: ‎src/init.cpp

+1-1
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: true for liquidv1, false for other chains)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
643+
argsman.AddArg("-acceptdiscountct", "Accept discounted fees for Confidential Transactions (default: false)", 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)

Diff for: ‎src/qt/rpcconsole.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,10 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
579579
clear();
580580

581581
GUIUtil::handleCloseWindowShortcut(this);
582+
#if defined(Q_OS_MAC) && defined(__aarch64__)
583+
// MacOS default is apparently 0x80000, too small for MacOS arm; use linux-like size instead
584+
thread.setStackSize(0x800000);
585+
#endif
582586
}
583587

584588
RPCConsole::~RPCConsole()

Diff for: ‎test/functional/feature_discount_ct.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ def set_test_params(self):
2626
# node 1 accepts but does not create discounted CTs
2727
args + ["-acceptdiscountct=1", "-creatediscountct=0"],
2828
# node 2 both accepts and creates discounted CTs
29-
args + ["-acceptdiscountct=1", "-creatediscountct=1"],
29+
# check that 'create' overrides 'accept'
30+
args + ["-acceptdiscountct=0", "-creatediscountct=1"],
3031
]
3132

3233
def skip_test_if_missing_module(self):

0 commit comments

Comments
 (0)