Skip to content

Commit 81ea480

Browse files
delta1delta1
authored
Merge pull request #1383 from psgreco/elem-23.2.5-final
Prepare 23.2.5 final
2 parents ba24915 + 4a2f79b commit 81ea480

9 files changed

+36
-23
lines changed

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 23)
33
define(_CLIENT_VERSION_MINOR, 2)
44
define(_CLIENT_VERSION_BUILD, 5)
5-
define(_CLIENT_VERSION_RC, 1)
5+
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
7-
define(_COPYRIGHT_YEAR, 2024)
7+
define(_COPYRIGHT_YEAR, 2025)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])
99
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Elements Project]])
1010
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

+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" "November 2024" "elements-cli v23.2.5" "User Commands"
2+
.TH ELEMENTS-CLI "1" "January 2025" "elements-cli v23.2.5" "User Commands"
33
.SH NAME
44
elements-cli \- manual page for elements-cli v23.2.5
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-2024 The Elements Project developers
275-
Copyright (C) 2009-2024 The Bitcoin Core developers
274+
Copyright (C) 2009-2025 The Elements Project developers
275+
Copyright (C) 2009-2025 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.

‎doc/man/elements-qt.1

+5-4
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" "November 2024" "elements-qt v23.2.5" "User Commands"
2+
.TH ELEMENTS-QT "1" "January 2025" "elements-qt v23.2.5" "User Commands"
33
.SH NAME
44
elements-qt \- manual page for elements-qt v23.2.5
55
.SH SYNOPSIS
@@ -637,7 +637,8 @@ Chain selection options:
637637
.HP
638638
\fB\-acceptdiscountct\fR
639639
.IP
640-
Accept discounted fees for Confidential Transactions (default: false)
640+
Accept discounted fees for Confidential Transactions (default: true in
641+
liquidtestnet and liquidv1, false otherwise)
641642
.HP
642643
\fB\-bech32_hrp\fR
643644
.IP
@@ -1063,8 +1064,8 @@ trusted mainchain daemon using the `mainchain*` settings below.
10631064
All functionaries must run this enabled. (default: true if chain
10641065
has federated peg)
10651066
.SH COPYRIGHT
1066-
Copyright (C) 2009-2024 The Elements Project developers
1067-
Copyright (C) 2009-2024 The Bitcoin Core developers
1067+
Copyright (C) 2009-2025 The Elements Project developers
1068+
Copyright (C) 2009-2025 The Bitcoin Core developers
10681069

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

‎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" "November 2024" "elements-tx v23.2.5" "User Commands"
2+
.TH ELEMENTS-TX "1" "January 2025" "elements-tx v23.2.5" "User Commands"
33
.SH NAME
44
elements-tx \- manual page for elements-tx v23.2.5
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-2024 The Elements Project developers
244-
Copyright (C) 2009-2024 The Bitcoin Core developers
243+
Copyright (C) 2009-2025 The Elements Project developers
244+
Copyright (C) 2009-2025 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.

‎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" "November 2024" "elements-util v23.2.5" "User Commands"
2+
.TH ELEMENTS-UTIL "1" "January 2025" "elements-util v23.2.5" "User Commands"
33
.SH NAME
44
elements-util \- manual page for elements-util v23.2.5
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-2024 The Elements Project developers
159-
Copyright (C) 2009-2024 The Bitcoin Core developers
158+
Copyright (C) 2009-2025 The Elements Project developers
159+
Copyright (C) 2009-2025 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.

‎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" "November 2024" "elements-wallet v23.2.5" "User Commands"
2+
.TH ELEMENTS-WALLET "1" "January 2025" "elements-wallet v23.2.5" "User Commands"
33
.SH NAME
44
elements-wallet \- manual page for elements-wallet v23.2.5
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-2024 The Elements Project developers
215-
Copyright (C) 2009-2024 The Bitcoin Core developers
214+
Copyright (C) 2009-2025 The Elements Project developers
215+
Copyright (C) 2009-2025 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.

‎doc/man/elementsd.1

+5-4
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" "November 2024" "elementsd v23.2.5" "User Commands"
2+
.TH ELEMENTSD "1" "January 2025" "elementsd v23.2.5" "User Commands"
33
.SH NAME
44
elementsd \- manual page for elementsd v23.2.5
55
.SH SYNOPSIS
@@ -637,7 +637,8 @@ Chain selection options:
637637
.HP
638638
\fB\-acceptdiscountct\fR
639639
.IP
640-
Accept discounted fees for Confidential Transactions (default: false)
640+
Accept discounted fees for Confidential Transactions (default: true in
641+
liquidtestnet and liquidv1, false otherwise)
641642
.HP
642643
\fB\-bech32_hrp\fR
643644
.IP
@@ -1041,8 +1042,8 @@ trusted mainchain daemon using the `mainchain*` settings below.
10411042
All functionaries must run this enabled. (default: true if chain
10421043
has federated peg)
10431044
.SH COPYRIGHT
1044-
Copyright (C) 2009-2024 The Elements Project developers
1045-
Copyright (C) 2009-2024 The Bitcoin Core developers
1045+
Copyright (C) 2009-2025 The Elements Project developers
1046+
Copyright (C) 2009-2025 The Bitcoin Core developers
10461047

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

‎src/net.cpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -1425,6 +1425,9 @@ bool CConnman::GenerateSelectSet(const std::vector<CNode*>& nodes,
14251425
// write buffer in this case before receiving more. This avoids
14261426
// needlessly queueing received data, if the remote peer is not themselves
14271427
// receiving data. This means properly utilizing TCP flow control signalling.
1428+
// This logic can put both nodes in deadlock if they are both "not receiving",
1429+
// so there is a special case where we only stop receiving new messages, but
1430+
// keep processing the in-progress ones.
14281431
// * Otherwise, if there is space left in the receive buffer, select() for
14291432
// receiving data.
14301433
// * Hand off all complete messages to the processor, to be handled without
@@ -1445,7 +1448,9 @@ bool CConnman::GenerateSelectSet(const std::vector<CNode*>& nodes,
14451448
error_set.insert(pnode->m_sock->Get());
14461449
if (select_send) {
14471450
send_set.insert(pnode->m_sock->Get());
1448-
continue;
1451+
// Only stop receiving new messages, but keep processing incomplete ones
1452+
if (pnode->m_deserializer->IsEmpty())
1453+
continue;
14491454
}
14501455
if (select_recv) {
14511456
recv_set.insert(pnode->m_sock->Get());

‎src/net.h

+6
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,8 @@ class CNetMessage {
313313
*/
314314
class TransportDeserializer {
315315
public:
316+
// returns true if the current deserialization is empty
317+
virtual bool IsEmpty() const = 0;
316318
// returns true if the current deserialization is complete
317319
virtual bool Complete() const = 0;
318320
// set the serialization context version
@@ -363,6 +365,10 @@ class V1TransportDeserializer final : public TransportDeserializer
363365
Reset();
364366
}
365367

368+
bool IsEmpty() const override
369+
{
370+
return (nHdrPos == 0);
371+
}
366372
bool Complete() const override
367373
{
368374
if (!in_data)

0 commit comments

Comments
 (0)