Skip to content

psbt: satisfy any ToPublicKey key #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2020
Merged

psbt: satisfy any ToPublicKey key #137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/psbt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ use bitcoin::util::psbt;
use bitcoin::util::psbt::PartiallySignedTransaction as Psbt;
use bitcoin::{self, secp256k1};

use miniscript::{Legacy, Segwitv0};
use BitcoinSig;
use Miniscript;
use Satisfier;
use {Legacy, MiniscriptKey, Segwitv0, ToPublicKey};

#[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub enum Error {
Expand Down Expand Up @@ -94,9 +94,9 @@ impl fmt::Display for Error {
}
}

impl Satisfier<bitcoin::PublicKey> for psbt::Input {
fn lookup_sig(&self, pk: &bitcoin::PublicKey) -> Option<BitcoinSig> {
if let Some(rawsig) = self.partial_sigs.get(pk) {
impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for psbt::Input {
fn lookup_sig(&self, pk: &Pk) -> Option<BitcoinSig> {
if let Some(rawsig) = self.partial_sigs.get(&pk.to_public_key()) {
let (flag, sig) = rawsig.split_last().unwrap();
let flag = bitcoin::SigHashType::from_u32(*flag as u32);
let sig = match secp256k1::Signature::from_der(sig) {
Expand Down