Merge pull request ElementsProject#1328 from psgreco/elem-23.2.2-rc1

Prepare 23.2.2 rc1

configure.ac

@@ -1,10 +1,10 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 23)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_BUILD, 1)
-define(_CLIENT_VERSION_RC, 0)
+define(_CLIENT_VERSION_BUILD, 2)
+define(_CLIENT_VERSION_RC, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2023)
+define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Elements Project]])
 AC_INIT([Elements Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/ElementsProject/elements/issues],[elements],[https://elementsproject.org/])

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" "September 2023" "elements-cli v23.2.1" "User Commands"
+.TH ELEMENTS-CLI "1" "April 2024" "elements-cli v23.2.2" "User Commands"
 .SH NAME
-elements-cli \- manual page for elements-cli v23.2.1
+elements-cli \- manual page for elements-cli v23.2.2
 .SH SYNOPSIS
 .B elements-cli
 [\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.1
 .B elements-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Elements Core RPC client version v23.2.1
+Elements Core RPC client version v23.2.2
 .SH OPTIONS
 .HP
 \-?

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" "September 2023" "elements-qt v23.2.1" "User Commands"
+.TH ELEMENTS-QT "1" "April 2024" "elements-qt v23.2.2" "User Commands"
 .SH NAME
-elements-qt \- manual page for elements-qt v23.2.1
+elements-qt \- manual page for elements-qt v23.2.2
 .SH SYNOPSIS
 .B elements-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Elements Core version v23.2.1
+Elements Core version v23.2.2
 .SH OPTIONS
 .HP
 \-?

doc/man/elements-tx.1

@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTS-TX "1" "September 2023" "elements-tx v23.2.1" "User Commands"
+.TH ELEMENTS-TX "1" "April 2024" "elements-tx v23.2.2" "User Commands"
 .SH NAME
-elements-tx \- manual page for elements-tx v23.2.1
+elements-tx \- manual page for elements-tx v23.2.2
 .SH SYNOPSIS
 .B elements-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded Elements transaction\/\fR
 .br
 .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.1
+Elements Core elements\-tx utility version v23.2.2
 .SH OPTIONS
 .HP
 \-?

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" "September 2023" "elements-util v23.2.1" "User Commands"
+.TH ELEMENTS-UTIL "1" "April 2024" "elements-util v23.2.2" "User Commands"
 .SH NAME
-elements-util \- manual page for elements-util v23.2.1
+elements-util \- manual page for elements-util v23.2.2
 .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.1
+Elements Core bitcoin\-util utility version v23.2.2
 .SH OPTIONS
 .HP
 \-?

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" "September 2023" "elements-wallet v23.2.1" "User Commands"
+.TH ELEMENTS-WALLET "1" "April 2024" "elements-wallet v23.2.2" "User Commands"
 .SH NAME
-elements-wallet \- manual page for elements-wallet v23.2.1
+elements-wallet \- manual page for elements-wallet v23.2.2
 .SH DESCRIPTION
-Elements Core elements\-wallet version v23.2.1
+Elements Core elements\-wallet version v23.2.2
 .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.

doc/man/elementsd.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTSD "1" "September 2023" "elementsd v23.2.1" "User Commands"
+.TH ELEMENTSD "1" "April 2024" "elementsd v23.2.2" "User Commands"
 .SH NAME
-elementsd \- manual page for elementsd v23.2.1
+elementsd \- manual page for elementsd v23.2.2
 .SH SYNOPSIS
 .B elementsd
 [\fI\,options\/\fR]                     \fI\,Start Elements Core\/\fR
 .SH DESCRIPTION
-Elements Core version v23.2.1
+Elements Core version v23.2.2
 .SH OPTIONS
 .HP
 \-?

src/chainparams.cpp

@@ -842,7 +842,7 @@ class CCustomParams : public CRegTestParams {
         // Determines type of genesis block
         consensus.genesis_style = args.GetArg("-con_genesis_style", "elements");
 
-        // Block signing encumberance script, default of 51 aka OP_TRUE
+        // Block signing encumbrance script, default of 51 aka OP_TRUE
         std::vector<unsigned char> sign_bytes = ParseHex(args.GetArg("-signblockscript", default_signblockscript));
         consensus.signblockscript = CScript(sign_bytes.begin(), sign_bytes.end());
         consensus.max_block_signature_size = args.GetIntArg("-con_max_block_sig_size", consensus.max_block_signature_size);

src/wallet/rpc/elements.cpp

@@ -174,6 +174,10 @@ RPCHelpMan getpeginaddress()
     if (!wallet) return NullUniValue;
     CWallet* const pwallet = wallet.get();
 
+    if (pwallet->chain().isInitialBlockDownload()) {
+        throw JSONRPCError(RPC_WALLET_ERROR, "This action cannot be completed during initial sync or reindexing.");
+    }
+
     LegacyScriptPubKeyMan* spk_man = pwallet->GetLegacyScriptPubKeyMan();
     if (!spk_man) {
         throw JSONRPCError(RPC_WALLET_ERROR, "This type of wallet does not support this command");
@@ -361,18 +365,11 @@ RPCHelpMan initpegoutwallet()
     }
 
     // Three acceptable descriptors:
-    bool is_liquid = Params().NetworkIDString() == "liquidv1";
     if (bitcoin_desc.substr(0, 8) ==  "sh(wpkh("
             && bitcoin_desc.substr(bitcoin_desc.size()-2, 2) == "))") {
-        if(is_liquid) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "bitcoin_descriptor is not supported by Liquid; try pkh(<xpub>) or <xpub>.");
-        }
         xpub_str = bitcoin_desc.substr(8, bitcoin_desc.size()-2);
     } else if (bitcoin_desc.substr(0, 5) ==  "wpkh("
             && bitcoin_desc.substr(bitcoin_desc.size()-1, 1) == ")") {
-        if(is_liquid) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "bitcoin_descriptor is not supported by Liquid; try pkh(<xpub>) or <xpub>.");
-        }
         xpub_str = bitcoin_desc.substr(5, bitcoin_desc.size()-1);
     } else if (bitcoin_desc.substr(0, 4) == "pkh("
             && bitcoin_desc.substr(bitcoin_desc.size()-1, 1) == ")") {