Skip to content

Commit b9f990b

Browse files
committed
cargo check works
1 parent aff41d6 commit b9f990b

File tree

14 files changed

+322
-616
lines changed

14 files changed

+322
-616
lines changed

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ license = "MIT OR Apache-2.0"
1414
[dependencies]
1515
bdk-macros = "^0.6"
1616
log = "^0.4"
17-
miniscript = { version = "7.0", features = ["use-serde"] }
18-
bitcoin = { version = "0.28.1", features = ["use-serde", "base64", "rand"] }
17+
miniscript = { git = "https://github.com/afilini/rust-miniscript.git", rev = "9f6316512cbc593a7f893816418c764df9a24129", features = ["serde"] }
18+
bitcoin = { version = "0.29.1", features = ["serde", "base64", "rand"] }
1919
serde = { version = "^1.0", features = ["derive"] }
2020
serde_json = { version = "^1.0" }
2121
rand = "^0.7"
2222

2323
# Optional dependencies
2424
sled = { version = "0.34", optional = true }
25-
electrum-client = { version = "0.11", optional = true }
25+
electrum-client = { version = "0.12", optional = true }
2626
rusqlite = { version = "0.27.0", optional = true }
2727
ahash = { version = "0.7.6", optional = true }
2828
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }
@@ -33,13 +33,13 @@ rocksdb = { version = "0.14", default-features = false, features = ["snappy"], o
3333
cc = { version = ">=1.0.64", optional = true }
3434
socks = { version = "0.3", optional = true }
3535
lazy_static = { version = "1.4", optional = true }
36-
hwi = { version = "0.2.2", optional = true }
36+
# hwi = { version = "0.2.2", optional = true }
3737

3838
bip39 = { version = "1.0.1", optional = true }
3939
bitcoinconsensus = { version = "0.19.0-3", optional = true }
4040

4141
# Needed by bdk_blockchain_tests macro and the `rpc` feature
42-
bitcoincore-rpc = { version = "0.15", optional = true }
42+
bitcoincore-rpc = { version = "0.16", optional = true }
4343

4444
# Platform-specific dependencies
4545
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -62,7 +62,7 @@ key-value-db = ["sled"]
6262
all-keys = ["keys-bip39"]
6363
keys-bip39 = ["bip39"]
6464
rpc = ["bitcoincore-rpc"]
65-
hardware-signer = ["hwi"]
65+
# hardware-signer = ["hwi"]
6666

6767
# We currently provide mulitple implementations of `Blockchain`, all are
6868
# blocking except for the `EsploraBlockchain` which can be either async or
@@ -95,12 +95,12 @@ test-rpc = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_22_0", "test-bl
9595
test-rpc-legacy = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_0_20_0", "test-blockchains"]
9696
test-esplora = ["electrsd/legacy", "electrsd/esplora_a33e97e1", "electrsd/bitcoind_22_0", "test-blockchains"]
9797
test-md-docs = ["electrum"]
98-
test-hardware-signer = ["hardware-signer"]
98+
# test-hardware-signer = ["hardware-signer"]
9999

100100
[dev-dependencies]
101101
lazy_static = "1.4"
102102
env_logger = "0.7"
103-
electrsd = "0.20"
103+
electrsd = "0.21"
104104

105105
[[example]]
106106
name = "address_validator"

src/database/memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ macro_rules! populate_test_db {
497497
}
498498
let tx = $crate::bitcoin::Transaction {
499499
version: 1,
500-
lock_time: 0,
500+
lock_time: bitcoin::PackedLockTime(0),
501501
input,
502502
output: tx_meta
503503
.output

src/descriptor/derived.rs

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)