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

[descriptor] Fix pk_h() in the descriptor!() macro

Browse Source 
Instead of accepting just a `DescriptorPublicKey` it now accepts
anything that implements `IntoDescriptorKey` like `pk_k()` does.
This commit is contained in:
Alekos Filini 2021-09-15 10:35:01 +02:00
parent b500cfe4e5
commit e3dd755396
No known key found for this signature in database
GPG Key ID: 431401E4A4530061
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/descriptor/dsl.rs
View File

@ -571,8 +571,9 @@ macro_rules! fragment {
( pk ( $key:expr ) ) => ({ ( pk ( $key:expr ) ) => ({
$crate::fragment!(c:pk_k ( $key )) $crate::fragment!(c:pk_k ( $key ))
}); });
( pk_h ( $key_hash:expr ) ) => ({ ( pk_h ( $key:expr ) ) => ({
$crate::impl_leaf_opcode_value!(PkH, $key_hash) let secp = $crate::bitcoin::secp256k1::Secp256k1::new();
$crate::keys::make_pkh($key, &secp)
}); });
( after ( $value:expr ) ) => ({ ( after ( $value:expr ) ) => ({
$crate::impl_leaf_opcode_value!(After, $value) $crate::impl_leaf_opcode_value!(After, $value)

14
src/keys/mod.rs
View File

@ -753,6 +753,20 @@ pub fn make_pk<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
Ok((minisc, key_map, valid_networks)) Ok((minisc, key_map, valid_networks))
} }
// Used internally by `bdk::fragment!` to build `pk_h()` fragments
#[doc(hidden)]
pub fn make_pkh<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(
descriptor_key: Pk,
secp: &SecpCtx,
) -> Result<(Miniscript<DescriptorPublicKey, Ctx>, KeyMap, ValidNetworks), DescriptorError> {
let (key, key_map, valid_networks) = descriptor_key.into_descriptor_key()?.extract(secp)?;
let minisc = Miniscript::from_ast(Terminal::PkH(key))?;
minisc.check_minsicript()?;
Ok((minisc, key_map, valid_networks))
}
// Used internally by `bdk::fragment!` to build `multi()` fragments // Used internally by `bdk::fragment!` to build `multi()` fragments
#[doc(hidden)] #[doc(hidden)]
pub fn make_multi<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>( pub fn make_multi<Pk: IntoDescriptorKey<Ctx>, Ctx: ScriptContext>(