Skip to content

Commit 1af7a4d

Browse files
committed
Merge #1544: Elem 23.3.3 final
0ecea5c Update manpages (Pablo Greco) 1d76780 Bump version to 23.3.3 final (Pablo Greco) 6e079ea updated documentation for elements chain types (Tom Trevethan) 56b2572 enabled > 21m for issued assets in GUI amount field (Tom Trevethan) Pull request description: Updates master to 8db19e9, which fixes a GUI issue after ELIP 203 and a small documentation fix. Also and bumps version/manpages for release ACKs for top commit: tomt1664: Tested ACK 0ecea5c delta1: ACK 0ecea5c; tested locally Tree-SHA512: 5493957cae60b0dd11f28d8ff560f25bff6a27b88f19af98ddd8c7c0b634d784daea459ff487d09a54ae94663633e20ee9d5fd1e20eb205184e448616dd81428
2 parents 2262381 + 0ecea5c commit 1af7a4d

11 files changed

Lines changed: 23 additions & 23 deletions

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
22
define(_CLIENT_VERSION_MAJOR, 23)
33
define(_CLIENT_VERSION_MINOR, 3)
44
define(_CLIENT_VERSION_BUILD, 3)
5-
define(_CLIENT_VERSION_RC, 2)
5+
define(_CLIENT_VERSION_RC, 0)
66
define(_CLIENT_VERSION_IS_RELEASE, true)
77
define(_COPYRIGHT_YEAR, 2026)
88
define(_COPYRIGHT_HOLDERS,[The %s developers])

doc/man/elements-cli.1

Lines changed: 2 additions & 2 deletions
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" "March 2026" "elements-cli v23.3.3" "User Commands"
2+
.TH ELEMENTS-CLI "1" "April 2026" "elements-cli v23.3.3" "User Commands"
33
.SH NAME
44
elements-cli \- manual page for elements-cli v23.3.3
55
.SH SYNOPSIS
@@ -146,7 +146,7 @@ Chain selection options:
146146
\fB\-chain=\fR<chain>
147147
.IP
148148
Use the chain <chain> (default: liquidv1). Reserved values: main, test,
149-
signet, regtest, liquidv1, liquidv1test
149+
signet, regtest, liquidv1, liquidv1test, liquidtestnet
150150
.HP
151151
\fB\-con_blockheightinheader\fR
152152
.IP

doc/man/elements-qt.1

Lines changed: 2 additions & 2 deletions
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" "March 2026" "elements-qt v23.3.3" "User Commands"
2+
.TH ELEMENTS-QT "1" "April 2026" "elements-qt v23.3.3" "User Commands"
33
.SH NAME
44
elements-qt \- manual page for elements-qt v23.3.3
55
.SH SYNOPSIS
@@ -656,7 +656,7 @@ confidential addresses.(default: lq)
656656
\fB\-chain=\fR<chain>
657657
.IP
658658
Use the chain <chain> (default: liquidv1). Reserved values: main, test,
659-
signet, regtest, liquidv1, liquidv1test
659+
signet, regtest, liquidv1, liquidv1test, liquidtestnet
660660
.HP
661661
\fB\-con_blockheightinheader\fR
662662
.IP

doc/man/elements-tx.1

Lines changed: 2 additions & 2 deletions
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" "March 2026" "elements-tx v23.3.3" "User Commands"
2+
.TH ELEMENTS-TX "1" "April 2026" "elements-tx v23.3.3" "User Commands"
33
.SH NAME
44
elements-tx \- manual page for elements-tx v23.3.3
55
.SH SYNOPSIS
@@ -39,7 +39,7 @@ Chain selection options:
3939
\fB\-chain=\fR<chain>
4040
.IP
4141
Use the chain <chain> (default: liquidv1). Reserved values: main, test,
42-
signet, regtest, liquidv1, liquidv1test
42+
signet, regtest, liquidv1, liquidv1test, liquidtestnet
4343
.HP
4444
\fB\-con_blockheightinheader\fR
4545
.IP

doc/man/elements-util.1

Lines changed: 2 additions & 2 deletions
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" "March 2026" "elements-util v23.3.3" "User Commands"
2+
.TH ELEMENTS-UTIL "1" "April 2026" "elements-util v23.3.3" "User Commands"
33
.SH NAME
44
elements-util \- manual page for elements-util v23.3.3
55
.SH SYNOPSIS
@@ -24,7 +24,7 @@ Chain selection options:
2424
\fB\-chain=\fR<chain>
2525
.IP
2626
Use the chain <chain> (default: liquidv1). Reserved values: main, test,
27-
signet, regtest, liquidv1, liquidv1test
27+
signet, regtest, liquidv1, liquidv1test, liquidtestnet
2828
.HP
2929
\fB\-con_blockheightinheader\fR
3030
.IP

