Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-05-20 07:30:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade bitcoin and bdk to latest version

Browse source 
The latest version allows us to access `miniscript` via `bdk` which
removes the need for declaring it as an extra dependency.
This commit is contained in:
Thomas Eizinger 2021-10-07 12:26:51 +11:00
parent 9ea73a8e66
commit 4de8b0ebc4
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
9 changed files with 125 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

9
swap/src/bitcoin.rs
View file

@ -29,12 +29,12 @@ use ::bitcoin::hashes::hex::ToHex;
use ::bitcoin::hashes::Hash;
use ::bitcoin::{secp256k1, SigHash};
use anyhow::{bail, Context, Result};
use bdk::miniscript::descriptor::Wsh;
use bdk::miniscript::{Descriptor, Segwitv0};
use ecdsa_fun::adaptor::{Adaptor, HashTranscript};
use ecdsa_fun::fun::Point;
use ecdsa_fun::nonce::Deterministic;
use ecdsa_fun::ECDSA;
use miniscript::descriptor::Wsh;
use miniscript::{Descriptor, Segwitv0};
use rand::{CryptoRng, RngCore};
use serde::{Deserialize, Serialize};
use sha2::Sha256;
@ -215,8 +215,9 @@ pub fn build_shared_output_descriptor(A: Point, B: Point) -> Descriptor<bitcoin:
let miniscript = MINISCRIPT_TEMPLATE.replace("A", &A).replace("B", &B);
let miniscript = miniscript::Miniscript::<bitcoin::PublicKey, Segwitv0>::from_str(&miniscript)
.expect("a valid miniscript");
let miniscript =
bdk::miniscript::Miniscript::<bitcoin::PublicKey, Segwitv0>::from_str(&miniscript)
.expect("a valid miniscript");
Descriptor::Wsh(Wsh::new(miniscript).expect("a valid descriptor"))
}

2
swap/src/bitcoin/cancel.rs
View file

@ -6,8 +6,8 @@ use crate::bitcoin::{
use ::bitcoin::util::bip143::SigHashCache;
use ::bitcoin::{OutPoint, Script, SigHash, SigHashType, TxIn, TxOut, Txid};
use anyhow::Result;
use bdk::miniscript::{Descriptor, DescriptorTrait};
use ecdsa_fun::Signature;
use miniscript::{Descriptor, DescriptorTrait};
use serde::{Deserialize, Serialize};
use std::cmp::Ordering;
use std::collections::HashMap;

2
swap/src/bitcoin/lock.rs
View file

@ -6,8 +6,8 @@ use ::bitcoin::util::psbt::PartiallySignedTransaction;
use ::bitcoin::{OutPoint, TxIn, TxOut, Txid};
use anyhow::{bail, Result};
use bdk::database::BatchDatabase;
use bdk::miniscript::{Descriptor, DescriptorTrait};
use bitcoin::Script;
use miniscript::{Descriptor, DescriptorTrait};
use serde::{Deserialize, Serialize};
const SCRIPT_SIZE: usize = 34;

2
swap/src/bitcoin/punish.rs
View file

@ -4,7 +4,7 @@ use ::bitcoin::util::bip143::SigHashCache;
use ::bitcoin::{SigHash, SigHashType};
use anyhow::{Context, Result};
use bdk::bitcoin::Script;
use miniscript::{Descriptor, DescriptorTrait};
use bdk::miniscript::{Descriptor, DescriptorTrait};
use std::collections::HashMap;
#[derive(Debug)]

2
swap/src/bitcoin/redeem.rs
View file

@ -6,12 +6,12 @@ use crate::bitcoin::{
use ::bitcoin::util::bip143::SigHashCache;
use ::bitcoin::{SigHash, SigHashType, Txid};
use anyhow::{bail, Context, Result};
use bdk::miniscript::{Descriptor, DescriptorTrait};
use bitcoin::Script;
use ecdsa_fun::adaptor::{Adaptor, HashTranscript};
use ecdsa_fun::fun::Scalar;
use ecdsa_fun::nonce::Deterministic;
use ecdsa_fun::Signature;
use miniscript::{Descriptor, DescriptorTrait};
use sha2::Sha256;
use std::collections::HashMap;

2
swap/src/bitcoin/refund.rs
View file

@ -7,8 +7,8 @@ use crate::{bitcoin, monero};
use ::bitcoin::util::bip143::SigHashCache;
use ::bitcoin::{Script, SigHash, SigHashType, Txid};
use anyhow::{bail, Context, Result};
use bdk::miniscript::{Descriptor, DescriptorTrait};
use ecdsa_fun::Signature;
use miniscript::{Descriptor, DescriptorTrait};
use std::collections::HashMap;
#[derive(Debug)]

4
swap/src/bitcoin/wallet.rs
View file

@ -607,9 +607,7 @@ impl WalletBuilder {
pub fn build(self) -> Wallet<(), bdk::database::MemoryDatabase, StaticFeeRate> {
use bdk::database::MemoryDatabase;
use bdk::{ConfirmationTime, LocalUtxo, TransactionDetails};
use bitcoin::OutPoint;
use testutils::testutils;
use bdk::testutils;
let descriptors = testutils!(@descriptors (&format!("wpkh({}/*)", self.key)));