Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions examples/psbt_sign_finalize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ use std::str::FromStr;
use miniscript::bitcoin::consensus::encode::deserialize_hex;
use miniscript::bitcoin::psbt::{self, Psbt};
use miniscript::bitcoin::sighash::SighashCache;
//use miniscript::bitcoin::secp256k1; // https://github.com/rust-lang/rust/issues/121684
use miniscript::bitcoin::{
transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence, Transaction,
TxIn, TxOut,
secp256k1, transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence,
Transaction, TxIn, TxOut,
};
use miniscript::psbt::{PsbtExt, PsbtInputExt};
use miniscript::Descriptor;
Expand Down
4 changes: 1 addition & 3 deletions src/interpreter/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ use std::error;

use bitcoin::hashes::hash160;
use bitcoin::hex::DisplayHex;
#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684
use bitcoin::secp256k1;
use bitcoin::{absolute, relative, taproot};
use bitcoin::{absolute, relative, secp256k1, taproot};

use super::BitcoinKey;
use crate::prelude::*;
Expand Down
4 changes: 1 addition & 3 deletions src/psbt/finalizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ use core::mem;

use bitcoin::hashes::hash160;
use bitcoin::key::XOnlyPublicKey;
#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684
use bitcoin::secp256k1;
use bitcoin::secp256k1::Secp256k1;
use bitcoin::sighash::Prevouts;
use bitcoin::taproot::LeafVersion;
use bitcoin::{PublicKey, Script, ScriptBuf, TxOut, Witness};
use bitcoin::{secp256k1, PublicKey, Script, ScriptBuf, TxOut, Witness};

use super::{sanity_check, Error, InputError, Psbt, PsbtInputSatisfier};
use crate::prelude::*;
Expand Down
4 changes: 1 addition & 3 deletions src/psbt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ use std::error;

use bitcoin::hashes::{hash160, sha256d, Hash};
use bitcoin::psbt::{self, Psbt};
#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684
use bitcoin::secp256k1;
use bitcoin::secp256k1::{Secp256k1, VerifyOnly};
use bitcoin::sighash::{self, SighashCache};
use bitcoin::taproot::{self, ControlBlock, LeafVersion, TapLeafHash};
use bitcoin::{absolute, bip32, relative, transaction, Script, ScriptBuf};
use bitcoin::{absolute, bip32, relative, secp256k1, transaction, Script, ScriptBuf};

use crate::miniscript::context::SigType;
use crate::prelude::*;
Expand Down
1 change: 0 additions & 1 deletion src/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use std::str::FromStr;

use bitcoin::hashes::{hash160, ripemd160, sha256};
use bitcoin::key::XOnlyPublicKey;
#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684
use bitcoin::secp256k1;

use crate::miniscript::context::SigType;
Expand Down
Loading