Skip to content

Commit df752b8

Browse files
committed
Merge #1567: Prepare 23.4.0rc3
2b102c8 Update manpages (Pablo Greco) bde2d5e Bump version to 23.4.0-rc3 (Pablo Greco) fecf4f1 fix help man (Ruslan Kasheparov) 7647638 add 'src/rpc/blockchain.cpp:.*trim' to the KNOWN_VIOLATIONS lint checks (Ruslan Kasheparov) 8408b79 fix help man (Ruslan Kasheparov) 60a97d1 Enable ELIP203 by default in liquidv1 (Pablo Greco) 7577eb9 Enable ELIP203 by default in liquidtestnet (Pablo Greco) 72e4e1c use break-system-packages for pip (Tom Trevethan) 6515f58 change test order in feature_discount_ct to fix intermittent failure (Tom Trevethan) Pull request description: Updates master to dee90f2, which fixes CI, enables ELIP 203 by default. and includes several RPC fixes. As usual, bump version and update manpages ACKs for top commit: tomt1664: Tested ACK 2b102c8 delta1: ACK 2b102c8; tested locally Tree-SHA512: 8b94a7106ab6104f784c196d4b2b5997a3e80c010892fadf0e1ff49d0d1e4b04e7863dc2c562ec0ff0406b0ee7fa343b402c45fc873a47a555a7b2edcd4bfdb0
2 parents 72ab564 + 2b102c8 commit df752b8

21 files changed

Lines changed: 374 additions & 181 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, 4)
44
define(_CLIENT_VERSION_BUILD, 0)
5-
define(_CLIENT_VERSION_RC, 2)
5+
define(_CLIENT_VERSION_RC, 3)
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: 1 addition & 1 deletion
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" "April 2026" "elements-cli v23.4.0" "User Commands"
2+
.TH ELEMENTS-CLI "1" "June 2026" "elements-cli v23.4.0" "User Commands"
33
.SH NAME
44
elements-cli \- manual page for elements-cli v23.4.0
55
.SH SYNOPSIS

doc/man/elements-qt.1

Lines changed: 4 additions & 3 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" "April 2026" "elements-qt v23.4.0" "User Commands"
2+
.TH ELEMENTS-QT "1" "June 2026" "elements-qt v23.4.0" "User Commands"
33
.SH NAME
44
elements-qt \- manual page for elements-qt v23.4.0
55
.SH SYNOPSIS
@@ -839,8 +839,9 @@ Relay and mine data carrier transactions (default: 1)
839839
.HP
840840
\fB\-datacarriersize\fR
841841
.IP
842-
Maximum size of data in data carrier transactions we relay and mine
843-
(default: 83)
842+
Relay and mine transactions whose data\-carrying raw scriptPubKeys in
843+
aggregate are of this size or less, allowing multiple outputs
844+
(default: 100000)
844845
.HP
845846
\fB\-minrelaytxfee=\fR<amt>
846847
.IP

doc/man/elements-tx.1

Lines changed: 1 addition & 1 deletion
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" "April 2026" "elements-tx v23.4.0" "User Commands"
2+
.TH ELEMENTS-TX "1" "June 2026" "elements-tx v23.4.0" "User Commands"
33
.SH NAME
44
elements-tx \- manual page for elements-tx v23.4.0
55
.SH SYNOPSIS

doc/man/elements-util.1

Lines changed: 1 addition & 1 deletion
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" "April 2026" "elements-util v23.4.0" "User Commands"
2+
.TH ELEMENTS-UTIL "1" "June 2026" "elements-util v23.4.0" "User Commands"
33
.SH NAME
44
elements-util \- manual page for elements-util v23.4.0
55
.SH SYNOPSIS

doc/man/elements-wallet.1

Lines changed: 1 addition & 1 deletion
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" "April 2026" "elements-wallet v23.4.0" "User Commands"
2+
.TH ELEMENTS-WALLET "1" "June 2026" "elements-wallet v23.4.0" "User Commands"
33
.SH NAME
44
elements-wallet \- manual page for elements-wallet v23.4.0
55
.SH DESCRIPTION

doc/man/elementsd.1

Lines changed: 4 additions & 3 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" "April 2026" "elementsd v23.4.0" "User Commands"
2+
.TH ELEMENTSD "1" "June 2026" "elementsd v23.4.0" "User Commands"
33
.SH NAME
44
elementsd \- manual page for elementsd v23.4.0
55
.SH SYNOPSIS
@@ -839,8 +839,9 @@ Relay and mine data carrier transactions (default: 1)
839839
.HP
840840
\fB\-datacarriersize\fR
841841
.IP
842-
Maximum size of data in data carrier transactions we relay and mine
843-
(default: 83)
842+
Relay and mine transactions whose data\-carrying raw scriptPubKeys in
843+
aggregate are of this size or less, allowing multiple outputs
844+
(default: 100000)
844845
.HP
845846
\fB\-minrelaytxfee=\fR<amt>
846847
.IP

