Merge ElementsProject#1531: Prepare 23.3.2rc2

73db0cf Bump version to 23.3.2-rc2 (Pablo Greco)
6544256 Update manpages (Pablo Greco)
4c79d5a fix: use liquidnetwork or liquidtestnet for uri in elements mode (Byron Hambly)
8f28d82 docs: add github-merge.py process for merging PRs (Byron Hambly)
6c7788a Avoid Simplicity header dependency propogation (Russell O'Connor)

Pull request description:

  Updates master to 6bb916a which includes fixes for simplicity header dependency and qr code generation for QT

ACKs for top commit:
  delta1:
    ACK 73db0cf; diff looks as expected, tested locally successfully

Tree-SHA512: d23312a81033b759466f9bc2d8bbb0bfcdd5bfd0a1d80b101e8461e62a151841910310e82ed8a1ba4ed6bb8a363f53dc2e8e5674c27b9ebafe02169a88b08ed9

Author: delta1

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 23)
 define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_BUILD, 2)
-define(_CLIENT_VERSION_RC, 1)
+define(_CLIENT_VERSION_RC, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2026)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

doc/github-merge-script.md

@@ -0,0 +1,68 @@
+# github-merge.py
+
+Please use this python script from the [Bitcoin maintainer tools](https://github.com/bitcoin-core/bitcoin-maintainer-tools/) repo for merging PRs.
+
+- Clone the repo and copy or just download the [github-merge.py](https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/main/github-merge.py) script into a directory on your $PATH.
+
+```
+wget https://raw.githubusercontent.com/bitcoin-core/bitcoin-maintainer-tools/refs/heads/main/github-merge.py -O ~/.local/bin/github-merge.py
+chmod +x ~/.local/bin/github-merge.py
+```
+
+- In your Elements repo, configure the merge repository.
+
+```
+git config githubmerge.repository ElementsProject/elements
+```
+
+- Run the script with the PR number you want to test/merge.
+
+```
+github-merge.py <PR_NUMBER>
+```
+
+For example for PR 1518 I see this output:
+
+```
+ElementsProject/elements#1518 Avoid Simplicity header dependency propogation into master
+* 6c7788adf373cd8f0dc5c4fe2b7674625631721e Avoid Simplicity header dependency propogation (Russell O'Connor) (upstream/simplicity, pull/1518/head)
+
+Dropping you on a shell so you can try building/testing the merged source.
+Run 'git diff HEAD~' to show the changes being merged.
+Type 'exit' when done.
+```
+
+- Now you can build and test the PR branch, or do whatever review/testing you require.
+
+- Once you are done testing, comment on the PR with your `ACK BRANCH_COMMIT` and/or comments.
+
+Note: this merge script requires one or more ACKs on the top commit of the PR.
+
+- Type `exit` to continue after testing.
+
+```
+exit
+```
+
+In our example this results in the following output:
+
+```
+[pull/1518/local-merge 5e1a950e52] Merge ElementsProject/elements#1518: Avoid Simplicity header dependency propogation
+ Date: Thu Jan 22 14:49:26 2026 +0200
+ElementsProject/elements#1518 Avoid Simplicity header dependency propogation into master
+* 6c7788adf373cd8f0dc5c4fe2b7674625631721e Avoid Simplicity header dependency propogation (Russell O'Connor) (upstream/simplicity, pull/1518/head)
+ACKs:
+* ACK 6c7788a; built and tested locally  (delta1)
+* ACK 6c7788adf373cd8f0dc5c4fe2b7674625631721e; successfully ran local tests (apoelstra)
+Type 's' to sign off on the above merge, or 'x' to reject and exit.
+```
+
+- If all looks good then type `s` and hit enter to sign off on the merge. Otherwise type `x` and hit enter to exit.
+
+Signing off in our example shows this output:
+
+```
+Type 'push' to push the result to git@github.com:ElementsProject/elements, branch master, or 'x' to exit without pushing.
+```
+
+- Type `push` and hit enter to finish the merge.

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" "January 2026" "elements-cli v23.3.2" "User Commands"
+.TH ELEMENTS-CLI "1" "February 2026" "elements-cli v23.3.2" "User Commands"
 .SH NAME
 elements-cli \- manual page for elements-cli v23.3.2
 .SH SYNOPSIS

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" "January 2026" "elements-qt v23.3.2" "User Commands"
+.TH ELEMENTS-QT "1" "February 2026" "elements-qt v23.3.2" "User Commands"
 .SH NAME
 elements-qt \- manual page for elements-qt v23.3.2
 .SH SYNOPSIS
@@ -139,6 +139,10 @@ blockchain. (default: 0 = disable pruning blocks, 1 = allow
 manual pruning via RPC, >=550 = automatically prune block files
 to stay under the specified target size in MiB)
 .HP
+\fB\-ratelimitlogging\fR
+.IP
+Rate limit unconditional logging to disk (default: 1)
+.HP
 \fB\-reindex\fR
 .IP
 Rebuild chain state and block index from the blk*.dat files on disk
@@ -582,9 +586,9 @@ optional). If <category> is not supplied or if <category> = 1,
 output all debugging information. <category> can be: addrman,
 bench, blockstorage, cmpctblock, coindb, estimatefee, http, i2p,
 ipc, leveldb, libevent, mempool, mempoolrej, net, proxy, prune,
