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

Verify PSBT input satisfaction

Browse Source
This commit is contained in:
Riccardo Casatta 2021-04-16 10:45:11 +02:00
parent ff7b74ec27
commit 136a4bddb2
No known key found for this signature in database
GPG Key ID: FD986A969E450397
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/descriptor/policy.rs
View File

@ -62,6 +62,7 @@ use super::checksum::get_checksum;
use super::error::Error; use super::error::Error;
use super::XKeyUtils; use super::XKeyUtils;
use bitcoin::util::psbt::PartiallySignedTransaction as PSBT; use bitcoin::util::psbt::PartiallySignedTransaction as PSBT;
use miniscript::psbt::PsbtInputSatisfier;
/// Raw public key or extended key fingerprint /// Raw public key or extended key fingerprint
#[derive(Debug, Clone, Default, Serialize)] #[derive(Debug, Clone, Default, Serialize)]
@ -817,9 +818,17 @@ impl<Ctx: ScriptContext> ExtractPolicy for Miniscript<DescriptorPublicKey, Ctx>
csv: None, csv: None,
}, },
}; };
if let BuildSatisfaction::PsbtTimelocks { current_height, .. } = build_sat { if let BuildSatisfaction::PsbtTimelocks {
current_height,
psbt,
..
} = build_sat
{
let after = After::new(Some(current_height), false); let after = After::new(Some(current_height), false);
if Satisfier::<bitcoin::PublicKey>::check_after(&after, *value) { let after_sat = Satisfier::<bitcoin::PublicKey>::check_after(&after, *value);
let inputs_sat = psbt_inputs_sat(psbt)
.all(|sat| Satisfier::<bitcoin::PublicKey>::check_after(&sat, *value));
if after_sat && inputs_sat {
policy.satisfaction = policy.contribution.clone(); policy.satisfaction = policy.contribution.clone();
} }
} }
@ -837,11 +846,14 @@ impl<Ctx: ScriptContext> ExtractPolicy for Miniscript<DescriptorPublicKey, Ctx>
if let BuildSatisfaction::PsbtTimelocks { if let BuildSatisfaction::PsbtTimelocks {
current_height, current_height,
input_max_height, input_max_height,
.. psbt,
} = build_sat } = build_sat
{ {
let older = Older::new(Some(current_height), Some(input_max_height), false); let older = Older::new(Some(current_height), Some(input_max_height), false);
if Satisfier::<bitcoin::PublicKey>::check_older(&older, *value) { let older_sat = Satisfier::<bitcoin::PublicKey>::check_older(&older, *value);
let inputs_sat = psbt_inputs_sat(psbt)
.all(|sat| Satisfier::<bitcoin::PublicKey>::check_older(&sat, *value));
if older_sat && inputs_sat {
policy.satisfaction = policy.contribution.clone(); policy.satisfaction = policy.contribution.clone();
} }
} }
@ -911,6 +923,10 @@ impl<Ctx: ScriptContext> ExtractPolicy for Miniscript<DescriptorPublicKey, Ctx>
} }
} }
fn psbt_inputs_sat(psbt: &PSBT) -> impl Iterator<Item = PsbtInputSatisfier> {
(0..psbt.inputs.len()).map(move |i| PsbtInputSatisfier::new(psbt, i))
}
/// Options to build the satisfaction field in the policy /// Options to build the satisfaction field in the policy
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub enum BuildSatisfaction<'a> { pub enum BuildSatisfaction<'a> {