Simplicity #1219

roconnor-blockstream · 2023-03-07T19:17:02Z

Tasks needed to pass CI:

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

Tasks needed for public signet:

Add weight requirements for jets and combinantors (upstream).
Maximum memory allocation (upstream).
Other missing anti-DOS protection (upstream)?

Tasks needed for testing.

Ensure that the fuzzer covers libelementssimplicity.

Before merging:

Rebase on master.

delta1 · 2024-09-02T08:18:26Z

changed the base branch to 23.x since this was rebased @roconnor-blockstream

apoelstra · 2024-09-16T16:05:21Z

In 10ff078 you make simplicity a subtree (it appears not to be before then).

You should also update ci/lint/06_script.sh to add a check that the subtree has been correctly updated. (Currently passes in the commit where you add the subtree, but fails after the next commit 002c009 where you illegally add a sources.mk file to what should be a subtree directory. It appears that other cases where there is a sources.mk file, this exists upstream. For univalue it looks like they forked the repo to add this... see https://github.com/bitcoin-core/univalue-subtree ... gross.)

apoelstra · 2024-10-02T20:24:37Z

CI failures look real. e.g. on the ASan build it originates in

2024-10-02T15:23:10.952000Z TestFramework (ERROR): Assertion failed
4069 Traceback (most recent call last):
4070   File "/tmp/cirrus-ci-build/ci/scratch/build/elements-x86_64-pc-linux-gnu/test/functional/test_framework/test_framework.py", line 132, in main
4071     self.run_test()
4072   File "/tmp/cirrus-ci-build/ci/scratch/build/elements-x86_64-pc-linux-gnu/test/functional/feature_taproot.py", line 1820, in run_test
4073     self.test_spenders(self.nodes[1], spenders_taproot_active(), input_counts=[1, 2, 2, 2, 2, 3])
4074   File "/tmp/cirrus-ci-build/ci/scratch/build/elements-x86_64-pc-linux-gnu/test/functional/feature_taproot.py", line 1552, in test_spenders
4075     self.block_submit(node, [tx], msg, witness=True, accept=fail_input is None, cb_pubkey=cb_pubkey, fees=fee, sigops_weight=sigops_weight, err_msg=expected_fail_msg)
4076   File "/tmp/cirrus-ci-build/ci/scratch/build/elements-x86_64-pc-linux-gnu/test/functional/feature_taproot.py", line 1331, in block_submit
4077     assert block_response is not None and err_msg in block_response, "Missing error message '%s' from block response '%s': %s" % (err_msg, "(None)" if block_response is None else block_response, msg)
4078 AssertionError: Missing error message 'Invalid Schnorr signature hash type' from block response 'non-mandatory-script-verify-flag (Program's CMR does not match)': simplicity/empty_program,sighash/keypath_unk_hashtype_7*
4079 2024-10-02T15:23:11.007000Z TestFramework (INFO): Stopping nodes

in feature_taproot.py

test/functional/feature_taproot.py

apoelstra · 2024-10-04T13:36:48Z

code review ACK 0aeafeb

apoelstra · 2024-10-04T13:38:24Z

4 CI failures -- the windows one might be real (test_bitcoin failing); the TSan one looks like maybe we need new tsan whitelist entries; the other two are just environment/outdated CI failures.

Simplicity needs this fix.

git-subtree-dir: src/simplicity git-subtree-split: 86ac0f92c4b2b6d694dca85dce3b6909aed25894

…icity'

also filters src/simplicity/secp256k1 from the coverage results

This will be used by Simplicity.

Unactivated.

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.

delta1

utACK 5088360

pending CI at https://cirrus-ci.com/build/5064884356907008

apoelstra

utACK 5088360

This reverts commit 2534141, reversing changes made to fbc01d5.

apoelstra · 2025-02-04T16:05:38Z

Makefile.am

 	-p "src/crypto/ctaes" \
 	-p "src/minisketch" \
 	-p "src/secp256k1" \
+	-p "src/simplicity/secp256k1" \


In 50916cf:

Probably we didn't want to filter this. (I'm kinda surprised that the upstream libsecp is filtered. But I guess they have their own coverage analysis.)

While we're at it, we should stick /nix/store into this list and src/include/boost. I'm not sure why we need to do this and Bitcoin doesn't (well, the answer is "NixOS") but it's harmless and helpful for Russell and me.

I'm a little hesitant to add nix-specific fixes here, and rather just patch the file in https://github.com/roconnor-blockstream/elements-nix/

I've removed src/simplicity/secp256k1 from the filter as part of #1390.

roconnor-blockstream force-pushed the simplicity branch 2 times, most recently from 480f8e6 to acf8f90 Compare March 10, 2023 16:15

roconnor-blockstream force-pushed the simplicity branch 4 times, most recently from 0de6797 to 4d633f6 Compare March 29, 2023 18:34

roconnor-blockstream force-pushed the simplicity branch 3 times, most recently from 2bf20d6 to ea318a4 Compare April 18, 2023 13:45

roconnor-blockstream force-pushed the simplicity branch from ea318a4 to d177d2d Compare May 2, 2023 17:04

roconnor-blockstream force-pushed the simplicity branch from 7cfc6f3 to e144fa0 Compare May 18, 2023 17:33

roconnor-blockstream force-pushed the simplicity branch 2 times, most recently from 20d536d to 80c5d58 Compare June 14, 2023 22:31

roconnor-blockstream force-pushed the simplicity branch from 80c5d58 to 16fd80c Compare August 23, 2023 22:20

roconnor-blockstream force-pushed the simplicity branch 2 times, most recently from 86223f8 to 0c562ea Compare November 14, 2023 21:24

roconnor-blockstream force-pushed the simplicity branch 4 times, most recently from 2485f7a to cff3732 Compare August 14, 2024 17:21

delta1 changed the base branch from elements-22.x to elements-23.x September 2, 2024 08:17

roconnor-blockstream force-pushed the simplicity branch from 37c2311 to 4194517 Compare September 10, 2024 15:30

roconnor-blockstream force-pushed the simplicity branch 6 times, most recently from 6b3035d to a61faf5 Compare September 19, 2024 17:05

roconnor-blockstream marked this pull request as ready for review October 2, 2024 14:34

roconnor-blockstream commented Oct 2, 2024

View reviewed changes

test/functional/feature_taproot.py Outdated Show resolved Hide resolved

roconnor-blockstream force-pushed the simplicity branch from cb98f9c to 0aeafeb Compare October 3, 2024 16:28

roconnor-blockstream and others added 14 commits October 7, 2024 14:38

Cherry-pick <bitcoin/bitcoin#27122>

52b92b8

Simplicity needs this fix.

Exclude simplicity directory

5224c1a

Squashed 'src/simplicity/' content from commit 86ac0f92c4

f502c24

git-subtree-dir: src/simplicity git-subtree-split: 86ac0f92c4b2b6d694dca85dce3b6909aed25894

Merge commit 'f502c24196d23b74c2c402911ecc3a6839101557' as 'src/simpl…

8760cdd

…icity'

Lint simplicity subtree

d5ad21b

Add Simplicity to the build system.

28553fd

Add MSVC build configuration for libelementssimplicity

6c69253

simplicity: enable coverage in configure.ac

50916cf

also filters src/simplicity/secp256k1 from the coverage results

Store hash_genesis_block in PrecomputedTransactionData.

96fb8f5

This will be used by Simplicity.

Add Simplicity verification

1698454

Unactivated.

Add Simplicity Deployment structure

bcd508f

Simplicity Functional Tests.

afee926

Asset tests: Parse Elements script errors

4ca2411

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.

Asset tests: Check script error

5088360

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.

roconnor-blockstream force-pushed the simplicity branch from 0aeafeb to 5088360 Compare October 7, 2024 18:39

roconnor-blockstream changed the base branch from elements-23.x to master October 7, 2024 18:39

delta1 approved these changes Oct 7, 2024

View reviewed changes

apoelstra approved these changes Oct 7, 2024

View reviewed changes

apoelstra merged commit 2534141 into master Oct 7, 2024

apoelstra deleted the simplicity branch October 7, 2024 19:53

psgreco added a commit to psgreco/elements that referenced this pull request Nov 18, 2024

Revert "Merge ElementsProject#1219: Simplicity"

adb4478

This reverts commit 2534141, reversing changes made to fbc01d5.

jonathancross mentioned this pull request Nov 25, 2024

Simplicity tracking issue #945

Open

2 tasks

delta1 added a commit to delta1/elements that referenced this pull request Dec 2, 2024

Merge 2534141 into merged_master (Elements PR ElementsProject#1219)

d78604d

apoelstra reviewed Feb 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Simplicity #1219

Simplicity #1219

Uh oh!

roconnor-blockstream commented Mar 7, 2023 •

edited

Loading

Uh oh!

delta1 commented Sep 2, 2024

Uh oh!

apoelstra commented Sep 16, 2024 •

edited

Loading

Uh oh!

apoelstra commented Oct 2, 2024

Uh oh!

Uh oh!

apoelstra commented Oct 4, 2024

Uh oh!

apoelstra commented Oct 4, 2024

Uh oh!

delta1 left a comment •

edited

Loading

Uh oh!

apoelstra left a comment

Uh oh!

apoelstra Feb 4, 2025

Uh oh!

apoelstra Feb 4, 2025

Uh oh!

roconnor-blockstream Feb 4, 2025

Uh oh!

roconnor-blockstream Feb 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Simplicity #1219

Simplicity #1219

Uh oh!

Conversation

roconnor-blockstream commented Mar 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

delta1 commented Sep 2, 2024

Uh oh!

apoelstra commented Sep 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

apoelstra commented Oct 2, 2024

Uh oh!

Uh oh!

apoelstra commented Oct 4, 2024

Uh oh!

apoelstra commented Oct 4, 2024

Uh oh!

delta1 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

apoelstra left a comment

Choose a reason for hiding this comment

Uh oh!

apoelstra Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

apoelstra Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

roconnor-blockstream Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

roconnor-blockstream Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

roconnor-blockstream commented Mar 7, 2023 •

edited

Loading

apoelstra commented Sep 16, 2024 •

edited

Loading

delta1 left a comment •

edited

Loading