Skip to content

simplicity: update subtree to abede47e - #1589

Merged
tomt1664 merged 3 commits into
ElementsProject:masterfrom
delta1:2026-08-simplicity-subtree
Aug 31, 2026
Merged

simplicity: update subtree to abede47e#1589
tomt1664 merged 3 commits into
ElementsProject:masterfrom
delta1:2026-08-simplicity-subtree

Conversation

@delta1

@delta1 delta1 commented Aug 25, 2026

Copy link
Copy Markdown
Member

Updates the simplicity subtree to abede47eb835f5d39568cc705cefe5bf9e6ee769 matching BlockstreamResearch/simplicity#348

delta1 added 2 commits August 25, 2026 10:48
abede47eb8 Merge BlockstreamResearch/simplicity#324: Bitcoin Application for Simplicity
eae2b6f2fd misc: minor changes from ElementsProject#324 review
b2b8577164 cmake: add cmr and bitcoin/cmr to build
df01c33990 Add basic CMake build support for libBitcoinSimplicity
4924ea7c6c Implementation of cmr.c for bitcoin
9782370700 Implementation of exec.c for bitcoin
512feba872 Add SIMPLICITY_FALLTHROUGH macro and enable -Wimplicit-fallthrough in CI

git-subtree-dir: src/simplicity
git-subtree-split: abede47eb835f5d39568cc705cefe5bf9e6ee769
@tomt1664

Copy link
Copy Markdown
Member

I think simplicity/cmr.c needs to be added to add_library(elementssimplicity ...) in the main src/CMakeLists.txt for those failing CI jobs.

@delta1

delta1 commented Aug 28, 2026

Copy link
Copy Markdown
Member Author

Thanks @tomt1664

@tomt1664

Copy link
Copy Markdown
Member

ACK 04aa60c tested locally

@tomt1664
tomt1664 merged commit acbf560 into ElementsProject:master Aug 31, 2026
7 checks passed
tomt1664 added a commit to tomt1664/elements that referenced this pull request Sep 3, 2026
04aa60c build: add simplicity/cmr.c to src/CMakeLists.txt (Byron Hambly)
e15a625 Squashed 'src/simplicity/' changes from 49b96499a6..abede47eb8 (Byron Hambly)

Pull request description:

  Updates the simplicity subtree to abede47eb835f5d39568cc705cefe5bf9e6ee769 matching BlockstreamResearch/simplicity#348

ACKs for top commit:
  tomt1664:
    ACK 04aa60c tested locally

Tree-SHA512: 6e4b1a640398f8a3017bab2ea94704bb6166612b239069512e9fcb831cbac502a4efab4517ca9c54d39fdee731d9a1cce9374df4d16ee6f63ff23bb090d42c19
tomt1664 added a commit that referenced this pull request Sep 3, 2026
f80fb30 Merge #1589: simplicity: update subtree to abede47e (merge-script)
5b388c2 Merge pull request #1577 from Abdullah1738/feat/effective-fee-asset (Tom Trevethan)
48456e3 Add test that sighash midstate cache treats the SIGHASH_RANGEPROOF bit as part of its key (Tom Trevethan)
d47af63 Merge #1584: script: add and default to SIGHASH_ALL_WITH_RANGEPROOF for pre-taproot signing (merge-script)
7c23bd1 blind: reject empty surjection-target set in SurjectOutput (Byron Hambly)
3e11e03 blindpsbt: require genuine commitments in VerifyBlindValueProof (Byron Hambly)
99e9f25 blindpsbt: require both range bounds to match claim in VerifyBlindValueProof (Byron Hambly)
8a08453 validation: always validate and retain dynafed header block_height (Byron Hambly)
4309282 dynafed: require at least four-fifths approval for parameter transition (Byron Hambly)
6a49991 blindpsbt: refuse to blind a PSET output with no amount (Byron Hambly)
0ce3c24 blindpsbt: reject off-curve blinding pubkey before ECDH (Byron Hambly)
2391041 blindpsbt: return error instead of asserting on surjection proof failure (Byron Hambly)
6253d7e fix: range proof cache bind to asset and scriptpubkey (Byron Hambly)
3d7134f Merge #1593: Fix RPC return errors for psbt and invalid rangeproofs (merge-script)

Pull request description:

ACKs for top commit:
  delta1:
    ACK f80fb30; tested locally

Tree-SHA512: 42995e5b4842ce9694d9d5d30764230b774db24cda40d825742a174d564761e725a8323362404ee9653495936ab850c9933075b7ad924caa73768d0980bcbf96
delta1 pushed a commit that referenced this pull request Sep 6, 2026
04aa60c build: add simplicity/cmr.c to src/CMakeLists.txt (Byron Hambly)
e15a625 Squashed 'src/simplicity/' changes from 49b96499a6..abede47eb8 (Byron Hambly)

Pull request description:

  Updates the simplicity subtree to abede47eb835f5d39568cc705cefe5bf9e6ee769 matching BlockstreamResearch/simplicity#348

ACKs for top commit:
  tomt1664:
    ACK 04aa60c tested locally

Tree-SHA512: 6e4b1a640398f8a3017bab2ea94704bb6166612b239069512e9fcb831cbac502a4efab4517ca9c54d39fdee731d9a1cce9374df4d16ee6f63ff23bb090d42c19
(cherry picked from commit f80fb30)
delta1 added a commit that referenced this pull request Sep 6, 2026
6c2c562 build: fix depends Qt download link (Pablo Greco)
3c8b453 Merge #1593: Fix RPC return errors for psbt and invalid rangeproofs (merge-script)
45af24e DecomposePeginWitness: fix deserialization flags for MerkleBlock proof (Byron Hambly)
60488fa Merge #1589: simplicity: update subtree to abede47e (merge-script)
f1f9a3f blind: reject empty surjection-target set in SurjectOutput (Byron Hambly)
11f8ac6 blindpsbt: require genuine commitments in VerifyBlindValueProof (Byron Hambly)
db05523 blindpsbt: require both range bounds to match claim in VerifyBlindValueProof (Byron Hambly)
6257051 dynafed: require at least four-fifths approval for parameter transition (Byron Hambly)
53302be blindpsbt: refuse to blind a PSET output with no amount (Byron Hambly)
dd97f13 blindpsbt: reject off-curve blinding pubkey before ECDH (Byron Hambly)
87327c7 blindpsbt: return error instead of asserting on surjection proof failure (Byron Hambly)
212c43f fix: range proof cache bind to asset and scriptpubkey (Byron Hambly)

Pull request description:

  All clean cherry picks from 23.x branch, in preparation for 23.3.4rc2

ACKs for top commit:
  tomt1664:
    ACK 6c2c562 tested locally
  delta1:
    ACK 6c2c562

Tree-SHA512: 54129b93b1ce801dea0c427d69f74ada53df3584f9e4d05eaea70d0040cf28db9c36a83dd42d40a48031747bf757d27a316f8d7b88fb97756b6e4acd777f601e
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.

2 participants