Skip to content

Commit

Permalink
core: bump bdk to 9efaead
Browse files Browse the repository at this point in the history
  • Loading branch information
yukibtc committed Jan 8, 2024
1 parent db8c3cb commit 37e58ef
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
9 changes: 4 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion keechain-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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/bitcoindevkit/bdk", rev = "9efaead8f16a5a0bed18cea514cd94d6a9a0a582", default-features = false, features = ["std"] }
bip39 = { version = "2.0", default-features = false, features = ["std", "zeroize"] }
cbc = { version = "0.1", features = ["alloc"] }
chacha20poly1305 = "0.10"
Expand Down
14 changes: 7 additions & 7 deletions keechain-core/src/psbt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -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,
Expand All @@ -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"),
Expand Down Expand Up @@ -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)
}
}

Expand Down

0 comments on commit 37e58ef

Please sign in to comment.