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

[cli] Split the internal and external policy paths

Browse Source
This commit is contained in:
Alekos Filini 2020-11-13 12:53:42 +01:00
parent 7c80aec454
commit d269c9e0b2
No known key found for this signature in database
GPG Key ID: 5E8AFC3034FDFA4F
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cli.rs
View File

@ -149,10 +149,18 @@ pub fn make_cli_subcommands<'a, 'b>() -> App<'a, 'b> {
.takes_value(true), .takes_value(true),
) )
.arg( .arg(
Arg::with_name("policy") Arg::with_name("external_policy")
.long("policy") .long("external_policy")
.value_name("POLICY") .value_name("POLICY")
.help("Selects which policy should be used to satisfy the descriptor") .help("Selects which policy should be used to satisfy the external descriptor")
.takes_value(true)
.number_of_values(1),
)
.arg(
Arg::with_name("internal_policy")
.long("internal_policy")
.value_name("POLICY")
.help("Selects which policy should be used to satisfy the internal descriptor")
.takes_value(true) .takes_value(true)
.number_of_values(1), .number_of_values(1),
), ),
@ -430,10 +438,19 @@ where
.map_err(Error::Generic)?; .map_err(Error::Generic)?;
tx_builder = tx_builder.unspendable(unspendable); tx_builder = tx_builder.unspendable(unspendable);
} }
if let Some(policy) = sub_matches.value_of("policy") {
let policies = vec![
sub_matches
.value_of("external_policy")
.map(|p| (p, ScriptType::External)),
sub_matches
.value_of("internal_policy")
.map(|p| (p, ScriptType::Internal)),
];
for (policy, script_type) in policies.into_iter().filter_map(|x| x) {
let policy = serde_json::from_str::<BTreeMap<String, Vec<usize>>>(&policy) let policy = serde_json::from_str::<BTreeMap<String, Vec<usize>>>(&policy)
.map_err(|s| Error::Generic(s.to_string()))?; .map_err(|s| Error::Generic(s.to_string()))?;
tx_builder = tx_builder.policy_path(policy); tx_builder = tx_builder.policy_path(policy, script_type);
} }
let (psbt, details) = wallet.create_tx(tx_builder)?; let (psbt, details) = wallet.create_tx(tx_builder)?;