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

Latest miniscript #160

Merged
merged 2 commits into from
Jul 19, 2023

Conversation

uncomputable
Copy link
Collaborator

Updates simplicity to the latest bitcoin(-hashes), elements and elements-miniscript.

I had to copy hex.rs because bitcoin-hashes dropped support. We might want to use a stable workaround instead once it exists.

There are also problems in the fuzz and bench crate that need to be resolved.

@uncomputable
Copy link
Collaborator Author

Rebased on master. Fuzzing is still broken because we need a patched version of bitcoin-hashes. There is also a weird bug for 1.48.0.

@apoelstra
Copy link
Collaborator

As suggested on IRC please try rust-bitcoin/rust-bitcoin commit c1c76756a65d1eb046ac934425603c83dbcd0d94 for bitcoin_hashes in fuzz/Cargo.toml.

@uncomputable
Copy link
Collaborator Author

Heads up, quote and proc-macro2 no longer compile for 1.48.0. They need to be patched: 7a1b268

Cargo.toml Show resolved Hide resolved
@apoelstra
Copy link
Collaborator

As suggested on IRC please try rust-bitcoin/rust-bitcoin commit c1c76756a65d1eb046ac934425603c83dbcd0d94 for bitcoin_hashes in fuzz/Cargo.toml.

For future reference: on IRC we noticed that this commit actually doesn't work, because it includes changes to the hash_newtype! macro that cause compilation failures when used in rust-bitcoin. Instead we had to create a one-off commit based on 0.30.1, which I tagged on apoelstra/rust-bitcoin as 2023-07--0.30.1-with-fuzzcfg.

@uncomputable uncomputable force-pushed the latest-miniscript branch 2 times, most recently from a8dd18c to d63c980 Compare July 19, 2023 15:25
@uncomputable uncomputable marked this pull request as ready for review July 19, 2023 15:33
bitcoin-hashes no longer provides ToHex and elements is an optional
dependency, so I copied hex.rs from elements, which was itself copied
from the previous version of bitcoin-hashes. Once bitcoin-hashes is
fixed we can easily switch over to that.

Fuzzing is updated.

We have multiple versions of bitcoin_hashes.
slip21 requires bitcoin_hashes < 0.12.0, which resolves to 0.11.
We have to be careful to overwrite 0.12.0 but not 0.11.

The jet benches are updated.

FFI is updated.
proc-macro2 1.0.66 jumps editions and quote depends on that.
Copy link
Collaborator

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 91ecf06

@apoelstra apoelstra merged commit 74bf15b into BlockstreamResearch:master Jul 19, 2023
@uncomputable uncomputable deleted the latest-miniscript branch July 20, 2023 06:39
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