src/chainparams.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,7 @@ class CLiquidTestNetParams : public CCustomParams {
11081108
default_signblockscript = "51210217e403ddb181872c32a0cd468c710040b2f53d8cac69f18dad07985ee37e9a7151ae";
11091109
create_discount_ct = false;
11101110
accept_discount_ct = true;
1111+
accept_unlimited_issuances = true;
11111112
UpdateFromArgs(args);
11121113
multi_data_permitted = true;
11131114
SetGenesisBlock();
@@ -1220,7 +1221,7 @@ class CLiquidV1Params : public CChainParams {
12201221

12211222
enforce_pak = true;
12221223

1223-
accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", false);
1224+
accept_unlimited_issuances = args.GetBoolArg("-acceptunlimitedissuances", true);
12241225

12251226
multi_data_permitted = true;
12261227
create_discount_ct = args.GetBoolArg("-creatediscountct", false);

src/rpc/blockchain.cpp

Lines changed: 65 additions & 43 deletions
Large diffs are not rendered by default.

src/rpc/mining.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ static RPCHelpMan getmininginfo()
441441
{RPCResult::Type::NUM, "blocks", "The current block"},
442442
{RPCResult::Type::NUM, "currentblockweight", /*optional=*/true, "The block weight of the last assembled block (only present if a block was ever assembled)"},
443443
{RPCResult::Type::NUM, "currentblocktx", /*optional=*/true, "The number of block transactions of the last assembled block (only present if a block was ever assembled)"},
444-
{RPCResult::Type::NUM, "difficulty", "The current difficulty"},
445-
{RPCResult::Type::NUM, "networkhashps", "The network hashes per second"},
444+
{RPCResult::Type::NUM, "difficulty", /*optional=*/true, "The current difficulty"},
445+
{RPCResult::Type::NUM, "networkhashps", /*optional=*/true, "The network hashes per second"},
446446
{RPCResult::Type::NUM, "pooledtx", "The size of the mempool"},
447447
{RPCResult::Type::STR, "chain", "current network name (main, test, signet, regtest, liquidv1, liquidv1test, liquidtestnet)"},
448448
{RPCResult::Type::STR, "warnings", "any network and blockchain warnings"},
@@ -556,11 +556,10 @@ static RPCHelpMan getblocktemplate()
556556
{"template_request", RPCArg::Type::OBJ, RPCArg::Default{UniValue::VOBJ}, "Format of the template",
557557
{
558558
{"mode", RPCArg::Type::STR, /* treat as named arg */ RPCArg::Optional::OMITTED_NAMED_ARG, "This must be set to \"template\", \"proposal\" (see BIP 23), or omitted"},
559-
{"capabilities", RPCArg::Type::ARR, /* treat as named arg */ RPCArg::Optional::OMITTED_NAMED_ARG, "A list of strings",
560-
{
561-
{"str", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "client side supported feature, 'longpoll', 'coinbasevalue', 'proposal', 'serverlist', 'workid'"},
562-
}},
563-
{"rules", RPCArg::Type::ARR, RPCArg::Optional::NO, "A list of strings",
559+
{"longpollid", RPCArg::Type::STR, RPCArg::Optional::OMITTED_NAMED_ARG, "The longpollid from a previous template to wait for an update"},
560+
{"data", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED_NAMED_ARG, "The hex-encoded block data to validate when mode is \"proposal\" (see BIP 23)"},
561+
{"maxversion", RPCArg::Type::NUM, RPCArg::Optional::OMITTED_NAMED_ARG, "Legacy maximum block version. Used only when \"rules\" is not provided"},
562+
{"rules", RPCArg::Type::ARR, RPCArg::Optional::OMITTED_NAMED_ARG, "A list of strings",
564563
{
565564
{"segwit", RPCArg::Type::STR, RPCArg::Optional::NO, "(literal) indicates client side segwit support"},
566565
{"str", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "other client side supported softfork deployment"},
@@ -1556,7 +1555,7 @@ static RPCHelpMan consumecompactsketch()
15561555
{
15571556
{RPCResult::Type::STR_HEX, "blockhex", "The filled block hex. Only returns when block is final"},
15581557
{RPCResult::Type::STR_HEX, "block_tx_req", "The serialized structure of missing transaction indices, given to serving node"},
1559-
{RPCResult::Type::STR_HEX, "found_tranasctions", "The serialized list of found transactions to be used in finalizecompactblock"},
1558+
{RPCResult::Type::STR_HEX, "found_transactions", "The serialized list of found transactions to be used in finalizecompactblock"},
15601559
},
15611560
},
15621561
RPCExamples{
@@ -1624,8 +1623,8 @@ static RPCHelpMan consumegetblocktxn()
16241623
return RPCHelpMan{"consumegetblocktxn",
16251624
"Consumes a transaction request for a compact block sketch.",
16261625
{
1627-
{"full_block", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Hex serialied block that corresponds to the block request `block_tx_req`."},
1628-
{"block_tx_req", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Hex serialied BlockTransactionsRequest, aka getblocktxn network message."},
1626+
{"full_block", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Hex serialized block that corresponds to the block request `block_tx_req`."},
1627+
{"block_tx_req", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Hex serialized BlockTransactionsRequest, aka getblocktxn network message."},
16291628
},
16301629
RPCResult{
16311630
RPCResult::Type::STR_HEX, "block_transactions", "The serialized list of found transactions aka BlockTransactions",

0 commit comments

Comments
 (0)