-qt, rand, reindex, rpc, selectcoins, tor, util, validation,
-walletdb, zmq. This option can be specified multiple times to
-output multiple categories.
+qt, rand, reindex, rpc, selectcoins, tor, uncond_always,
+uncond_rate_limited, util, validation, walletdb, zmq. This option
+can be specified multiple times to output multiple categories.
 .HP
 \fB\-debugexclude=\fR<category>
 .IP

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" "January 2026" "elements-tx v23.3.2" "User Commands"
+.TH ELEMENTS-TX "1" "February 2026" "elements-tx v23.3.2" "User Commands"
 .SH NAME
 elements-tx \- manual page for elements-tx v23.3.2
 .SH SYNOPSIS

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" "January 2026" "elements-util v23.3.2" "User Commands"
+.TH ELEMENTS-UTIL "1" "February 2026" "elements-util v23.3.2" "User Commands"
 .SH NAME
 elements-util \- manual page for elements-util v23.3.2
 .SH SYNOPSIS

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" "January 2026" "elements-wallet v23.3.2" "User Commands"
+.TH ELEMENTS-WALLET "1" "February 2026" "elements-wallet v23.3.2" "User Commands"
 .SH NAME
 elements-wallet \- manual page for elements-wallet v23.3.2
 .SH DESCRIPTION

doc/man/elementsd.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH ELEMENTSD "1" "January 2026" "elementsd v23.3.2" "User Commands"
+.TH ELEMENTSD "1" "February 2026" "elementsd v23.3.2" "User Commands"
 .SH NAME
 elementsd \- manual page for elementsd v23.3.2
 .SH SYNOPSIS
@@ -139,6 +139,10 @@ blockchain. (default: 0 = disable pruning blocks, 1 = allow
 manual pruning via RPC, >=550 = automatically prune block files
 to stay under the specified target size in MiB)
 .HP
+\fB\-ratelimitlogging\fR
+.IP
+Rate limit unconditional logging to disk (default: 1)
+.HP
 \fB\-reindex\fR
 .IP
 Rebuild chain state and block index from the blk*.dat files on disk
@@ -582,9 +586,9 @@ optional). If <category> is not supplied or if <category> = 1,
 output all debugging information. <category> can be: addrman,
 bench, blockstorage, cmpctblock, coindb, estimatefee, http, i2p,
 ipc, leveldb, libevent, mempool, mempoolrej, net, proxy, prune,
-qt, rand, reindex, rpc, selectcoins, tor, util, validation,
-walletdb, zmq. This option can be specified multiple times to
-output multiple categories.
+qt, rand, reindex, rpc, selectcoins, tor, uncond_always,
+uncond_rate_limited, util, validation, walletdb, zmq. This option
+can be specified multiple times to output multiple categories.
 .HP
 \fB\-debugexclude=\fR<category>
 .IP

src/qt/guiutil.cpp

