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

Bump libwally-core to 0.8.6 #81

Merged
merged 1 commit into from
Nov 26, 2022
Merged

Bump libwally-core to 0.8.6 #81

merged 1 commit into from
Nov 26, 2022

Conversation

Sjors
Copy link
Owner

@Sjors Sjors commented Nov 24, 2022

The secp256k1-zkp submodule at CLibWally/libwally-core/src/secp256k1 is updated along with libwally-core. In build-libwally.sh script we switch back to a vanilla libwally at the same commit that Bitcoin Core uses.

Although Bitcoin Core bumped that commit a few months ago, we don't change it here because secp256k1-zkp has not yet been rebased on it.

There were two breaking change in libwally-core:

  1. wally_psbt_from_bytes got an additional FLAGS argument in 0fb94751def8b2c767680e2428ebe2fdabd436c7 (PSBT/PSET updates ElementsProject/libwally-core#336): trivially fixed by setting it to 0

  2. wally_psbt_output no longer has a witness_script field as of 8f8481a3c509fc4a02425db3839f92594e6ea852 (PSBT v2 ElementsProject/libwally-core#330). This required a more tedious workaround.

@Sjors
Copy link
Owner Author

Sjors commented Nov 24, 2022

cc @jurvis

Tested this with nthKey.

@@ -89,6 +89,8 @@ public struct PSBTInput {
}

public struct PSBTOutput : Identifiable {
let wally_psbt: wally_psbt // Since libwally-core v0.8.6 getters require the top-level psbt object
let index: Int
Copy link
Contributor

Choose a reason for hiding this comment

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

doesn't seem like we use index outside of the initializer -- do we need a new property here?

Copy link
Owner Author

Choose a reason for hiding this comment

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

Good point, I dropped both index and wally_psbt properties.

The secp256k1-zkp submodule at CLibWally/libwally-core/src/secp256k1 is updated along with libwally-core. In build-libwally.sh script we switch back to a vanilla  libwally at the same commit that Bitcoin Core uses.

Although Bitcoin Core bumped that commit a few months ago, we don't change it here because secp256k1-zkp has not yet been rebased on it.

There were two breaking change in libwally-core:

1. wally_psbt_from_bytes got an additional FLAGS argument in 0fb94751def8b2c767680e2428ebe2fdabd436c7 (ElementsProject/libwally-core#336): trivially fixed by setting it to 0

2. wally_psbt_output no longer has a witness_script field as of 8f8481a3c509fc4a02425db3839f92594e6ea852  (ElementsProject/libwally-core#330). This required a more tedious workaround.
@Sjors Sjors force-pushed the 2022/11/wally-core-0.8.6 branch from 8118921 to d7c12bc Compare November 25, 2022 19:29
Copy link
Contributor

@jurvis jurvis left a comment

Choose a reason for hiding this comment

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

ACK d7c12bc

@Sjors Sjors merged commit d7c12bc into master Nov 26, 2022
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