Skip to content

Prepare 23.2.5 final #1383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 10, 2025
Merged

Prepare 23.2.5 final #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4a1b43
Continue receiving data for the current messages, even when we select…
psgreco Jan 3, 2025
475e77c
Update copyright year to 2025
psgreco Jan 9, 2025
5b5740e
Update manpages
psgreco Jan 9, 2025
4a2f79b
Bump version to 23.2.5 final
psgreco Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 23)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_BUILD, 5)
define(_CLIENT_VERSION_RC, 1)
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2024)
define(_COPYRIGHT_YEAR, 2025)
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/])
Expand Down
6 changes: 3 additions & 3 deletions doc/man/elements-cli.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ELEMENTS-CLI "1" "November 2024" "elements-cli v23.2.5" "User Commands"
.TH ELEMENTS-CLI "1" "January 2025" "elements-cli v23.2.5" "User Commands"
.SH NAME
elements-cli \- manual page for elements-cli v23.2.5
.SH SYNOPSIS
Expand Down Expand Up @@ -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-2024 The Elements Project developers
Copyright (C) 2009-2024 The Bitcoin Core developers
Copyright (C) 2009-2025 The Elements Project developers
Copyright (C) 2009-2025 The Bitcoin Core developers

Please contribute if you find Elements Core useful. Visit
<https://elementsproject.org/> for further information about the software.
Expand Down
9 changes: 5 additions & 4 deletions doc/man/elements-qt.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ELEMENTS-QT "1" "November 2024" "elements-qt v23.2.5" "User Commands"
.TH ELEMENTS-QT "1" "January 2025" "elements-qt v23.2.5" "User Commands"
.SH NAME
elements-qt \- manual page for elements-qt v23.2.5
.SH SYNOPSIS
Expand Down Expand Up @@ -637,7 +637,8 @@ Chain selection options:
.HP
\fB\-acceptdiscountct\fR
.IP
Accept discounted fees for Confidential Transactions (default: false)
Accept discounted fees for Confidential Transactions (default: true in
liquidtestnet and liquidv1, false otherwise)
.HP
\fB\-bech32_hrp\fR
.IP
Expand Down Expand Up @@ -1063,8 +1064,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-2024 The Elements Project developers
Copyright (C) 2009-2024 The Bitcoin Core developers
Copyright (C) 2009-2025 The Elements Project developers
Copyright (C) 2009-2025 The Bitcoin Core developers

Please contribute if you find Elements Core useful. Visit
<https://elementsproject.org/> for further information about the software.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/elements-tx.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ELEMENTS-TX "1" "November 2024" "elements-tx v23.2.5" "User Commands"
.TH ELEMENTS-TX "1" "January 2025" "elements-tx v23.2.5" "User Commands"
.SH NAME
elements-tx \- manual page for elements-tx v23.2.5
.SH SYNOPSIS
Expand Down Expand Up @@ -240,8 +240,8 @@ set=NAME:JSON\-STRING
.IP
Set register NAME to given JSON\-STRING
.SH COPYRIGHT
Copyright (C) 2009-2024 The Elements Project developers
Copyright (C) 2009-2024 The Bitcoin Core developers
Copyright (C) 2009-2025 The Elements Project developers
Copyright (C) 2009-2025 The Bitcoin Core developers

Please contribute if you find Elements Core useful. Visit
<https://elementsproject.org/> for further information about the software.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/elements-util.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ELEMENTS-UTIL "1" "November 2024" "elements-util v23.2.5" "User Commands"
.TH ELEMENTS-UTIL "1" "January 2025" "elements-util v23.2.5" "User Commands"
.SH NAME
elements-util \- manual page for elements-util v23.2.5
.SH SYNOPSIS
Expand Down Expand Up @@ -155,8 +155,8 @@ grind
.IP
Perform proof of work on hex header string
.SH COPYRIGHT
Copyright (C) 2009-2024 The Elements Project developers
Copyright (C) 2009-2024 The Bitcoin Core developers
Copyright (C) 2009-2025 The Elements Project developers
Copyright (C) 2009-2025 The Bitcoin Core developers

Please contribute if you find Elements Core useful. Visit
<https://elementsproject.org/> for further information about the software.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/elements-wallet.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ELEMENTS-WALLET "1" "November 2024" "elements-wallet v23.2.5" "User Commands"
.TH ELEMENTS-WALLET "1" "January 2025" "elements-wallet v23.2.5" "User Commands"
.SH NAME
elements-wallet \- manual page for elements-wallet v23.2.5
.SH DESCRIPTION
Expand Down Expand Up @@ -211,8 +211,8 @@ salvage
Attempt to recover private keys from a corrupt wallet. Warning:
\&'salvage' is experimental.
.SH COPYRIGHT
Copyright (C) 2009-2024 The Elements Project developers
Copyright (C) 2009-2024 The Bitcoin Core developers
Copyright (C) 2009-2025 The Elements Project developers
Copyright (C) 2009-2025 The Bitcoin Core developers

Please contribute if you find Elements Core useful. Visit
<https://elementsproject.org/> for further information about the software.
Expand Down
9 changes: 5 additions & 4 deletions doc/man/elementsd.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH ELEMENTSD "1" "November 2024" "elementsd v23.2.5" "User Commands"
.TH ELEMENTSD "1" "January 2025" "elementsd v23.2.5" "User Commands"
.SH NAME
elementsd \- manual page for elementsd v23.2.5
.SH SYNOPSIS
Expand Down Expand Up @@ -637,7 +637,8 @@ Chain selection options:
.HP
\fB\-acceptdiscountct\fR
.IP
Accept discounted fees for Confidential Transactions (default: false)
Accept discounted fees for Confidential Transactions (default: true in
liquidtestnet and liquidv1, false otherwise)
.HP
\fB\-bech32_hrp\fR
.IP
Expand Down Expand Up @@ -1041,8 +1042,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-2024 The Elements Project developers
Copyright (C) 2009-2024 The Bitcoin Core developers
Copyright (C) 2009-2025 The Elements Project developers
Copyright (C) 2009-2025 The Bitcoin Core developers

Please contribute if you find Elements Core useful. Visit
<https://elementsproject.org/> for further information about the software.
Expand Down
7 changes: 6 additions & 1 deletion src/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,9 @@ bool CConnman::GenerateSelectSet(const std::vector<CNode*>& nodes,
// write buffer in this case before receiving more. This avoids
// needlessly queueing received data, if the remote peer is not themselves
// receiving data. This means properly utilizing TCP flow control signalling.
// This logic can put both nodes in deadlock if they are both "not receiving",
// so there is a special case where we only stop receiving new messages, but
// keep processing the in-progress ones.
// * Otherwise, if there is space left in the receive buffer, select() for
// receiving data.
// * Hand off all complete messages to the processor, to be handled without
Expand All @@ -1445,7 +1448,9 @@ bool CConnman::GenerateSelectSet(const std::vector<CNode*>& nodes,
error_set.insert(pnode->m_sock->Get());
if (select_send) {
send_set.insert(pnode->m_sock->Get());
continue;
// Only stop receiving new messages, but keep processing incomplete ones
if (pnode->m_deserializer->IsEmpty())
continue;
}
if (select_recv) {
recv_set.insert(pnode->m_sock->Get());
Expand Down
6 changes: 6 additions & 0 deletions src/net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ class CNetMessage {
*/
class TransportDeserializer {
public:
// returns true if the current deserialization is empty
virtual bool IsEmpty() const = 0;
// returns true if the current deserialization is complete
virtual bool Complete() const = 0;
// set the serialization context version
Expand Down Expand Up @@ -363,6 +365,10 @@ class V1TransportDeserializer final : public TransportDeserializer
Reset();
}

bool IsEmpty() const override
{
return (nHdrPos == 0);
}
bool Complete() const override
{
if (!in_data)
Expand Down