Skip to content

Prepare 23.3.2rc1#1527

Merged
tomt1664 merged 13 commits intoElementsProject:elements-23.xfrom
psgreco:elem-23.3.2rc1
Jan 21, 2026
Merged

Prepare 23.3.2rc1#1527
tomt1664 merged 13 commits intoElementsProject:elements-23.xfrom
psgreco:elem-23.3.2rc1

Conversation

@psgreco
Copy link
Contributor

@psgreco psgreco commented Jan 21, 2026

Updates master to 6d29a59, which includes fixes for windows builds, simplicity and tweakfedpegscript rpc.

Also updates updates the copyright year, manpages and bumps the version

delta1 and others added 13 commits January 8, 2026 09:07
49b96499a6 Replace Bitcoin Relative Timelock Jets
89ddb43eed Mark depricated parts of the TxEnv as obsolete
ff5d6fe4f7 Deprecate Broken Jets
ae008201ac Test Bitcoin jet deserialization
e81b68f197 Add GenPrimitive --bitcoin option
7887d16f24 Bitcoin specific fee jets
68603073b3 Bitcoin specific environment
ae3287e60f Refactor Makefile
99e3804e2d C: replace string initializations with arrays
c3dd9331cd Allow building on non-intel systems

git-subtree-dir: src/simplicity
git-subtree-split: 49b96499a6bb93b31d2f712fc1d4524f341ae640
87c0b44 Squashed 'src/simplicity/' changes from 6d503ea4f8..49b96499a6 (Byron Hambly)
73d1e52 docs: add simplicity code update instructions (Byron Hambly)

Pull request description:

  Updates Simplicity C source subtree from current master BlockstreamResearch/simplicity@d190505

  Adds new document describing the process.

  Pushed the C-master branch subtree split to my repo [delta1/simplicity/tree/C-master](https://github.com/delta1/simplicity/tree/C-master) and upstreamed in BlockstreamResearch/simplicity#330

ACKs for top commit:
  delta1:
    ACK 4539002; compiled and tested locally

Tree-SHA512: e9fab8baa728ac122597bf2e3c5ae4fe1c5956c655fc336e1cc7a2be591f1deebcab32004a8b6b4ad359c51154ad47bca5f40c21d06823d5d059a6d66efb15af
Changes tweakfedpegscript to return both p2wsh and p2shwsh version of
the tweaked address.

"address" has been removed from the result and replaced with "p2wsh" and
"p2shwsh".
…egscript

rpc!: change tweakfedpegscript to output both p2wsh and p2shwsh addresses
@psgreco psgreco requested review from delta1 and tomt1664 January 21, 2026 00:36
@delta1
Copy link
Member

delta1 commented Jan 21, 2026

ACK df5f043; diff and commits look as expected, ran tests locally

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.

ACK df5f043
Tested locally

@tomt1664 tomt1664 merged commit 7d23662 into ElementsProject:elements-23.x Jan 21, 2026
14 checks passed
@psgreco psgreco deleted the elem-23.3.2rc1 branch January 21, 2026 16:51
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