Bump bdk to 1.0.0-alpha.4

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       matrix:
         rust:
           - version: stable # Stable
-          - version: 1.60.0 # MSRV
+          - version: 1.63.0 # MSRV
         build-args:
           [
             "-p keechain-core --no-default-features",
@@ -61,7 +61,6 @@ jobs:
       matrix:
         rust:
           - version: stable # Stable
-          # - version: 1.65.0 # MSRV
         build-args:
           [
             "-p keechain-ffi",

keechain-core/Cargo.toml

@@ -8,14 +8,14 @@ homepage = "https://github.com/yukibtc/keechain"
 repository = "https://github.com/yukibtc/keechain.git"
 license = "MIT"
 keywords = ["bitcoin", "signer", "psbt", "offline"]
-rust-version = "1.60.0"
+rust-version = "1.63.0"
 
 [features]
 default = ["sysinfo"]
 
 [dependencies]
 aes = "0.8"
-bdk = { git = "https://github.com/bitcoindevkit/bdk", rev = "3fdab87ee7c02439b18a9e114ff588b282525402", default-features = false, features = ["std"] }
+bdk = { git = "https://github.com/yukibtc/bdk", rev = "285ff46a49fe53e1f7996b83335442e2febcdeae", default-features = false, features = ["std"] }
 bip39 = { version = "2.0", default-features = false, features = ["std", "zeroize"] }
 cbc = { version = "0.1", features = ["alloc"] }
 chacha20poly1305 = "0.10"

keechain-core/README.md

@@ -4,10 +4,6 @@
 
 KeeChain Core library.
 
-## Minimum Supported Rust Version (MSRV)
-
-These crates are built with the Rust language version `2021` and require a minimum compiler version of `1.60.0`
-
 ## State
 
 **This library is in an ALPHA state**, things that are implemented generally work but the API will change in breaking ways.

keechain-core/src/psbt.rs

@@ -15,7 +15,7 @@ use bdk::bitcoin::secp256k1::{Secp256k1, Signing};
 use bdk::bitcoin::{Network, PrivateKey};
 use bdk::miniscript::descriptor::DescriptorKeyParseError;
 use bdk::miniscript::Descriptor;
-use bdk::signer::{SignerContext, SignerOrdering, SignerWrapper};
+use bdk::signer::{SignerContext, SignerError, SignerOrdering, SignerWrapper};
 use bdk::{KeychainKind, SignOptions, Wallet};
 
 use crate::bips::bip32::{self, Bip32, DerivationPath, ExtendedPrivKey, Fingerprint};
@@ -36,7 +36,7 @@ pub enum Error {
     PsbtParse(PsbtParseError),
     Descriptors(descriptors::Error),
     DescriptorParse(DescriptorKeyParseError),
-    Bdk(bdk::Error),
+    BdkSigner(SignerError),
     BdkDescriptor(bdk::descriptor::DescriptorError),
     FileNotFound,
     InvalidDerivationPath,
@@ -57,8 +57,8 @@ impl fmt::Display for Error {
             Self::PsbtParse(e) => write!(f, "Psbt parse: {e}"),
             Self::Descriptors(e) => write!(f, "Descriptors: {e}"),
             Self::DescriptorParse(e) => write!(f, "Descriptor parse: {e}"),
-            Self::Bdk(e) => write!(f, "Bdk: {e}"),
-            Self::BdkDescriptor(e) => write!(f, "Bdk bescriptor: {e}"),
+            Self::BdkSigner(e) => write!(f, "BDK Signer: {e}"),
+            Self::BdkDescriptor(e) => write!(f, "BDK descriptor: {e}"),
             Self::FileNotFound => write!(f, "File not found"),
             Self::InvalidDerivationPath => write!(f, "Invalid derivation path"),
             Self::NothingToSign => write!(f, "Nothing to sign here"),
@@ -115,9 +115,9 @@ impl From<DescriptorKeyParseError> for Error {
     }
 }
 
-impl From<bdk::Error> for Error {
-    fn from(e: bdk::Error) -> Self {
-        Self::Bdk(e)
+impl From<SignerError> for Error {
+    fn from(e: SignerError) -> Self {
+        Self::BdkSigner(e)
     }
 }