Skip to content

Commit a89cfb4

Browse files
committed
cargo check works
1 parent ea47d7a commit a89cfb4

File tree

14 files changed

+305
-626
lines changed

14 files changed

+305
-626
lines changed

Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ 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 = { version = "8.0", 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 }
26-
esplora-client = { version = "0.1.1", default-features = false, optional = true }
25+
electrum-client = { version = "0.12", optional = true }
26+
# esplora-client = { version = "0.1.1", default-features = false, optional = true }
2727
rusqlite = { version = "0.27.0", optional = true }
2828
ahash = { version = "0.7.6", optional = true }
2929
futures = { version = "0.3", optional = true }
3030
async-trait = { version = "0.1", optional = true }
3131
rocksdb = { version = "0.14", default-features = false, features = ["snappy"], optional = true }
3232
cc = { version = ">=1.0.64", optional = true }
3333
socks = { version = "0.3", optional = true }
34-
hwi = { version = "0.2.3", optional = true }
34+
# hwi = { version = "0.2.3", optional = true }
3535

3636
bip39 = { version = "1.0.1", optional = true }
3737
bitcoinconsensus = { version = "0.19.0-3", optional = true }
3838

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

4242
# Platform-specific dependencies
4343
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -60,7 +60,7 @@ key-value-db = ["sled"]
6060
all-keys = ["keys-bip39"]
6161
keys-bip39 = ["bip39"]
6262
rpc = ["bitcoincore-rpc"]
63-
hardware-signer = ["hwi"]
63+
# hardware-signer = ["hwi"]
6464

6565
# We currently provide mulitple implementations of `Blockchain`, all are
6666
# blocking except for the `EsploraBlockchain` which can be either async or
@@ -78,16 +78,16 @@ hardware-signer = ["hwi"]
7878
async-interface = ["async-trait"]
7979
electrum = ["electrum-client"]
8080
# MUST ALSO USE `--no-default-features`.
81-
use-esplora-async = ["esplora", "esplora-client/async", "futures"]
82-
use-esplora-blocking = ["esplora", "esplora-client/blocking"]
81+
# use-esplora-async = ["esplora", "esplora-client/async", "futures"]
82+
# use-esplora-blocking = ["esplora", "esplora-client/blocking"]
8383
# Deprecated aliases
84-
use-esplora-reqwest = ["use-esplora-async"]
85-
use-esplora-ureq = ["use-esplora-blocking"]
84+
# use-esplora-reqwest = ["use-esplora-async"]
85+
# use-esplora-ureq = ["use-esplora-blocking"]
8686
# Typical configurations will not need to use `esplora` feature directly.
8787
esplora = []
8888

8989
# Use below feature with `use-esplora-async` to enable reqwest default TLS support
90-
reqwest-default-tls = ["esplora-client/async-https"]
90+
# reqwest-default-tls = ["esplora-client/async-https"]
9191

9292
# Debug/Test features
9393
test-blockchains = ["bitcoincore-rpc", "electrum-client"]
@@ -96,12 +96,12 @@ test-rpc = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_22_0", "test-bl
9696
test-rpc-legacy = ["rpc", "electrsd/electrs_0_8_10", "electrsd/bitcoind_0_20_0", "test-blockchains"]
9797
test-esplora = ["electrsd/legacy", "electrsd/esplora_a33e97e1", "electrsd/bitcoind_22_0", "test-blockchains"]
9898
test-md-docs = ["electrum"]
99-
test-hardware-signer = ["hardware-signer"]
99+
# test-hardware-signer = ["hardware-signer"]
100100

101101
[dev-dependencies]
102102
lazy_static = "1.4"
103103
env_logger = "0.7"
104-
electrsd = "0.20"
104+
electrsd = "0.21"
105105

106106
[[example]]
107107
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)