diff --git a/Cargo.lock b/Cargo.lock index 287af3b..c9d0f1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -207,11 +207,9 @@ dependencies = [ [[package]] name = "bdk" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ec4da3dbaa41bb6d6cffe40b113ea8651566da7f96beebe9c0e87fc92b9094" +version = "0.14.1-dev" +source = "git+https://github.com/bitcoindevkit/bdk#64e88f0e006c68315142d53dc35b633327dde4b5" dependencies = [ - "ahash", "async-trait", "bdk-macros", "bitcoin", @@ -220,7 +218,6 @@ dependencies = [ "log", "miniscript", "rand 0.7.3", - "rusqlite", "serde", "serde_json", "tokio", @@ -832,18 +829,6 @@ version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - [[package]] name = "figment" version = "0.10.6" @@ -1441,7 +1426,7 @@ dependencies = [ [[package]] name = "maia" version = "0.1.0" -source = "git+https://github.com/comit-network/maia#5e6d44882ced923c19f45c55a825b961c9b1e396" +source = "git+https://github.com/comit-network/maia?branch=temp-bdk-dependency#45e886ef9e04ce37c26b628abe143fd98e967fdd" dependencies = [ "anyhow", "bdk", @@ -2406,21 +2391,6 @@ dependencies = [ "uncased", ] -[[package]] -name = "rusqlite" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", - "smallvec", -] - [[package]] name = "rust-embed" version = "6.3.0" diff --git a/Cargo.toml b/Cargo.toml index 4ab645b..2f79d03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,5 +6,6 @@ resolver = "2" rocket = { git = "https://github.com/SergioBenitez/Rocket" } # Need to patch rocket dependency of `rocket_basicauth` until there is an official release. xtra = { git = "https://github.com/Restioson/xtra" } # We need to use unreleased patches. secp256k1-zkp = { git = "https://github.com/ElementsProject/rust-secp256k1-zkp" } # We need to use unreleased patches. -maia = { git = "https://github.com/comit-network/maia" } # Unreleased +maia = { git = "https://github.com/comit-network/maia", branch = "temp-bdk-dependency" } # Unreleased xtra_productivity = { git = "https://github.com/comit-network/xtra-productivity" } # Unreleased +bdk = { git = "https://github.com/bitcoindevkit/bdk" } # Unreleased diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index bef4e04..6be7cf0 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" anyhow = "1" async-trait = "0.1.51" atty = "0.2" -bdk = { version = "0.14", default-features = false, features = ["electrum"] } +bdk = { version = "0.14.1-dev", default-features = false, features = ["electrum"] } bytes = "1" chrono = { version = "0.4", features = ["serde"] } clap = "3.0.0-beta.5"