Merge pull request #1344 from psgreco/elements-23.2.2-final

jamesdorfman · web-flow · commit 4b8daa9b85be · 2024-07-24T12:08:26.000-04:00
Prepare 23.2.2 final
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 23)
 define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_BUILD, 2)
-define(_CLIENT_VERSION_RC, 2)
+define(_CLIENT_VERSION_RC, 0)
 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
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-CLI "1" "April 2024" "elements-cli v23.2.2" "User Commands"
+.TH ELEMENTS-CLI "1" "July 2024" "elements-cli v23.2.2" "User Commands"
 .SH NAME
 elements-cli \- manual page for elements-cli v23.2.2
 .SH SYNOPSIS
@@ -271,8 +271,8 @@ pre\-dynamic federations. Only used for testing in custom chains.
 Per\-chain parameter that sets how long a particular fedpegscript is in
 effect for.
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Elements Project developers
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Elements Project developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
 Please contribute if you find Elements Core useful. Visit
 <https://elementsproject.org/> for further information about the software.
diff --git a/doc/man/elements-qt.1 b/doc/man/elements-qt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-QT "1" "April 2024" "elements-qt v23.2.2" "User Commands"
+.TH ELEMENTS-QT "1" "July 2024" "elements-qt v23.2.2" "User Commands"
 .SH NAME
 elements-qt \- manual page for elements-qt v23.2.2
 .SH SYNOPSIS
@@ -635,6 +635,10 @@ Append comment to the user agent string
 .PP
 Chain selection options:
 .HP
+\fB\-acceptdiscountct\fR
+.IP
+Accept discounted fees for Confidential Transactions (default: false)
+.HP
 \fB\-bech32_hrp\fR
 .IP
 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.
 Signed blockchain. Uses input of `\-signblockscript` to define what
 signatures are necessary to solve it.
 .HP
+\fB\-creatediscountct\fR
+.IP
+Create Confidential Transactions with discounted fees (default: false).
+Setting this to true will also set 'acceptdiscountct' to true.
+.HP
 \fB\-ct_bits\fR
 .IP
 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.
 All functionaries must run this enabled. (default: true if chain
 has federated peg)
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Elements Project developers
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Elements Project developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
 Please contribute if you find Elements Core useful. Visit
 <https://elementsproject.org/> for further information about the software.
diff --git a/doc/man/elements-tx.1 b/doc/man/elements-tx.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-TX "1" "April 2024" "elements-tx v23.2.2" "User Commands"
+.TH ELEMENTS-TX "1" "July 2024" "elements-tx v23.2.2" "User Commands"
 .SH NAME
 elements-tx \- manual page for elements-tx v23.2.2
 .SH SYNOPSIS
@@ -240,8 +240,8 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Elements Project developers
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Elements Project developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
 Please contribute if you find Elements Core useful. Visit
 <https://elementsproject.org/> for further information about the software.
diff --git a/doc/man/elements-util.1 b/doc/man/elements-util.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-UTIL "1" "April 2024" "elements-util v23.2.2" "User Commands"
+.TH ELEMENTS-UTIL "1" "July 2024" "elements-util v23.2.2" "User Commands"
 .SH NAME
 elements-util \- manual page for elements-util v23.2.2
 .SH SYNOPSIS
@@ -155,8 +155,8 @@ grind
 .IP
 Perform proof of work on hex header string
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Elements Project developers
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Elements Project developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
 Please contribute if you find Elements Core useful. Visit
 <https://elementsproject.org/> for further information about the software.
diff --git a/doc/man/elements-wallet.1 b/doc/man/elements-wallet.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-WALLET "1" "April 2024" "elements-wallet v23.2.2" "User Commands"
+.TH ELEMENTS-WALLET "1" "July 2024" "elements-wallet v23.2.2" "User Commands"
 .SH NAME
 elements-wallet \- manual page for elements-wallet v23.2.2
 .SH DESCRIPTION
@@ -211,8 +211,8 @@ salvage
 Attempt to recover private keys from a corrupt wallet. Warning:
 \&'salvage' is experimental.
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Elements Project developers
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Elements Project developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
 Please contribute if you find Elements Core useful. Visit
 <https://elementsproject.org/> for further information about the software.
diff --git a/doc/man/elementsd.1 b/doc/man/elementsd.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTSD "1" "April 2024" "elementsd v23.2.2" "User Commands"
+.TH ELEMENTSD "1" "July 2024" "elementsd v23.2.2" "User Commands"
 .SH NAME
 elementsd \- manual page for elementsd v23.2.2
 .SH SYNOPSIS
@@ -635,6 +635,10 @@ Append comment to the user agent string
 .PP
 Chain selection options:
 .HP
