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 bdk version to 0.24.0 #129

Merged
merged 3 commits into from
Nov 15, 2022

Conversation

notmandatory
Copy link
Member

@notmandatory notmandatory commented Nov 2, 2022

Description

Update BDK to the latest version, 0.24.0.

Notes to the reviewers

I also had to add base64 as a new dependency because it's not exported by bdk.

There's probably a more elegant way to fix the wasm.rs compiler function for descriptor.translate_pk, and I don't
know how create a unit test it since it only runs on wasm32. But at least it builds so I think that's close enough for now.

Checklists

All Submissions:

  • I've signed all my commits
  • I followed the contribution guidelines
  • I ran cargo fmt and cargo clippy before committing

@notmandatory notmandatory self-assigned this Nov 2, 2022
@notmandatory notmandatory marked this pull request as draft November 2, 2022 19:58
@notmandatory
Copy link
Member Author

This is ready to review, but can't be merged until after bdk 0.24.0 is released.

@notmandatory notmandatory added this to the Release 0.7.0 milestone Nov 2, 2022
@notmandatory notmandatory mentioned this pull request Nov 2, 2022
24 tasks
@notmandatory notmandatory force-pushed the update_bdk_024 branch 6 times, most recently from 2d5e33d to 9e55d6f Compare November 6, 2022 01:35
@notmandatory
Copy link
Member Author

This needs to be updated once bitcoindevkit/bdk-reserves#16 is merged and released.

@notmandatory notmandatory marked this pull request as ready for review November 11, 2022 20:18
Copy link
Contributor

@rajarshimaitra rajarshimaitra left a comment

Choose a reason for hiding this comment

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

Sorry took me some time to get back to this..

tACK b667738

Probably I am missing the context of it, but I just have one question..

bdk-macros = "0.6"
structopt = "0.3"
serde_json = "1.0"
log = "0.4"
zeroize = "<1.4.0"
dirs-next = "2.0"
env_logger = "0.7"
base64 = "^0.13"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why separately base64 when bitcoin reexports it? I am guessing some version conflicts in the process of upgrade?

But this makes us have two separate base64 dependencies.

[[package]]
name = "base64"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

[[package]]
name = "base64-compat"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7"
dependencies = [
 "byteorder",
]

I don't know in details the diffs between these two crates, but is this intended?

Copy link
Member Author

@notmandatory notmandatory Nov 13, 2022

Choose a reason for hiding this comment

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

The problem I ran into is that the latest rust-bitcoin doesn't re-export the base64 package. I copied the base64 version from the rust-bitcoin Cargo.toml:

[dependencies.base64]
version = "0.13.0"
optional = true

@afilini has a PR that was merged to fix this, but it looks like it's just not released yet. rust-bitcoin/rust-bitcoin#1342

Copy link
Contributor

Choose a reason for hiding this comment

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

Awesome.. It can then be resolved later once the PR is merged.. Opening a ticket to keep us reminded..

Copy link
Contributor

@rajarshimaitra rajarshimaitra left a comment

Choose a reason for hiding this comment

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

tACK b667738

@notmandatory notmandatory merged commit af925ab into bitcoindevkit:master Nov 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants