Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 23.2.5 rc1 #1379

Open
wants to merge 34 commits into
base: elements-23.2.x
Choose a base branch
from

Conversation

psgreco
Copy link
Contributor

@psgreco psgreco commented Dec 17, 2024

Includes all the fixes from master up to cc2ecbb but with simplicity reverted, to keep 23.2.x without it. Also includes a version bump and updated manpages.

roconnor-blockstream and others added 30 commits October 7, 2024 14:38
Simplicity needs this fix.
git-subtree-dir: src/simplicity
git-subtree-split: 86ac0f92c4b2b6d694dca85dce3b6909aed25894
also filters src/simplicity/secp256k1 from the coverage results
Take the existing function to parse script errors and extend it to parse
Elements errors. SCRIPT_ERR_ERROR_COUNT is not included because it is a
pseudo error.
Compare the expected script error, parsed from JSON, with the actual
error that VerifyScript returns. If the JSON does not include an
expected error, then skip this check.
5088360 Asset tests: Check script error (Christian Lewe)
4ca2411 Asset tests: Parse Elements script errors (Russell O'Connor)
afee926 Simplicity Functional Tests. (Russell O'Connor)
bcd508f Add Simplicity Deployment structure (Russell O'Connor)
1698454 Add Simplicity verification (Russell O'Connor)
96fb8f5 Store hash_genesis_block in PrecomputedTransactionData. (Russell O'Connor)
50916cf simplicity: enable coverage in configure.ac (Byron Hambly)
6c69253 Add MSVC build configuration for libelementssimplicity (Russell O'Connor)
28553fd Add Simplicity to the build system. (Russell O'Connor)
d5ad21b Lint simplicity subtree (Russell O'Connor)
f502c24 Squashed 'src/simplicity/' content from commit 86ac0f92c4 (Russell O'Connor)
5224c1a Exclude simplicity directory (Russell O'Connor)
52b92b8 Cherry-pick <bitcoin/bitcoin#27122> (Russell O'Connor)

Pull request description:

  Tasks needed to pass CI:

  - [x] For Mingw32, remove pthread dependency from Simplicity (upstream).
  - [x] Merge (upcoming) libsecp256k1 release into Simplicity (upstream).

  Tasks needed for public signet:
  - [x] Add weight requirements for jets and combinantors (upstream).
  - [x] Maximum memory allocation (upstream).
  - [x] Other missing anti-DOS protection (upstream)?

  Tasks needed for testing.
  - [ ] Ensure that the fuzzer covers `libelementssimplicity`.

  Before merging:
  - [ ] Rebase on master.

ACKs for top commit:
  delta1:
    utACK 5088360
  apoelstra:
    utACK 5088360

Tree-SHA512: c1f77c6133306d4d88fbc79aa86764b751497b75ec2884241f7d4fe946bbe6a13f3469cd586c44b4c1640fe2cb4c12299cc9998742d49aea5658a1893c0a6a68
We want to test Simplicity activation using evbparams.
This will effectively activate Simplicity as soon as the sole Liquid
Testnet signer is updated.
Copy the parameters for mainnet because they seem to have worked fine
for Taproot and are therefore a good starting point for Simplicity.
Copy them for regtest so that we can also copy the functional test for
activation, without needing to change a whole bunch of numbers.
…icity-activation

simplicity: define liquid testnet activation parameters
…0--simplicity-activation"

This reverts commit aa2420c, reversing
changes made to 2534141.
This reverts commit 2534141, reversing
changes made to fbc01d5.
@psgreco psgreco requested review from delta1 and apoelstra December 17, 2024 16:47
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.

5 participants