Skip to content

Prepare 23.3.3rc1#1534

Merged
delta1 merged 10 commits into
ElementsProject:elements-23.xfrom
psgreco:elem-23.3.3rc1
Feb 18, 2026
Merged

Prepare 23.3.3rc1#1534
delta1 merged 10 commits into
ElementsProject:elements-23.xfrom
psgreco:elem-23.3.3rc1

Conversation

@psgreco

@psgreco psgreco commented Feb 17, 2026

Copy link
Copy Markdown
Contributor

Updates master to 7791d31 which ELIP 202 and bumps version/manpages

delta1 and others added 10 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
@psgreco psgreco requested review from delta1 and tomt1664 February 17, 2026 21:20
@psgreco psgreco self-assigned this Feb 17, 2026
@tomt1664

Copy link
Copy Markdown
Member

Tested ACK 6c45fa0

@delta1

delta1 commented Feb 18, 2026

Copy link
Copy Markdown
Member

ACK 6c45fa0; diff looks as expected, built and tested locally

@delta1 delta1 merged commit 2d6711c into ElementsProject:elements-23.x Feb 18, 2026
14 checks passed
@psgreco psgreco deleted the elem-23.3.3rc1 branch February 18, 2026 10:21
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