doc/man/elements-wallet.1

Lines changed: 2 additions & 2 deletions
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" "March 2026" "elements-wallet v23.3.3" "User Commands"
2+
.TH ELEMENTS-WALLET "1" "April 2026" "elements-wallet v23.3.3" "User Commands"
33
.SH NAME
44
elements-wallet \- manual page for elements-wallet v23.3.3
55
.SH DESCRIPTION
@@ -63,7 +63,7 @@ Chain selection options:
6363
\fB\-chain=\fR<chain>
6464
.IP
6565
Use the chain <chain> (default: liquidv1). Reserved values: main, test,
66-
signet, regtest, liquidv1, liquidv1test
66+
signet, regtest, liquidv1, liquidv1test, liquidtestnet
6767
.HP
6868
\fB\-con_blockheightinheader\fR
6969
.IP

doc/man/elementsd.1

Lines changed: 2 additions & 2 deletions
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" "March 2026" "elementsd v23.3.3" "User Commands"
2+
.TH ELEMENTSD "1" "April 2026" "elementsd v23.3.3" "User Commands"
33
.SH NAME
44
elementsd \- manual page for elementsd v23.3.3
55
.SH SYNOPSIS
@@ -656,7 +656,7 @@ confidential addresses.(default: lq)
656656
\fB\-chain=\fR<chain>
657657
.IP
658658
Use the chain <chain> (default: liquidv1). Reserved values: main, test,
659-
signet, regtest, liquidv1, liquidv1test
659+
signet, regtest, liquidv1, liquidv1test, liquidtestnet
660660
.HP
661661
\fB\-con_blockheightinheader\fR
662662
.IP

src/chainparamsbase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const std::string CBaseChainParams::DEFAULT = CBaseChainParams::LIQUID1;
2222

2323
void SetupChainParamsBaseOptions(ArgsManager& argsman)
2424
{
25-
argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: liquidv1). Reserved values: main, test, signet, regtest, liquidv1, liquidv1test", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
25+
argsman.AddArg("-chain=<chain>", "Use the chain <chain> (default: liquidv1). Reserved values: main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
2626
argsman.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
2727
"This is intended for regression testing tools and app development. Equivalent to -chain=regtest.", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
2828
argsman.AddArg("-testactivationheight=name@height.", "Set the activation height of 'name' (segwit, bip34, dersig, cltv, csv). (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);

src/qt/bitcoinamountfield.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ class AmountSpinBox: public QAbstractSpinBox
124124
val.second = val.second + steps * currentSingleStep;
125125
val.second = qMax(val.second, CAmount(0));
126126
val.second = qBound(m_min_amount, val.second, m_max_amount);
127-
// FIXME: Add this back in when assets can have > MAX_MONEY
128-
// if (val.first == Params().GetConsensus().pegged_asset)
129-
{
130-
val.second = qMin(val.second, BitcoinUnits::maxMoney());
131-
}
127+
// ELEMENTS: issued assets can have values > MAX_MONEY
128+
if (val.first == Params().GetConsensus().pegged_asset)
129+
{
130+
val.second = qMin(val.second, BitcoinUnits::maxMoney());
131+
}
132132
setValue(val);
133133
}
134134

@@ -228,8 +228,8 @@ class AmountSpinBox: public QAbstractSpinBox
228228
bool valid = GUIUtil::parseAssetAmount(current_asset, text, currentUnit, &val);
229229
if(valid)
230230
{
231-
// FIXME: Add this back in when assets can have > MAX_MONEY
232-
if (val < 0 || (val > BitcoinUnits::maxMoney() /*&& current_asset == Params().GetConsensus().pegged_asset*/)) {
231+
// ELEMENTS: issued assets can have values > MAX_MONEY
232+
if (val < 0 || (val > BitcoinUnits::maxMoney() && current_asset == Params().GetConsensus().pegged_asset)) {
233233
valid = false;
234234
}
235235
}

src/rpc/blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ RPCHelpMan getblockchaininfo()
16721672
RPCResult{
16731673
RPCResult::Type::OBJ, "", "",
16741674
{
1675-
{RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"},
1675+
{RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet)"},
16761676
{RPCResult::Type::NUM, "blocks", "the height of the most-work fully-validated chain. The genesis block has height 0"},
16771677
{RPCResult::Type::NUM, "headers", "the current number of headers we have validated"},
16781678
{RPCResult::Type::STR, "bestblockhash", "the hash of the currently best block"},

0 commit comments

Comments
 (0)