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

Update from Bitcoin Core #135

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Conversation

darosior
Copy link
Contributor

The PRs introducing Miniscript to Bitcoin Core contained the most up to date version of the code (bitcoin/bitcoin#24148 and bitcoin/bitcoin#24149).

Now they are both merged, update the code here to reflect the updates made in these PRs.

@sipa
Copy link
Owner

sipa commented Feb 16, 2023

make miniscript and make miniscript.js don't work, due to the NoDupCheck changes, it looks like.

@darosior
Copy link
Contributor Author

🤦‍♂️ Sorry i didn't even try to build the compiler..

The error was because the node constructor now needs a reference to the context. But it should certainly not perform the duplicate key check on all nodes it tries to build.

@darosior
Copy link
Contributor Author

Updated the compiler to always create nodes using NoDupCheck and to check for duplicate keys only on the top level node in Compile.

Both make miniscript and make miniscript.js work fine now.

@sipa
Copy link
Owner

sipa commented Feb 16, 2023

ACK 930e2f2. Matches the Bitcoin Core master branch code, and compiles.

@sipa sipa merged commit 2256a88 into sipa:master Feb 16, 2023
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