diff --git a/configure.ac b/configure.ac index f43fd43008b..0ab8e916b0e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 23) define(_CLIENT_VERSION_MINOR, 4) define(_CLIENT_VERSION_BUILD, 0) -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]) diff --git a/doc/man/elements-cli.1 b/doc/man/elements-cli.1 index eb54de3ec26..6e0c753066c 100644 --- a/doc/man/elements-cli.1 +++ b/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" "March 2026" "elements-cli v23.4.0" "User Commands" +.TH ELEMENTS-CLI "1" "April 2026" "elements-cli v23.4.0" "User Commands" .SH NAME elements-cli \- manual page for elements-cli v23.4.0 .SH SYNOPSIS @@ -146,7 +146,7 @@ Chain selection options: \fB\-chain=\fR .IP Use the chain (default: liquidv1). Reserved values: main, test, -signet, regtest, liquidv1, liquidv1test +signet, regtest, liquidv1, liquidv1test, liquidtestnet .HP \fB\-con_blockheightinheader\fR .IP diff --git a/doc/man/elements-qt.1 b/doc/man/elements-qt.1 index cfc001a1381..5f0609fbc5e 100644 --- a/doc/man/elements-qt.1 +++ b/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" "March 2026" "elements-qt v23.4.0" "User Commands" +.TH ELEMENTS-QT "1" "April 2026" "elements-qt v23.4.0" "User Commands" .SH NAME elements-qt \- manual page for elements-qt v23.4.0 .SH SYNOPSIS @@ -656,7 +656,7 @@ confidential addresses.(default: lq) \fB\-chain=\fR .IP Use the chain (default: liquidv1). Reserved values: main, test, -signet, regtest, liquidv1, liquidv1test +signet, regtest, liquidv1, liquidv1test, liquidtestnet .HP \fB\-con_blockheightinheader\fR .IP diff --git a/doc/man/elements-tx.1 b/doc/man/elements-tx.1 index 1d194a39374..16fc65a2935 100644 --- a/doc/man/elements-tx.1 +++ b/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" "March 2026" "elements-tx v23.4.0" "User Commands" +.TH ELEMENTS-TX "1" "April 2026" "elements-tx v23.4.0" "User Commands" .SH NAME elements-tx \- manual page for elements-tx v23.4.0 .SH SYNOPSIS @@ -39,7 +39,7 @@ Chain selection options: \fB\-chain=\fR .IP Use the chain (default: liquidv1). Reserved values: main, test, -signet, regtest, liquidv1, liquidv1test +signet, regtest, liquidv1, liquidv1test, liquidtestnet .HP \fB\-con_blockheightinheader\fR .IP diff --git a/doc/man/elements-util.1 b/doc/man/elements-util.1 index 495f2943140..8816fbb8409 100644 --- a/doc/man/elements-util.1 +++ b/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" "March 2026" "elements-util v23.4.0" "User Commands" +.TH ELEMENTS-UTIL "1" "April 2026" "elements-util v23.4.0" "User Commands" .SH NAME elements-util \- manual page for elements-util v23.4.0 .SH SYNOPSIS @@ -24,7 +24,7 @@ Chain selection options: \fB\-chain=\fR .IP Use the chain (default: liquidv1). Reserved values: main, test, -signet, regtest, liquidv1, liquidv1test +signet, regtest, liquidv1, liquidv1test, liquidtestnet .HP \fB\-con_blockheightinheader\fR .IP diff --git a/doc/man/elements-wallet.1 b/doc/man/elements-wallet.1 index 1d5d3a614b9..6c6e2038019 100644 --- a/doc/man/elements-wallet.1 +++ b/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" "March 2026" "elements-wallet v23.4.0" "User Commands" +.TH ELEMENTS-WALLET "1" "April 2026" "elements-wallet v23.4.0" "User Commands" .SH NAME elements-wallet \- manual page for elements-wallet v23.4.0 .SH DESCRIPTION @@ -63,7 +63,7 @@ Chain selection options: \fB\-chain=\fR .IP Use the chain (default: liquidv1). Reserved values: main, test, -signet, regtest, liquidv1, liquidv1test +signet, regtest, liquidv1, liquidv1test, liquidtestnet .HP \fB\-con_blockheightinheader\fR .IP diff --git a/doc/man/elementsd.1 b/doc/man/elementsd.1 index 18d19b94f9c..1f7cf3aa970 100644 --- a/doc/man/elementsd.1 +++ b/doc/man/elementsd.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH ELEMENTSD "1" "March 2026" "elementsd v23.4.0" "User Commands" +.TH ELEMENTSD "1" "April 2026" "elementsd v23.4.0" "User Commands" .SH NAME elementsd \- manual page for elementsd v23.4.0 .SH SYNOPSIS @@ -656,7 +656,7 @@ confidential addresses.(default: lq) \fB\-chain=\fR .IP Use the chain (default: liquidv1). Reserved values: main, test, -signet, regtest, liquidv1, liquidv1test +signet, regtest, liquidv1, liquidv1test, liquidtestnet .HP \fB\-con_blockheightinheader\fR .IP diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 40a1078dbd9..76865b0f572 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -22,7 +22,7 @@ const std::string CBaseChainParams::DEFAULT = CBaseChainParams::LIQUID1; void SetupChainParamsBaseOptions(ArgsManager& argsman) { - argsman.AddArg("-chain=", "Use the chain (default: liquidv1). Reserved values: main, test, signet, regtest, liquidv1, liquidv1test", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); + argsman.AddArg("-chain=", "Use the chain (default: liquidv1). Reserved values: main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); argsman.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. " "This is intended for regression testing tools and app development. Equivalent to -chain=regtest.", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS); 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); diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 6bed9ea9705..5aaf2085dc8 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -124,11 +124,11 @@ class AmountSpinBox: public QAbstractSpinBox val.second = val.second + steps * currentSingleStep; val.second = qMax(val.second, CAmount(0)); val.second = qBound(m_min_amount, val.second, m_max_amount); - // FIXME: Add this back in when assets can have > MAX_MONEY - // if (val.first == Params().GetConsensus().pegged_asset) - { - val.second = qMin(val.second, BitcoinUnits::maxMoney()); - } + // ELEMENTS: issued assets can have values > MAX_MONEY + if (val.first == Params().GetConsensus().pegged_asset) + { + val.second = qMin(val.second, BitcoinUnits::maxMoney()); + } setValue(val); } @@ -228,8 +228,8 @@ class AmountSpinBox: public QAbstractSpinBox bool valid = GUIUtil::parseAssetAmount(current_asset, text, currentUnit, &val); if(valid) { - // FIXME: Add this back in when assets can have > MAX_MONEY - if (val < 0 || (val > BitcoinUnits::maxMoney() /*&& current_asset == Params().GetConsensus().pegged_asset*/)) { + // ELEMENTS: issued assets can have values > MAX_MONEY + if (val < 0 || (val > BitcoinUnits::maxMoney() && current_asset == Params().GetConsensus().pegged_asset)) { valid = false; } } diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 602cd5d9528..5ac5ec15603 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1673,7 +1673,7 @@ RPCHelpMan getblockchaininfo() RPCResult{ RPCResult::Type::OBJ, "", "", { - {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"}, + {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet)"}, {RPCResult::Type::NUM, "blocks", "the height of the most-work fully-validated chain. The genesis block has height 0"}, {RPCResult::Type::NUM, "headers", "the current number of headers we have validated"}, {RPCResult::Type::STR, "bestblockhash", "the hash of the currently best block"}, diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index dd5ae4af44b..d3c56a351a3 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -444,7 +444,7 @@ static RPCHelpMan getmininginfo() {RPCResult::Type::NUM, "difficulty", "The current difficulty"}, {RPCResult::Type::NUM, "networkhashps", "The network hashes per second"}, {RPCResult::Type::NUM, "pooledtx", "The size of the mempool"}, - {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest)"}, + {RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet)"}, {RPCResult::Type::STR, "warnings", "any network and blockchain warnings"}, }}, RPCExamples{