@@ -142,10 +142,10 @@ void AddButtonShortcut(QAbstractButton* button, const QKeySequence& shortcut)
 
 bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
 {
-    return false;  // TODO
-
-    // return if URI is not valid or is no bitcoin: URI
-    if(!uri.isValid() || uri.scheme() != QString("bitcoin"))
+    // return if URI is not valid or incorrect scheme
+    bool valid_liquid = g_con_elementsmode && (uri.scheme() == QString("liquidnetwork") || uri.scheme() == QString("liquidtestnet"));
+    bool valid_bitcoin = !g_con_elementsmode && (uri.scheme() == QString("bitcoin"));
+    if (!uri.isValid() || !(valid_liquid || valid_bitcoin))
         return false;
 
     SendCoinsRecipient rv;
@@ -209,7 +209,11 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)
 {
     bool bech_32 = info.address.startsWith(QString::fromStdString(Params().Bech32HRP() + "1"));
 
-    QString ret = QString("bitcoin:%1").arg(bech_32 ? info.address.toUpper() : info.address);
+    QString network = QString("bitcoin:%1");
+    if (g_con_elementsmode) {
+        network = Params().NetworkIDString() == "liquidtestnet" ? QString("liquidtestnet:%1") : QString("liquidnetwork:%1");
+    }
+    QString ret = network.arg(bech_32 ? info.address.toUpper() : info.address);
     int paramCount = 0;
 
     if (info.amount)

src/qt/test/uritests.cpp

@@ -11,7 +11,47 @@
 
 void URITests::uriTests()
 {
-    /* Elements doesn't use URI
+    // liquid URI tests
+    g_con_elementsmode = true;
+    SendCoinsRecipient info{"lq1qq0ha4ml3dsqexnkdssskvt203kl54xj5zxt9sfwgzpy7unf49aagslltf4k7pqjtwk4j8emny0k8vppj88k0z9pa4y0mwfzyu", "label", 100000000, "message"};
+    QString liquid_uri = GUIUtil::formatBitcoinURI(info);
+    QVERIFY(liquid_uri.split(":")[0] == "liquidnetwork");
+
+    SendCoinsRecipient rcv;
+    QVERIFY(GUIUtil::parseBitcoinURI(liquid_uri, &rcv));
+    QVERIFY(rcv.address == QString("lq1qq0ha4ml3dsqexnkdssskvt203kl54xj5zxt9sfwgzpy7unf49aagslltf4k7pqjtwk4j8emny0k8vppj88k0z9pa4y0mwfzyu"));
+    QVERIFY(rcv.amount == 100000000);
+    QVERIFY(rcv.label == QString("label"));
+    QVERIFY(rcv.message == QString("message"));
+
+    // example liquidv1 URI from blockstream app
+    QUrl url{QString("liquidnetwork:lq1qq2j9v49hgsgz9s7v7myty50hsy0a6vk6sjmc9z6m0k208njwcllg9dzwk6prxmzy0wzvejc8tdn0fls88x8ksefwdw2l5hym9?assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d&amount=1.00000000")};
+    QVERIFY(GUIUtil::parseBitcoinURI(url, &rcv));
+    QVERIFY(rcv.address == QString("lq1qq2j9v49hgsgz9s7v7myty50hsy0a6vk6sjmc9z6m0k208njwcllg9dzwk6prxmzy0wzvejc8tdn0fls88x8ksefwdw2l5hym9"));
+    QVERIFY(rcv.amount == 100000000);
+    QVERIFY(rcv.label.isEmpty());
+    QVERIFY(rcv.message.isEmpty());
+
+    // example liquid testnet URI from blockstream app
+    url.setUrl(QString("liquidtestnet:tlq1qqggjrm7s09agm8vvgsld8sq3a0luppzwyg3fl3rtrl9xcq50n2cny8le5xdl4k7ufxz6m4249njkdvxfzhdax6fczggf8ncjz?assetid=144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49&amount=0.00100000"));
+    QVERIFY(GUIUtil::parseBitcoinURI(url, &rcv));
+    QVERIFY(rcv.address == QString("tlq1qqggjrm7s09agm8vvgsld8sq3a0luppzwyg3fl3rtrl9xcq50n2cny8le5xdl4k7ufxz6m4249njkdvxfzhdax6fczggf8ncjz"));
+    QVERIFY(rcv.amount == 100000);
+    QVERIFY(rcv.label.isEmpty());
+    QVERIFY(rcv.message.isEmpty());
+
+    // check bitcoin mode
+    g_con_elementsmode = false;
+    info = SendCoinsRecipient{"175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W", "label", 100000000, "message"};
+    QString bitcoin_uri = GUIUtil::formatBitcoinURI(info);
+    QVERIFY(bitcoin_uri.split(":")[0] == "bitcoin");
+    QVERIFY(GUIUtil::parseBitcoinURI(bitcoin_uri, &rcv));
+    QVERIFY(rcv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
+    QVERIFY(rcv.amount == 100000000);
+    QVERIFY(rcv.label == QString("label"));
+    QVERIFY(rcv.message == QString("message"));
+
+    // Bitcoin URI tests from upstream
     SendCoinsRecipient rv;
     QUrl uri;
     uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-dontexist="));
@@ -64,5 +104,4 @@ void URITests::uriTests()
 
     uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000.0&label=Wikipedia Example"));
     QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
-    */
 }