include addressType for valid PSBT translation in SignMultisigTransac…

…tion
caravan-bitcoin · Dec 12, 2024 · a45e430 · a45e430
1 parent 48da7df
commit a45e430
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.changeset/nine-berries-float.md b/.changeset/nine-berries-float.md
@@ -0,0 +1,5 @@
+---
+"@caravan/wallets": patch
+---
+
+include addressType for valid PSBT translation in SignMultisigTransaction
diff --git a/packages/caravan-wallets/src/index.ts b/packages/caravan-wallets/src/index.ts
@@ -440,6 +440,7 @@ export function SignMultisigTransaction({
         bip32Paths,
         psbt,
         keyDetails,
+        addressType: walletConfig.addressType,
         returnSignatureArray,
       });
     default:

diff --git a/packages/caravan-wallets/src/ledger.ts b/packages/caravan-wallets/src/ledger.ts
@@ -990,7 +990,7 @@ export class LedgerSignMultisigTransaction extends LedgerBitcoinInteraction {
 
       const translatedPsbt = translatePSBT(
         network,
-        P2SH,
+        v2Options?.addressType || P2SH,
         this.psbt,
         keyDetails
       );

diff --git a/packages/caravan-wallets/src/trezor.ts b/packages/caravan-wallets/src/trezor.ts
@@ -701,6 +701,7 @@ export class TrezorSignMultisigTransaction extends TrezorInteraction {
     psbt,
     keyDetails,
     returnSignatureArray,
+    addressType,
   }) {
     super({ network });
     if (!psbt || !keyDetails) {
@@ -715,7 +716,7 @@ export class TrezorSignMultisigTransaction extends TrezorInteraction {
       }
       const translatedPsbt = translatePSBT(
         network,
-        P2SH,
+        addressType,
         this.psbt,
         keyDetails
       );