mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-05-23 17:01:37 -04:00
Bump bdk from 0.6.0 to 0.7.0
Bumps [bdk](https://github.com/bitcoindevkit/bdk) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/bitcoindevkit/bdk/releases) - [Changelog](https://github.com/bitcoindevkit/bdk/blob/v0.7.0/CHANGELOG.md) - [Commits](https://github.com/bitcoindevkit/bdk/compare/v0.6.0...v0.7.0) Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
parent
baf5a0896e
commit
6badf09394
3 changed files with 14 additions and 7 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -237,9 +237,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bdk"
|
name = "bdk"
|
||||||
version = "0.6.0"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "51dcf686dfc6200d641e8619019c027976533b7e2d5c00de2b4182c88287a18b"
|
checksum = "d85959e6883d0286e39e89aa7791b2edc2b8712f0f7152fda43b692c4db96c06"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"bdk-macros",
|
"bdk-macros",
|
||||||
|
|
|
@ -15,7 +15,7 @@ async-trait = "0.1"
|
||||||
atty = "0.2"
|
atty = "0.2"
|
||||||
backoff = { version = "0.3", features = [ "tokio" ] }
|
backoff = { version = "0.3", features = [ "tokio" ] }
|
||||||
base64 = "0.13"
|
base64 = "0.13"
|
||||||
bdk = "0.6"
|
bdk = "0.7"
|
||||||
big-bytes = "1"
|
big-bytes = "1"
|
||||||
bitcoin = { version = "0.26", features = [ "rand", "use-serde" ] }
|
bitcoin = { version = "0.26", features = [ "rand", "use-serde" ] }
|
||||||
bmrng = "0.5"
|
bmrng = "0.5"
|
||||||
|
|
|
@ -10,7 +10,7 @@ use bdk::descriptor::Segwitv0;
|
||||||
use bdk::electrum_client::{ElectrumApi, GetHistoryRes};
|
use bdk::electrum_client::{ElectrumApi, GetHistoryRes};
|
||||||
use bdk::keys::DerivableKey;
|
use bdk::keys::DerivableKey;
|
||||||
use bdk::wallet::AddressIndex;
|
use bdk::wallet::AddressIndex;
|
||||||
use bdk::{FeeRate, KeychainKind};
|
use bdk::{FeeRate, KeychainKind, SignOptions};
|
||||||
use bitcoin::{Network, Script};
|
use bitcoin::{Network, Script};
|
||||||
use reqwest::Url;
|
use reqwest::Url;
|
||||||
use rust_decimal::prelude::*;
|
use rust_decimal::prelude::*;
|
||||||
|
@ -246,14 +246,21 @@ where
|
||||||
C: EstimateFeeRate,
|
C: EstimateFeeRate,
|
||||||
D: BatchDatabase,
|
D: BatchDatabase,
|
||||||
{
|
{
|
||||||
pub async fn sign_and_finalize(&self, psbt: PartiallySignedTransaction) -> Result<Transaction> {
|
pub async fn sign_and_finalize(
|
||||||
let (signed_psbt, finalized) = self.wallet.lock().await.sign(psbt, None)?;
|
&self,
|
||||||
|
mut psbt: PartiallySignedTransaction,
|
||||||
|
) -> Result<Transaction> {
|
||||||
|
let finalized = self
|
||||||
|
.wallet
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.sign(&mut psbt, SignOptions::default())?;
|
||||||
|
|
||||||
if !finalized {
|
if !finalized {
|
||||||
bail!("PSBT is not finalized")
|
bail!("PSBT is not finalized")
|
||||||
}
|
}
|
||||||
|
|
||||||
let tx = signed_psbt.extract_tx();
|
let tx = psbt.extract_tx();
|
||||||
|
|
||||||
Ok(tx)
|
Ok(tx)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue