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

Vendor Bitcoin Core v24.2 #87

Merged
merged 2 commits into from
Feb 5, 2024

Conversation

tcharding
Copy link
Member

@tcharding tcharding commented Feb 3, 2024

Run the vendoring script:

./contrib/vendor-bitcoin-core.sh v24.2

Also, patch the build.rs file to add:

`.include("depend/bitcoin/src/secp256k1/include")`

@tcharding tcharding force-pushed the 02-03-vendor-24.2 branch 2 times, most recently from 75b74ed to ca3af0a Compare February 3, 2024 00:30
@tcharding
Copy link
Member Author

tcharding commented Feb 3, 2024

Not sure what to make of the build failures, cargo build works for me locally. Its failing when building secp, that led me to read the build.rs in secp and that is where the additional include came from. Any ideas @apoelstra? One thing that stands out is SECP256K1_API vs SECP256K1_BUILD (secp, bitcoinconsensus respectively).

EDIT: Silly me, its cargo test that is failing not cargo build

@tcharding tcharding force-pushed the 02-03-vendor-24.2 branch 3 times, most recently from 4bbb167 to a61cb1e Compare February 4, 2024 21:42
@tcharding tcharding mentioned this pull request Feb 4, 2024
@tcharding tcharding marked this pull request as ready for review February 4, 2024 22:01
@tcharding
Copy link
Member Author

Oh yeah, fixed it!

Run the vendoring script:

   `./contrib/vendor-bitcoin-core.sh v24.2`

To get the new code to build we need to patch the `build.rs` file:

- Add `.include("depend/bitcoin/src/secp256k1/include")`
- Remove unnecessary include (`src/secp256k1`, no source/header files)
- Group `define` statements.
- Add two additional source files to build.
There are a couple of flags that are no longer used. I did not check
this but rather just copied

  rust-bitcoin/rust-secp256k1#536
Copy link
Member

@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 6730e46

@tcharding
Copy link
Member Author

tcharding commented Feb 4, 2024

I've got the release branch on my machine at home, I'll be back there in an hour to rebase it and push it up.

@tcharding tcharding merged commit b6d07db into rust-bitcoin:master Feb 5, 2024
5 checks passed
@tcharding
Copy link
Member Author

Let me know please if you didn't want that merged for some reason.

@tcharding tcharding deleted the 02-03-vendor-24.2 branch February 5, 2024 00:53
@tcharding
Copy link
Member Author

#90 is ready to go.

@apoelstra apoelstra mentioned this pull request Feb 7, 2024
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.

None yet

2 participants