+\fB\-acceptdiscountct\fR
+.IP
+Accept discounted fees for Confidential Transactions (default: false)
+.HP
 \fB\-bech32_hrp\fR
 .IP
 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.
 Signed blockchain. Uses input of `\-signblockscript` to define what
 signatures are necessary to solve it.
 .HP
+\fB\-creatediscountct\fR
+.IP
+Create Confidential Transactions with discounted fees (default: false).
+Setting this to true will also set 'acceptdiscountct' to true.
+.HP
 \fB\-ct_bits\fR
 .IP
 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.
 All functionaries must run this enabled. (default: true if chain
 has federated peg)
 .SH COPYRIGHT
-Copyright (C) 2009-2023 The Elements Project developers
-Copyright (C) 2009-2023 The Bitcoin Core developers
+Copyright (C) 2009-2024 The Elements Project developers
+Copyright (C) 2009-2024 The Bitcoin Core developers
 
 Please contribute if you find Elements Core useful. Visit
 <https://elementsproject.org/> for further information about the software.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -896,7 +896,7 @@ class CCustomParams : public CRegTestParams {
         consensus.fedpegScript = StrHexToScriptWithDefault(args.GetArg("-fedpegscript", ""), default_script);
         consensus.start_p2wsh_script = args.GetIntArg("-con_start_p2wsh_script", consensus.start_p2wsh_script);
         create_discount_ct = args.GetBoolArg("-creatediscountct", false);
-        accept_discount_ct = args.GetBoolArg("-acceptdiscountct", create_discount_ct);
+        accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct;
 
         // Calculate pegged Bitcoin asset
         std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID);
@@ -1129,7 +1129,7 @@ class CLiquidV1Params : public CChainParams {
 
         multi_data_permitted = true;
         create_discount_ct = args.GetBoolArg("-creatediscountct", false);
-        accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false);
+        accept_discount_ct = args.GetBoolArg("-acceptdiscountct", false) || create_discount_ct;
 
         parentGenesisBlockHash = uint256S("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
         const bool parent_genesis_is_null = parentGenesisBlockHash == uint256();
@@ -1479,7 +1479,7 @@ class CLiquidV1TestParams : public CLiquidV1Params {
 
         multi_data_permitted = args.GetBoolArg("-multi_data_permitted", multi_data_permitted);
         create_discount_ct = args.GetBoolArg("-creatediscountct", create_discount_ct);
-        accept_discount_ct = args.GetBoolArg("-acceptdiscountct", accept_discount_ct || create_discount_ct);
+        accept_discount_ct = args.GetBoolArg("-acceptdiscountct", accept_discount_ct) || create_discount_ct;
 
         if (args.IsArgSet("-parentgenesisblockhash")) {
             parentGenesisBlockHash = uint256S(args.GetArg("-parentgenesisblockhash", ""));
diff --git a/src/init.cpp b/src/init.cpp
@@ -640,7 +640,7 @@ void SetupServerArgs(ArgsManager& argsman)
     argsman.AddArg("-initialreissuancetokens=<n>", "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: true for liquidv1, false for other chains)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
+    argsman.AddArg("-acceptdiscountct", "Accept discounted fees for Confidential Transactions (default: false)", 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/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -579,6 +579,10 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
     clear();
 
     GUIUtil::handleCloseWindowShortcut(this);
+#if defined(Q_OS_MAC) && defined(__aarch64__)
+    // MacOS default is apparently 0x80000, too small for MacOS arm; use linux-like size instead
+    thread.setStackSize(0x800000);
+#endif
 }
 
 RPCConsole::~RPCConsole()
diff --git a/test/functional/feature_discount_ct.py b/test/functional/feature_discount_ct.py
@@ -26,7 +26,8 @@ def set_test_params(self):
             # node 1 accepts but does not create discounted CTs
             args + ["-acceptdiscountct=1", "-creatediscountct=0"],
             # node 2 both accepts and creates discounted CTs
-            args + ["-acceptdiscountct=1", "-creatediscountct=1"],
+            # check that 'create' overrides 'accept'
+            args + ["-acceptdiscountct=0", "-creatediscountct=1"],
         ]
 
     def skip_test_if_missing_module(self):

Original file line number	Diff line number	Diff line change
`@@ -579,6 +579,10 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty`
`579`	`579`	`clear();`
`580`	`580`
`581`	`581`	`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`
`582`	`586`	`}`
`583`	`587`
`584`	`588`	`RPCConsole::~RPCConsole()`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ def set_test_params(self):`
`26`	`26`	`# node 1 accepts but does not create discounted CTs`
`27`	`27`	`args + ["-acceptdiscountct=1", "-creatediscountct=0"],`
`28`	`28`	`# 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"],`
`30`	`31`	`]`
`31`	`32`
`32`	`33`	`def skip_test_if_missing_module(self):`