Skip to content

Prepare 23.3.3rc2#1537

Merged
delta1 merged 16 commits intoElementsProject:elements-23.3.xfrom
psgreco:elem-23.3.3rc2
Mar 13, 2026
Merged

Prepare 23.3.3rc2#1537
delta1 merged 16 commits intoElementsProject:elements-23.3.xfrom
psgreco:elem-23.3.3rc2

Conversation

@psgreco
Copy link
Contributor

@psgreco psgreco commented Mar 12, 2026

Updates master to c990492, which adds support for enabling ELIP 203 in liquidv1, but with ELIP 202 reverted. Also and bumps version/manpages

delta1 and others added 16 commits January 15, 2026 18:10
In CreatePeginWitnessInner, the MerkleBlock is always serialized without
witness: PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS

In DecomposePeginWitness before this change, the MerkleBlock was
deserialized with witness: PROTOCOL_VERSION

This was only noticed as an issue in the pegin subsidy implementation,
in a failure in the feature_dynafed functional test. In the
test_transition_mempool_eject test case, the Merkle block proof is coming
from the same chain where we are creating a pegin.

See the comment: "hack: since we're not validating peg-ins in parent chain,
just make both the funding and claim tx on same chain (printing money)"

I haven't investigated enough to explain why this causes a
deserialization failure in this specific case, but presumably this change
is correct since we're always serializing without witness. Before this
DecomposePeginWitness was only used in src/psbt.cpp
…chain peg-in subsidy and minimum peg-in amount

a18a88b grammar: prefer peg-in to pegin in messages (Byron Hambly)
90b2b3b test: add pegin subsidy functional test (Byron Hambly)
186bb25 validation: check for peg-in subsidy and minimum (Byron Hambly)
51c89c6 subsidy: implementation for claimpegin, createrawpegin, and RPCs (Byron Hambly)
94cde59 subsidy: add chainparams and init (Byron Hambly)
f3b63f4 DecomposePeginWitness: fix deserialization flags for MerkleBlock proof (Byron Hambly)

Pull request description:

  Implementation for [ELIP 202](https://github.com/ElementsProject/ELIPs/blob/main/elip-0202.mediawiki)

ACKs for top commit:
  jsarenik:
    Running ACK a18a88b
  tomt1664:
    Tested ACK a18a88b

Tree-SHA512: 984fe2aa32e6814e14c9535e9fea7e03d3b6cf7a35621ccfb2a081a6ebab01906c5e883c5b505ced53f254401d30b6e975cb05e88efc8d3fbedc79abd0be72a2
bd59321 contrib: upstream my merge-prs.sh changes (Byron Hambly)

Pull request description:

  Cleaned up and lightly documented my updates to the `merge-prs.sh` script. Still need to write a usage doc.

ACKs for top commit:
  delta1:
    ACK bd59321; this script is currently being used for merging

Tree-SHA512: 16ca19af21441424d471263ba1bf817856bf3c7d5801a2ce55e83b22cacf62cb92c3bcc84c9f485d173a15b0dda4e0b8b1ec99b3c9cef4835b16aaaafe461d1f
…issuances

56eb713 Log status of ELIP 203 (Pablo Greco)
d805236 liquidv1: allow enabling -acceptunlimitedissuances (Pablo Greco)

Pull request description:

  Preparation for the activation of  [ELIP 203](https://github.com/ElementsProject/ELIPs/blob/main/elip-0203.mediawiki), we need to move from a hardcoded false to an optionin liquidv1

ACKs for top commit:
  tomt1664:
    Tested ACK 56eb713
  delta1:
    ACK 56eb713; tested locally, changes allow acceptunlimitedissuances to be configurable on liquidv1 chain

Tree-SHA512: 1671634af6f3dfeaf48c9c6f9aa8598fed1eddc6a279b7bbbfd6d7d7062b89d85a60ec561560308d55ef4e80790db760b8dd20c19167db248d13d41570893314
…nal sidechain peg-in subsidy and minimum peg-in amount"

This reverts commit 7791d31, reversing
changes made to 6bb916a.
@psgreco psgreco requested review from delta1 and tomt1664 March 12, 2026 17:55
@psgreco psgreco self-assigned this Mar 12, 2026
@psgreco psgreco changed the title Elem 23.3.3rc2 Prepare 23.3.3rc2 Mar 12, 2026
Copy link
Member

@delta1 delta1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK fa01ad2; tested locally, diff as expected

Copy link
Member

@tomt1664 tomt1664 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested ACK fa01ad2

@delta1 delta1 merged commit 2262381 into ElementsProject:elements-23.3.x Mar 13, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants