psbt: Make psbt::finalize_witness() extract by default

Author: shesek

examples/ctv-vault.minsc

@@ -109,8 +109,6 @@ fn finalize_trigger($trigger_psbt) {
     0: [ $hot_signature, $trigger_script, $trigger_ctrl ]
   ])
 }
-// Finalize and extract the trigger transaction. psbt::extract_raw() needed for non-Miniscript-compatible Script
-fn finalize_extract_trigger($trigger_psbt) = psbt::extract_raw(finalize_trigger($trigger_psbt));
 
 // Setup Vault
 $cold_sk = xprv9s21ZrQH143K3Xuq83mkj7qByus7JPgT81E8SohtKAcdPUPXRmNg5tVoT2ek5XfMjvpyh1oPvAqfGJee4jnrTzyH4R49QiKWJoNGNYuPbq1;
@@ -133,7 +131,7 @@ $complete_psbt = $wd->complete[
 
 $trigger_signed = psbt::sign($wd->trigger, $hot_sk);
 $complete_signed = psbt::sign($complete_psbt, $hot_sk);
-$trigger_tx = finalize_extract_trigger($trigger_signed);
+$trigger_tx = finalize_trigger($trigger_signed);
 $complete_tx = psbt::finalize_extract($complete_signed);
 
 // Abort the hot withdrawal using the cold key

examples/script-coin-flip.minsc

@@ -114,11 +114,10 @@ $redeem = if $outcome == 1 {
 };
 
 // Finalize the input witness with the 2 preimages and the winner's signature
-$redeem_final = psbt::finalize_witness($redeem, [
+$redeem_tx = psbt::finalize_witness($redeem, [
   0: [ $redeem->inputs.0->partial_sigs.0.1, $preimage2, $preimage1, $script ]
 ]);
 
-$redeem_tx = psbt::extract_raw($redeem_final);
 // $redeem_tx_hex = hex($redeem_tx);
 
 // Redeem script with witness stack elements (excluding the P2WSH witnessScript),
@@ -190,7 +189,7 @@ $p2_wins_p1_sig = schnorr::sign($sk1, psbt::sighash($p2_wins_psbt, 0, $p2_wins_l
 $p2_wins_p2_sig = schnorr::sign($sk2, psbt::sighash($p2_wins_psbt, 0, $p2_wins_leaf));
 $p2_wins_tx = psbt::finalize_witness($p2_wins_psbt, [
   0: tr::script_witness($tap, $p2_wins_leaf, [ $p2_wins_p2_sig, $p2_wins_p1_sig, $preimage2, $preimage1 ])
-]) | psbt::extract_raw();
+]);
 // $p2_wins_hex = hex($p2_wins_tx);
 
 // To debug script execution with witness elements:

src/stdlib/btc.minsc

@@ -62,11 +62,14 @@ fn tx::sighash::tr_leaf($tx, $vin, $script_leaf, $utxos, $sighash_ty) = psbt::si
 
 // TOOD tx::sighash::sw0() with just the signed utxo & tx::sighash::presw() with just the utxo's script
 
-fn psbt::finalize_witness($psbt, $input_witnesses) = psbt::update($psbt, [
-  "inputs": map($input_witnesses, |[ $input_index, $witness ]|
-    $input_index: [ "final_script_witness": $witness ]
-  )
-]);
+fn psbt::finalize_witness($psbt, $input_witnesses, $extract_tx=true) {
+  $finalized = psbt::update($psbt, [
+    "inputs": map($input_witnesses, |[ $input_index, $witness ]|
+      $input_index: [ "final_script_witness": $witness ]
+    )
+  ]);
+  if $extract_tx then psbt::extract_raw($finalized) else $finalized
+}
 
 fn psbt::finalize_extract($psbt) = psbt::extract(psbt::finalize($psbt));
 fn psbt::sign_extract($psbt, $keys) = psbt::extract(psbt::finalize(psbt::sign($psbt, $keys)));