frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoindevkit/bdk-ffi#221: Bump bdk version to 0.24.0

Browse Source 
29de6f2d060461da34333ea8b52aeaf531434ca2 Bump bdk version to 0.24.0 (thunderbiscuit)

Pull request description:

  ## Description
  This PR updates BDK to the latest version, `0.24.0`.

  ### Notes to the reviewers
  This PR is currently open only for CI testing and review. Only merge once bdk 0.24.0 is out and the PR has been updated.

  ### Changelog notice
  ```txt
  - Update BDK to latest version 0.24.0 [#221]

  [#221](https://github.com/bitcoindevkit/bdk-ffi/pull/221)
  ```

  #### All Submissions:
  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

ACKs for top commit:
  notmandatory:
    ACK 29de6f2d060461da34333ea8b52aeaf531434ca2

Tree-SHA512: 256eb4387728467704f732ce1151de9569b6121916bb1d814bb48c75faf20026846e6170a384ca7e5e9ac3652bd9dfe5511e019f13c972ae755f0b37f9db8b83
This commit is contained in:
Steve Myers 2022-11-07 11:46:06 -06:00
commit 3a07b4838a
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -9,13 +9,12 @@ license = "MIT OR Apache-2.0"
members = [".","bdk-ffi-bindgen"] members = [".","bdk-ffi-bindgen"]
default-members = [".", "bdk-ffi-bindgen"] default-members = [".", "bdk-ffi-bindgen"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib] [lib]
crate-type = ["staticlib", "cdylib"] crate-type = ["staticlib", "cdylib"]
name = "bdkffi" name = "bdkffi"
[dependencies] [dependencies]
bdk = { version = "0.23", features = ["all-keys", "use-esplora-ureq", "sqlite-bundled"] } bdk = { version = "0.24", features = ["all-keys", "use-esplora-ureq", "sqlite-bundled"] }
uniffi_macros = { version = "0.21.0", features = ["builtin-bindgen"] } uniffi_macros = { version = "0.21.0", features = ["builtin-bindgen"] }
uniffi = { version = "0.21.0", features = ["builtin-bindgen"] } uniffi = { version = "0.21.0", features = ["builtin-bindgen"] }

2
src/bdk.udl
View File

@ -32,9 +32,9 @@ enum BdkError {
"ProgressUpdateError", "ProgressUpdateError",
"InvalidOutpoint", "InvalidOutpoint",
"Descriptor", "Descriptor",
"AddressValidator",
"Encode", "Encode",
"Miniscript", "Miniscript",
"MiniscriptPsbt",
"Bip32", "Bip32",
"Secp256k1", "Secp256k1",
"Json", "Json",

17
src/lib.rs
View File

@ -4,6 +4,7 @@ use bdk::bitcoin::secp256k1::Secp256k1;
use bdk::bitcoin::util::bip32::DerivationPath as BdkDerivationPath; use bdk::bitcoin::util::bip32::DerivationPath as BdkDerivationPath;
use bdk::bitcoin::util::psbt::serialize::Serialize; use bdk::bitcoin::util::psbt::serialize::Serialize;
use bdk::bitcoin::util::psbt::PartiallySignedTransaction; use bdk::bitcoin::util::psbt::PartiallySignedTransaction;
use bdk::bitcoin::Sequence;
use bdk::bitcoin::{Address as BdkAddress, Network, OutPoint as BdkOutPoint, Txid}; use bdk::bitcoin::{Address as BdkAddress, Network, OutPoint as BdkOutPoint, Txid};
use bdk::blockchain::any::{AnyBlockchain, AnyBlockchainConfig}; use bdk::blockchain::any::{AnyBlockchain, AnyBlockchainConfig};
use bdk::blockchain::GetBlockHash; use bdk::blockchain::GetBlockHash;
@ -758,7 +759,7 @@ impl TxBuilder {
tx_builder.enable_rbf(); tx_builder.enable_rbf();
} }
RbfValue::Value(nsequence) => { RbfValue::Value(nsequence) => {
tx_builder.enable_rbf_with_sequence(nsequence); tx_builder.enable_rbf_with_sequence(Sequence(nsequence));
} }
} }
} }
@ -844,7 +845,7 @@ impl BumpFeeTxBuilder {
tx_builder.enable_rbf(); tx_builder.enable_rbf();
} }
RbfValue::Value(nsequence) => { RbfValue::Value(nsequence) => {
tx_builder.enable_rbf_with_sequence(nsequence); tx_builder.enable_rbf_with_sequence(Sequence(nsequence));
} }
} }
} }
@ -947,7 +948,7 @@ impl DescriptorSecretKey {
descriptor_secret_key_mutex: Mutex::new(derived_descriptor_secret_key), descriptor_secret_key_mutex: Mutex::new(derived_descriptor_secret_key),
})) }))
} }
BdkDescriptorSecretKey::SinglePriv(_) => { BdkDescriptorSecretKey::Single(_) => {
unreachable!() unreachable!()
} }
} }
@ -969,7 +970,7 @@ impl DescriptorSecretKey {
descriptor_secret_key_mutex: Mutex::new(extended_descriptor_secret_key), descriptor_secret_key_mutex: Mutex::new(extended_descriptor_secret_key),
}) })
} }
BdkDescriptorSecretKey::SinglePriv(_) => { BdkDescriptorSecretKey::Single(_) => {
unreachable!() unreachable!()
} }
} }
@ -981,7 +982,7 @@ impl DescriptorSecretKey {
.descriptor_secret_key_mutex .descriptor_secret_key_mutex
.lock() .lock()
.unwrap() .unwrap()
.as_public(&secp) .to_public(&secp)
.unwrap(); .unwrap();
Arc::new(DescriptorPublicKey { Arc::new(DescriptorPublicKey {
descriptor_public_key_mutex: Mutex::new(descriptor_public_key), descriptor_public_key_mutex: Mutex::new(descriptor_public_key),
@ -995,7 +996,7 @@ impl DescriptorSecretKey {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => { BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
descriptor_x_key.xkey.private_key.secret_bytes().to_vec() descriptor_x_key.xkey.private_key.secret_bytes().to_vec()
} }
BdkDescriptorSecretKey::SinglePriv(_) => { BdkDescriptorSecretKey::Single(_) => {
unreachable!() unreachable!()
} }
}; };
@ -1035,7 +1036,7 @@ impl DescriptorPublicKey {
descriptor_public_key_mutex: Mutex::new(derived_descriptor_public_key), descriptor_public_key_mutex: Mutex::new(derived_descriptor_public_key),
})) }))
} }
BdkDescriptorPublicKey::SinglePub(_) => { BdkDescriptorPublicKey::Single(_) => {
unreachable!() unreachable!()
} }
} }
@ -1057,7 +1058,7 @@ impl DescriptorPublicKey {
descriptor_public_key_mutex: Mutex::new(extended_descriptor_public_key), descriptor_public_key_mutex: Mutex::new(extended_descriptor_public_key),
}) })
} }
BdkDescriptorPublicKey::SinglePub(_) => { BdkDescriptorPublicKey::Single(_) => {
unreachable!() unreachable!()
} }
} }