Skip to content

Commit

Permalink
Merge bitcoindevkit#1860: bdk_wallet: Pin bdk_chain version to la…
Browse files Browse the repository at this point in the history
…test release

0c23410 chore(wallet): Pin `bdk_chain` version to latest release (志宇)
7ce016d chore(examples): pin chain-src crates for wallet examples (志宇)
853dda4 ci: no-std requires hashbrown (志宇)

Pull request description:

  ### Description

  As discussed here: https://discord.com/channels/753336465005608961/753336465005608965/1344807550217883688

  Remove the use of Cargo `path` ref for the `bdk_chain` and `bdk_file_store` dependencies. This is the first step to move `bdk_wallet` into a new workspace.

  Also fixed CI failures as we were testing no-std without hashbrown.

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

ACKs for top commit:
  LLFourn:
    ACK 0c23410
  notmandatory:
    ACK 0c23410

Tree-SHA512: 9c690ae153bc312f045a00ea82bf6772dc3393ee9835d44d0e1ae0570780a84de8cc537471b3c26b438eee49eb3262bd91e246d36e578ff8acd06609f0368dd0
  • Loading branch information
notmandatory committed Feb 28, 2025
2 parents 46c218a + 0c23410 commit d9bd23f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cont_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- version: 1.63.0 # Overall MSRV
- version: 1.75.0 # Specific MSRV for `bdk_electrum`
features:
- --no-default-features --features miniscript/no-std
- --no-default-features --features miniscript/no-std,bdk_chain/hashbrown
- --all-features
steps:
- name: checkout
Expand Down
8 changes: 4 additions & 4 deletions crates/wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ miniscript = { version = "12.0.0", features = [ "serde" ], default-features = fa
bitcoin = { version = "0.32.4", features = [ "serde", "base64" ], default-features = false }
serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
bdk_chain = { path = "../chain", version = "0.21.1", features = [ "miniscript", "serde" ], default-features = false }
bdk_file_store = { path = "../file_store", version = "0.18.1", optional = true }
bdk_chain = { version = "0.21.1", features = [ "miniscript", "serde" ], default-features = false }
bdk_file_store = { version = "0.18.1", optional = true }

# Optional dependencies
bip39 = { version = "2.0", optional = true }
Expand All @@ -41,9 +41,9 @@ test-utils = ["std"]
lazy_static = "1.4"
assert_matches = "1.5.0"
tempfile = "3"
bdk_chain = { path = "../chain", features = ["rusqlite"] }
bdk_chain = { version = "0.21.1", features = ["rusqlite"] }
bdk_wallet = { path = ".", features = ["rusqlite", "file_store", "test-utils"] }
bdk_file_store = { path = "../file_store" }
bdk_file_store = { version = "0.18.1" }
anyhow = "1"
rand = "^0.8"

Expand Down
2 changes: 1 addition & 1 deletion example-crates/example_wallet_electrum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"

[dependencies]
bdk_wallet = { path = "../../crates/wallet", features = ["file_store"] }
bdk_electrum = { path = "../../crates/electrum" }
bdk_electrum = { version = "0.21" }
anyhow = "1"
2 changes: 1 addition & 1 deletion example-crates/example_wallet_esplora_async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
bdk_wallet = { path = "../../crates/wallet", features = ["rusqlite"] }
bdk_esplora = { path = "../../crates/esplora", features = ["async-https", "tokio"] }
bdk_esplora = { version = "0.20", features = ["async-https", "tokio"] }
tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
anyhow = "1"
2 changes: 1 addition & 1 deletion example-crates/example_wallet_esplora_blocking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ publish = false

[dependencies]
bdk_wallet = { path = "../../crates/wallet", features = ["file_store"] }
bdk_esplora = { path = "../../crates/esplora", features = ["blocking"] }
bdk_esplora = { version = "0.20", features = ["blocking"] }
anyhow = "1"
2 changes: 1 addition & 1 deletion example-crates/example_wallet_rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

[dependencies]
bdk_wallet = { path = "../../crates/wallet", features = ["file_store"] }
bdk_bitcoind_rpc = { path = "../../crates/bitcoind_rpc" }
bdk_bitcoind_rpc = { version = "0.18" }

anyhow = "1"
clap = { version = "4.5.17", features = ["derive", "env"] }
Expand Down

0 comments on commit d9bd23f

Please sign in to comment.