Merge commit 'refs/pull/348/head' of github.com:bitcoindevkit/bdk

diff --cc .github/workflows/cont_integration.yml
Simple merge

diff --cc Cargo.toml
index 0eede906b785e241408eb0122e3c8c6ab1c7d418,e62492225b73d44385eeb51d58cac959d6fb84af..1aed6d62db50f2aafb93ab40c959ea79d6a1ea58
--- 1/Cargo.toml
--- 2/Cargo.toml
+++ b/Cargo.toml
@@@ -64,8 -69,10 +69,9 @@@ test-md-docs = ["electrum"
  [dev-dependencies]
  lazy_static = "1.4"
  env_logger = "0.7"
 -base64 = "^0.11"
  clap = "2.33"
  serial_test = "0.4"
+ bitcoind = "0.10.0"
  
  [[example]]
  name = "address_validator"

diff --cc src/database/memory.rs
Simple merge

diff --cc src/error.rs
Simple merge

diff --cc src/lib.rs
Simple merge

diff --cc src/types.rs
Simple merge

diff --cc src/wallet/mod.rs
Simple merge