@caravan/psbt 1.5.0 → 1.6.0

package/dist/index.js

@@ -94024,11 +94024,6 @@ var getHashForSignature = (psbt, inputIndex, inputAmount, sigHashFlag = import_b
   throw new Error("No redeem or witness script found for input.");
 };
 function translatePSBT(network, addressType, psbt, signingKeyDetails) {
-  if (addressType !== import_bitcoin4.P2SH) {
-    throw new Error(
-      "Unsupported addressType -- only P2SH is supported right now"
-    );
-  }
   const localPSBT = autoLoadPSBT(psbt, { network: (0, import_bitcoin4.networkData)(network) });
   if (localPSBT === null)
     return null;
@@ -94051,12 +94046,17 @@ function translatePSBT(network, addressType, psbt, signingKeyDetails) {
 function getUnchainedInputsFromPSBT(network, addressType, psbt) {
   return psbt.txInputs.map((input, index) => {
     const dataInput = psbt.data.inputs[index];
+    const spendingScript = dataInput.witnessScript || dataInput.redeemScript;
+    if (!dataInput?.nonWitnessUtxo && addressType === import_bitcoin4.P2WSH) {
+      throw new Error(`Non-witness UTXO now required for P2WSH
+inputs to protect against large fee attack`);
+    }
     const fundingTxHex = dataInput.nonWitnessUtxo.toString("hex");
     const fundingTx = import_bitcoinjs_lib_v63.Transaction.fromHex(fundingTxHex);
     const multisig = (0, import_bitcoin4.generateMultisigFromHex)(
       network,
       addressType,
-      dataInput.redeemScript.toString("hex")
+      spendingScript.toString("hex")
     );
     return {
       amountSats: fundingTx.outs[input.index].value,

package/dist/index.mjs

@@ -1241,6 +1241,7 @@ import {
   multisigSignatureBuffer,
   networkData,
   P2SH as P2SH2,
+  P2WSH as P2WSH2,
   signatureNoSighashType
 } from "@caravan/bitcoin";
 import { Psbt as Psbt3, Transaction } from "bitcoinjs-lib-v6";
@@ -94002,11 +94003,6 @@ var getHashForSignature = (psbt, inputIndex, inputAmount, sigHashFlag = Transact
   throw new Error("No redeem or witness script found for input.");
 };
 function translatePSBT(network, addressType, psbt, signingKeyDetails) {
-  if (addressType !== P2SH2) {
-    throw new Error(
-      "Unsupported addressType -- only P2SH is supported right now"
-    );
-  }
   const localPSBT = autoLoadPSBT(psbt, { network: networkData(network) });
   if (localPSBT === null)
     return null;
@@ -94029,12 +94025,17 @@ function translatePSBT(network, addressType, psbt, signingKeyDetails) {
 function getUnchainedInputsFromPSBT(network, addressType, psbt) {
   return psbt.txInputs.map((input, index) => {
     const dataInput = psbt.data.inputs[index];
+    const spendingScript = dataInput.witnessScript || dataInput.redeemScript;
+    if (!dataInput?.nonWitnessUtxo && addressType === P2WSH2) {
+      throw new Error(`Non-witness UTXO now required for P2WSH
+inputs to protect against large fee attack`);
+    }
     const fundingTxHex = dataInput.nonWitnessUtxo.toString("hex");
     const fundingTx = Transaction.fromHex(fundingTxHex);
     const multisig = generateMultisigFromHex(
       network,
       addressType,
-      dataInput.redeemScript.toString("hex")
+      spendingScript.toString("hex")
     );
     return {
       amountSats: fundingTx.outs[input.index].value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caravan/psbt",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "typescript library for working with PSBTs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -51,6 +51,7 @@
   "author": "unchained capital",
   "license": "ISC",
   "devDependencies": {
+    "@caravan/bip32": "*",
     "@caravan/eslint-config": "*",
     "@caravan/multisig": "*",
     "@caravan/typescript-config": "*",