fix: multisig support for indirect keystore interactions (#120)

caravan-bitcoin · Aug 29, 2024 · d8078d8 · d8078d8
1 parent 3448d95
commit d8078d8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.changeset/thirty-dolls-type.md b/.changeset/thirty-dolls-type.md
@@ -0,0 +1,5 @@
+---
+"@caravan/psbt": patch
+---
+
+Restore multisig support for indirect keystore interactions
diff --git a/packages/caravan-psbt/src/psbtv0/utils.ts b/packages/caravan-psbt/src/psbtv0/utils.ts
@@ -93,6 +93,12 @@ export interface LegacyMultisig {
     path: string;
     pubkey: Buffer;
   }[];
+  redeem?: {
+    output: Buffer;
+  };
+  witness?: {
+    output: Buffer;
+  };
 }
 
 // This may be incomplete as the fixture objects are extremely opaque.
@@ -137,8 +143,8 @@ export const convertLegacyOutput = (output: LegacyOutput): PsbtOutput => {
     value: new BigNumber(output.amountSats).toNumber(),
     bip32Derivation:
       output.bip32Derivation || getBip32Derivation(output.multisig),
-    witnessScript: output.witnessScript,
-    redeemScript: output.redeemScript,
+    witnessScript: output.witnessScript || output.multisig?.witness?.output,
+    redeemScript: output.redeemScript || output.multisig?.redeem?.output,
   };
 };