@caravan/psbt 1.5.0 → 1.7.0

package/dist/index.d.ts

@@ -28,6 +28,12 @@ declare enum PsbtGlobalTxModifiableBits {
     OUTPUTS = "OUTPUTS",// 0b00000010
     SIGHASH_SINGLE = "SIGHASH_SINGLE"
 }
+declare enum SighashType {
+    SIGHASH_ALL = 1,
+    SIGHASH_NONE = 2,
+    SIGHASH_SINGLE = 3,
+    SIGHASH_ANYONECANPAY = 128
+}
 type InputOutputIndexType = number;
 type MapSelectorType = "global" | ["inputs", InputOutputIndexType] | ["outputs", InputOutputIndexType];
 
@@ -52,7 +58,7 @@ declare abstract class PsbtV2Maps {
      */
     serialize(format?: "base64" | "hex"): string;
     /**
-     * Copies the maps in this PsbtV2 object to another PsbtV2 object.
+     * Copies the maps in this PsbtV2Maps object to another PsbtV2Maps object.
      *
      * NOTE: This copy method is made available to achieve parity with the PSBT
      * api required by `ledger-bitcoin` for creating merklized PSBTs. HOWEVER, it
@@ -60,7 +66,7 @@ declare abstract class PsbtV2Maps {
      * validation defined in the constructor, so it could create a psbtv2 in an
      * invalid psbt state. PsbtV2.serialize is preferable whenever possible.
      */
-    copy(to: PsbtV2): void;
+    copy(to: PsbtV2Maps): void;
     private copyMaps;
     private copyMap;
 }
@@ -281,7 +287,7 @@ declare class PsbtV2 extends PsbtV2Maps {
      */
     dangerouslySetGlobalTxVersion1(): void;
     addGlobalXpub(xpub: Buffer, fingerprint: Buffer, path: string): void;
-    addInput({ previousTxId, outputIndex, sequence, nonWitnessUtxo, witnessUtxo, redeemScript, witnessScript, bip32Derivation, }: {
+    addInput({ previousTxId, outputIndex, sequence, nonWitnessUtxo, witnessUtxo, redeemScript, witnessScript, bip32Derivation, sighashType, }: {
         previousTxId: Buffer | string;
         outputIndex: number;
         sequence?: number;
@@ -297,6 +303,7 @@ declare class PsbtV2 extends PsbtV2Maps {
             masterFingerprint: Buffer;
             path: string;
         }[];
+        sighashType?: SighashType;
     }): void;
     addOutput({ amount, script, redeemScript, witnessScript, bip32Derivation, }: {
         amount: number;
@@ -378,10 +385,16 @@ declare class PsbtV2 extends PsbtV2Maps {
      * Attempts to return a PsbtV2 by converting from a PsbtV0 string or Buffer.
      *
      * This method first starts with a fresh PsbtV2 having just been created. It
-     * then takes the PsbtV2 through its operator saga through the Signer role. In
-     * this sense validation for each operator role will be performed.
+     * then takes the PsbtV2 through its operator saga and through the Input
+     * Finalizer role. In this sense, validation for each operator role will be
+     * performed as the Psbt saga is replayed.
      */
     static FromV0(psbt: string | Buffer, allowTxnVersion1?: boolean): PsbtV2;
+    /**
+     * Outputs a serialized PSBTv0 from a best-attempt conversion of the fields in
+     * this PSBTv2. Accepts optional desired format as a string (default base64).
+     */
+    toV0(format?: "base64" | "hex"): string;
 }
 
 interface PsbtInput {

package/dist/index.js

@@ -57,6 +57,54 @@ var PSBT_MAGIC_HEX = "70736274ff";
 var PSBT_MAGIC_B64 = "cHNidP8";
 var PSBT_MAGIC_BYTES = import_buffer.Buffer.from([112, 115, 98, 116, 255]);
 
+// src/psbtv2/types.ts
+var KeyType = /* @__PURE__ */ ((KeyType2) => {
+  KeyType2["PSBT_GLOBAL_XPUB"] = "01";
+  KeyType2["PSBT_GLOBAL_TX_VERSION"] = "02";
+  KeyType2["PSBT_GLOBAL_FALLBACK_LOCKTIME"] = "03";
+  KeyType2["PSBT_GLOBAL_INPUT_COUNT"] = "04";
+  KeyType2["PSBT_GLOBAL_OUTPUT_COUNT"] = "05";
+  KeyType2["PSBT_GLOBAL_TX_MODIFIABLE"] = "06";
+  KeyType2["PSBT_GLOBAL_VERSION"] = "fb";
+  KeyType2["PSBT_GLOBAL_PROPRIETARY"] = "fc";
+  KeyType2["PSBT_IN_NON_WITNESS_UTXO"] = "00";
+  KeyType2["PSBT_IN_WITNESS_UTXO"] = "01";
+  KeyType2["PSBT_IN_PARTIAL_SIG"] = "02";
+  KeyType2["PSBT_IN_SIGHASH_TYPE"] = "03";
+  KeyType2["PSBT_IN_REDEEM_SCRIPT"] = "04";
+  KeyType2["PSBT_IN_WITNESS_SCRIPT"] = "05";
+  KeyType2["PSBT_IN_BIP32_DERIVATION"] = "06";
+  KeyType2["PSBT_IN_FINAL_SCRIPTSIG"] = "07";
+  KeyType2["PSBT_IN_FINAL_SCRIPTWITNESS"] = "08";
+  KeyType2["PSBT_IN_POR_COMMITMENT"] = "09";
+  KeyType2["PSBT_IN_RIPEMD160"] = "0a";
+  KeyType2["PSBT_IN_SHA256"] = "0b";
+  KeyType2["PSBT_IN_HASH160"] = "0c";
+  KeyType2["PSBT_IN_HASH256"] = "0d";
+  KeyType2["PSBT_IN_PREVIOUS_TXID"] = "0e";
+  KeyType2["PSBT_IN_OUTPUT_INDEX"] = "0f";
+  KeyType2["PSBT_IN_SEQUENCE"] = "10";
+  KeyType2["PSBT_IN_REQUIRED_TIME_LOCKTIME"] = "11";
+  KeyType2["PSBT_IN_REQUIRED_HEIGHT_LOCKTIME"] = "12";
+  KeyType2["PSBT_IN_TAP_KEY_SIG"] = "13";
+  KeyType2["PSBT_IN_TAP_SCRIPT_SIG"] = "14";
+  KeyType2["PSBT_IN_TAP_LEAF_SCRIPT"] = "15";
+  KeyType2["PSBT_IN_TAP_BIP32_DERIVATION"] = "16";
+  KeyType2["PSBT_IN_TAP_INTERNAL_KEY"] = "17";
+  KeyType2["PSBT_IN_TAP_MERKLE_ROOT"] = "18";
+  KeyType2["PSBT_IN_PROPRIETARY"] = "fc";
+  KeyType2["PSBT_OUT_REDEEM_SCRIPT"] = "00";
+  KeyType2["PSBT_OUT_WITNESS_SCRIPT"] = "01";
+  KeyType2["PSBT_OUT_BIP32_DERIVATION"] = "02";
+  KeyType2["PSBT_OUT_AMOUNT"] = "03";
+  KeyType2["PSBT_OUT_SCRIPT"] = "04";
+  KeyType2["PSBT_OUT_TAP_INTERNAL_KEY"] = "05";
+  KeyType2["PSBT_OUT_TAP_TREE"] = "06";
+  KeyType2["PSBT_OUT_TAP_BIP32_DERIVATION"] = "07";
+  KeyType2["PSBT_OUT_PROPRIETARY"] = "fc";
+  return KeyType2;
+})(KeyType || {});
+
 // src/psbtv2/values.ts
 var PSBT_MAP_SEPARATOR = import_buffer.Buffer.from([0]);
 var BIP_32_NODE_REGEX = /(\/[0-9]+'?)/gi;
@@ -152,10 +200,11 @@ function getPsbtVersionNumber(psbt) {
 
 // src/psbtv2/psbtv2.ts
 var import_bufio3 = require("bufio");
-var import_bitcoinjs_lib_v6 = require("bitcoinjs-lib-v6");
+var import_bitcoinjs_lib_v62 = require("bitcoinjs-lib-v6");
 
 // src/psbtv2/psbtv2maps.ts
 var import_bufio2 = require("bufio");
+var import_bitcoinjs_lib_v6 = require("bitcoinjs-lib-v6");
 var PsbtV2Maps = class {
   // These maps directly correspond to the maps defined in BIP0174 and extended
   // in BIP0370
@@ -207,7 +256,7 @@ var PsbtV2Maps = class {
     return bw.render().toString(format2);
   }
   /**
-   * Copies the maps in this PsbtV2 object to another PsbtV2 object.
+   * Copies the maps in this PsbtV2Maps object to another PsbtV2Maps object.
    *
    * NOTE: This copy method is made available to achieve parity with the PSBT
    * api required by `ledger-bitcoin` for creating merklized PSBTs. HOWEVER, it
@@ -231,6 +280,86 @@ var PsbtV2Maps = class {
     from.forEach((v5, k4) => to.set(k4, import_buffer.Buffer.from(v5)));
   }
 };
+var PsbtConversionMaps = class extends PsbtV2Maps {
+  /**
+   * Builds the unsigned transaction that is required on global map key 0x00 for
+   * a PSBTv0. Relies on bitcoinjs-lib to construct the transaction.
+   */
+  buildUnsignedTx() {
+    const tx = new import_bitcoinjs_lib_v6.Transaction();
+    tx.version = this.globalMap.get("02" /* PSBT_GLOBAL_TX_VERSION */)?.readUInt8() || 0;
+    tx.locktime = this.globalMap.get("03" /* PSBT_GLOBAL_FALLBACK_LOCKTIME */)?.readUInt32LE() || 0;
+    const numInputs = this.globalMap.get("04" /* PSBT_GLOBAL_INPUT_COUNT */)?.readUInt8() || 0;
+    const numOutputs = this.globalMap.get("05" /* PSBT_GLOBAL_OUTPUT_COUNT */)?.readUInt8() || 0;
+    for (let i6 = 0; i6 < numInputs; i6++) {
+      if (!this.inputMaps[i6].has("0e" /* PSBT_IN_PREVIOUS_TXID */)) {
+        console.warn(`Input ${i6} is missing previous txid. Skipping.`);
+        continue;
+      }
+      tx.addInput(
+        this.inputMaps[i6].get("0e" /* PSBT_IN_PREVIOUS_TXID */),
+        this.inputMaps[i6].get("0f" /* PSBT_IN_OUTPUT_INDEX */)?.readUint32LE() || 0,
+        this.inputMaps[i6].get("10" /* PSBT_IN_SEQUENCE */)?.readUint32LE()
+      );
+    }
+    for (let i6 = 0; i6 < numOutputs; i6++) {
+      if (!this.outputMaps[i6].has("04" /* PSBT_OUT_SCRIPT */) || !this.outputMaps[i6].has("03" /* PSBT_OUT_AMOUNT */)) {
+        console.warn(
+          `Output ${i6} is missing previous out script or amount. Skipping.`
+        );
+        continue;
+      }
+      const bigintAmount = this.outputMaps[i6].get("03" /* PSBT_OUT_AMOUNT */).readBigInt64LE();
+      const numberAmount = parseInt(bigintAmount.toString());
+      tx.addOutput(
+        this.outputMaps[i6].get("04" /* PSBT_OUT_SCRIPT */),
+        numberAmount
+      );
+    }
+    return tx.toBuffer();
+  }
+  /**
+   * Warns and then deletes map values. Intended for use when converting to a
+   * PsbtV0.
+   */
+  v0delete(map, key) {
+    if (map.has(key)) {
+      const keyName = Object.keys(KeyType)[Object.values(KeyType).indexOf(key)];
+      console.warn(
+        `Key ${keyName} key is not supported on PSBTv0 and will be omitted.`
+      );
+    }
+    map.delete(key);
+  }
+  /**
+   * Constructs an unsigned txn to be added to the PSBT_GLOBAL_UNSIGNED_TX key
+   * which is required on PsbtV0. Then removes all the fields which a PsbtV0 is
+   * incompatible with.
+   */
+  convertToV0 = () => {
+    this.globalMap.set(
+      "00" /* PSBT_GLOBAL_UNSIGNED_TX */,
+      this.buildUnsignedTx()
+    );
+    this.v0delete(this.globalMap, "02" /* PSBT_GLOBAL_TX_VERSION */);
+    this.v0delete(this.globalMap, "03" /* PSBT_GLOBAL_FALLBACK_LOCKTIME */);
+    this.v0delete(this.globalMap, "04" /* PSBT_GLOBAL_INPUT_COUNT */);
+    this.v0delete(this.globalMap, "05" /* PSBT_GLOBAL_OUTPUT_COUNT */);
+    this.v0delete(this.globalMap, "06" /* PSBT_GLOBAL_TX_MODIFIABLE */);
+    this.v0delete(this.globalMap, "fb" /* PSBT_GLOBAL_VERSION */);
+    for (const inputMap of this.inputMaps) {
+      this.v0delete(inputMap, "0e" /* PSBT_IN_PREVIOUS_TXID */);
+      this.v0delete(inputMap, "0f" /* PSBT_IN_OUTPUT_INDEX */);
+      this.v0delete(inputMap, "10" /* PSBT_IN_SEQUENCE */);
+      this.v0delete(inputMap, "11" /* PSBT_IN_REQUIRED_TIME_LOCKTIME */);
+      this.v0delete(inputMap, "12" /* PSBT_IN_REQUIRED_HEIGHT_LOCKTIME */);
+    }
+    for (const outputMap of this.outputMaps) {
+      this.v0delete(outputMap, "03" /* PSBT_OUT_AMOUNT */);
+      this.v0delete(outputMap, "04" /* PSBT_OUT_SCRIPT */);
+    }
+  };
+};
 
 // src/psbtv2/psbtv2.ts
 var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
@@ -907,7 +1036,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     witnessUtxo,
     redeemScript,
     witnessScript,
-    bip32Derivation
+    bip32Derivation,
+    sighashType
   }) {
     if (!this.isReadyForConstructor) {
       throw Error(
@@ -958,6 +1088,10 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
         map.set(key, bw.render());
       }
     }
+    if (sighashType !== void 0) {
+      bw.writeU32(sighashType);
+      map.set("03" /* PSBT_IN_SIGHASH_TYPE */, bw.render());
+    }
     this.PSBT_GLOBAL_INPUT_COUNT = this.inputMaps.push(map);
   }
   addOutput({
@@ -1209,12 +1343,13 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
    * Attempts to return a PsbtV2 by converting from a PsbtV0 string or Buffer.
    *
    * This method first starts with a fresh PsbtV2 having just been created. It
-   * then takes the PsbtV2 through its operator saga through the Signer role. In
-   * this sense validation for each operator role will be performed.
+   * then takes the PsbtV2 through its operator saga and through the Input
+   * Finalizer role. In this sense, validation for each operator role will be
+   * performed as the Psbt saga is replayed.
    */
   static FromV0(psbt, allowTxnVersion1 = false) {
     const psbtv0Buf = bufferize(psbt);
-    const psbtv0 = import_bitcoinjs_lib_v6.Psbt.fromBuffer(psbtv0Buf);
+    const psbtv0 = import_bitcoinjs_lib_v62.Psbt.fromBuffer(psbtv0Buf);
     const psbtv0GlobalMap = psbtv0.data.globalMap;
     const psbtv2 = new _PsbtV2();
     const txVersion = psbtv0.data.getTransaction().readInt32LE(0);
@@ -1223,6 +1358,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     } else {
       psbtv2.PSBT_GLOBAL_TX_VERSION = psbtv0.data.getTransaction().readInt32LE(0);
     }
+    psbtv2.PSBT_GLOBAL_FALLBACK_LOCKTIME = psbtv0.locktime;
     for (const globalXpub of psbtv0GlobalMap.globalXpub ?? []) {
       psbtv2.addGlobalXpub(
         globalXpub.extendedPubkey,
@@ -1247,7 +1383,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
         },
         redeemScript: input.redeemScript,
         witnessScript: input.witnessScript,
-        bip32Derivation: input.bip32Derivation
+        bip32Derivation: input.bip32Derivation,
+        sighashType: input.sighashType
       });
     }
     const txOutputs = [];
@@ -1269,13 +1406,37 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
         psbtv2.addPartialSig(index, sig.pubkey, sig.signature);
       }
     }
+    for (const [index, input] of psbtv0.data.inputs.entries()) {
+      if (input.finalScriptSig) {
+        psbtv2.inputMaps[index].set(
+          "07" /* PSBT_IN_FINAL_SCRIPTSIG */,
+          input.finalScriptSig
+        );
+      }
+      if (input.finalScriptWitness) {
+        psbtv2.inputMaps[index].set(
+          "08" /* PSBT_IN_FINAL_SCRIPTWITNESS */,
+          input.finalScriptWitness
+        );
+      }
+    }
     return psbtv2;
   }
+  /**
+   * Outputs a serialized PSBTv0 from a best-attempt conversion of the fields in
+   * this PSBTv2. Accepts optional desired format as a string (default base64).
+   */
+  toV0(format2) {
+    const converterMap = new PsbtConversionMaps();
+    this.copy(converterMap);
+    converterMap.convertToV0();
+    return converterMap.serialize(format2);
+  }
 };
 
 // src/psbtv0/psbt.ts
 var import_bitcoin4 = require("@caravan/bitcoin");
-var import_bitcoinjs_lib_v63 = require("bitcoinjs-lib-v6");
+var import_bitcoinjs_lib_v64 = require("bitcoinjs-lib-v6");
 var import_address = require("bitcoinjs-lib-v6/src/address.js");
 
 // vendor/tiny-secp256k1-asmjs/lib/index.js
@@ -93806,7 +93967,7 @@ var braidDetailsToWalletConfig = (braidDetails) => {
 
 // src/psbtv0/utils.ts
 var import_bignumber = __toESM(require("bignumber.js"));
-var import_bitcoinjs_lib_v62 = require("bitcoinjs-lib-v6");
+var import_bitcoinjs_lib_v63 = require("bitcoinjs-lib-v6");
 var import_bufio4 = require("bufio");
 var idToHash = (txid) => {
   return import_buffer.Buffer.from(txid, "hex").reverse();
@@ -93883,7 +94044,7 @@ function autoLoadPSBT(psbtFromFile, options) {
   } catch (e8) {
     return null;
   }
-  return import_bitcoinjs_lib_v62.Psbt.fromBuffer(psbtBuff, options);
+  return import_bitcoinjs_lib_v63.Psbt.fromBuffer(psbtBuff, options);
 }
 
 // src/psbtv0/psbt.ts
@@ -93894,7 +94055,7 @@ var getUnsignedMultisigPsbtV0 = ({
   outputs,
   includeGlobalXpubs = false
 }) => {
-  const psbt = new import_bitcoinjs_lib_v63.Psbt({ network: (0, import_bitcoin4.networkData)(network) });
+  const psbt = new import_bitcoinjs_lib_v64.Psbt({ network: (0, import_bitcoin4.networkData)(network) });
   psbt.setVersion(1);
   for (const input of inputs) {
     const inputData = psbtInputFormatter(
@@ -93913,7 +94074,7 @@ var getUnsignedMultisigPsbtV0 = ({
   return psbt;
 };
 var psbtInputFormatter = (input, addressType) => {
-  const tx = import_bitcoinjs_lib_v63.Transaction.fromHex(input.transactionHex);
+  const tx = import_bitcoinjs_lib_v64.Transaction.fromHex(input.transactionHex);
   const inputData = { ...input };
   const nonWitnessUtxo = tx.toBuffer();
   if (addressType === import_bitcoin4.P2SH) {
@@ -93988,7 +94149,7 @@ var formatGlobalXpub = (extendedPublicKey) => {
   return global2;
 };
 var validateMultisigPsbtSignature = (raw, inputIndex, inputSignature, inputAmount) => {
-  const psbt = import_bitcoinjs_lib_v63.Psbt.fromBuffer(bufferize(raw));
+  const psbt = import_bitcoinjs_lib_v64.Psbt.fromBuffer(bufferize(raw));
   if (psbt.inputCount === 0 || psbt.inputCount < inputIndex + 1) {
     throw new Error("Input index is out of range.");
   }
@@ -94004,8 +94165,8 @@ var validateMultisigPsbtSignature = (raw, inputIndex, inputSignature, inputAmoun
   }
   return false;
 };
-var getHashForSignature = (psbt, inputIndex, inputAmount, sigHashFlag = import_bitcoinjs_lib_v63.Transaction.SIGHASH_ALL) => {
-  const tx = import_bitcoinjs_lib_v63.Transaction.fromBuffer(psbt.data.globalMap.unsignedTx.toBuffer());
+var getHashForSignature = (psbt, inputIndex, inputAmount, sigHashFlag = import_bitcoinjs_lib_v64.Transaction.SIGHASH_ALL) => {
+  const tx = import_bitcoinjs_lib_v64.Transaction.fromBuffer(psbt.data.globalMap.unsignedTx.toBuffer());
   const input = psbt.data.inputs[inputIndex];
   if (!input.witnessScript && input.redeemScript) {
     return tx.hashForSignature(inputIndex, input.redeemScript, sigHashFlag);
@@ -94024,11 +94185,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 +94207,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 fundingTx = import_bitcoinjs_lib_v64.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

@@ -16,6 +16,54 @@ var PSBT_MAGIC_HEX = "70736274ff";
 var PSBT_MAGIC_B64 = "cHNidP8";
 var PSBT_MAGIC_BYTES = Buffer2.from([112, 115, 98, 116, 255]);
 
+// src/psbtv2/types.ts
+var KeyType = /* @__PURE__ */ ((KeyType2) => {
+  KeyType2["PSBT_GLOBAL_XPUB"] = "01";
+  KeyType2["PSBT_GLOBAL_TX_VERSION"] = "02";
+  KeyType2["PSBT_GLOBAL_FALLBACK_LOCKTIME"] = "03";
+  KeyType2["PSBT_GLOBAL_INPUT_COUNT"] = "04";
+  KeyType2["PSBT_GLOBAL_OUTPUT_COUNT"] = "05";
+  KeyType2["PSBT_GLOBAL_TX_MODIFIABLE"] = "06";
+  KeyType2["PSBT_GLOBAL_VERSION"] = "fb";
+  KeyType2["PSBT_GLOBAL_PROPRIETARY"] = "fc";
+  KeyType2["PSBT_IN_NON_WITNESS_UTXO"] = "00";
+  KeyType2["PSBT_IN_WITNESS_UTXO"] = "01";
+  KeyType2["PSBT_IN_PARTIAL_SIG"] = "02";
+  KeyType2["PSBT_IN_SIGHASH_TYPE"] = "03";
+  KeyType2["PSBT_IN_REDEEM_SCRIPT"] = "04";
+  KeyType2["PSBT_IN_WITNESS_SCRIPT"] = "05";
+  KeyType2["PSBT_IN_BIP32_DERIVATION"] = "06";
+  KeyType2["PSBT_IN_FINAL_SCRIPTSIG"] = "07";
+  KeyType2["PSBT_IN_FINAL_SCRIPTWITNESS"] = "08";
+  KeyType2["PSBT_IN_POR_COMMITMENT"] = "09";
+  KeyType2["PSBT_IN_RIPEMD160"] = "0a";
+  KeyType2["PSBT_IN_SHA256"] = "0b";
+  KeyType2["PSBT_IN_HASH160"] = "0c";
+  KeyType2["PSBT_IN_HASH256"] = "0d";
+  KeyType2["PSBT_IN_PREVIOUS_TXID"] = "0e";
+  KeyType2["PSBT_IN_OUTPUT_INDEX"] = "0f";
+  KeyType2["PSBT_IN_SEQUENCE"] = "10";
+  KeyType2["PSBT_IN_REQUIRED_TIME_LOCKTIME"] = "11";
+  KeyType2["PSBT_IN_REQUIRED_HEIGHT_LOCKTIME"] = "12";
+  KeyType2["PSBT_IN_TAP_KEY_SIG"] = "13";
+  KeyType2["PSBT_IN_TAP_SCRIPT_SIG"] = "14";
+  KeyType2["PSBT_IN_TAP_LEAF_SCRIPT"] = "15";
+  KeyType2["PSBT_IN_TAP_BIP32_DERIVATION"] = "16";
+  KeyType2["PSBT_IN_TAP_INTERNAL_KEY"] = "17";
+  KeyType2["PSBT_IN_TAP_MERKLE_ROOT"] = "18";
+  KeyType2["PSBT_IN_PROPRIETARY"] = "fc";
+  KeyType2["PSBT_OUT_REDEEM_SCRIPT"] = "00";
+  KeyType2["PSBT_OUT_WITNESS_SCRIPT"] = "01";
+  KeyType2["PSBT_OUT_BIP32_DERIVATION"] = "02";
+  KeyType2["PSBT_OUT_AMOUNT"] = "03";
+  KeyType2["PSBT_OUT_SCRIPT"] = "04";
+  KeyType2["PSBT_OUT_TAP_INTERNAL_KEY"] = "05";
+  KeyType2["PSBT_OUT_TAP_TREE"] = "06";
+  KeyType2["PSBT_OUT_TAP_BIP32_DERIVATION"] = "07";
+  KeyType2["PSBT_OUT_PROPRIETARY"] = "fc";
+  return KeyType2;
+})(KeyType || {});
+
 // src/psbtv2/values.ts
 var PSBT_MAP_SEPARATOR = Buffer2.from([0]);
 var BIP_32_NODE_REGEX = /(\/[0-9]+'?)/gi;
@@ -115,6 +163,7 @@ import { Psbt } from "bitcoinjs-lib-v6";
 
 // src/psbtv2/psbtv2maps.ts
 import { BufferReader as BufferReader2, BufferWriter as BufferWriter2 } from "bufio";
+import { Transaction } from "bitcoinjs-lib-v6";
 var PsbtV2Maps = class {
   // These maps directly correspond to the maps defined in BIP0174 and extended
   // in BIP0370
@@ -166,7 +215,7 @@ var PsbtV2Maps = class {
     return bw.render().toString(format2);
   }
   /**
-   * Copies the maps in this PsbtV2 object to another PsbtV2 object.
+   * Copies the maps in this PsbtV2Maps object to another PsbtV2Maps object.
    *
    * NOTE: This copy method is made available to achieve parity with the PSBT
    * api required by `ledger-bitcoin` for creating merklized PSBTs. HOWEVER, it
@@ -190,6 +239,86 @@ var PsbtV2Maps = class {
     from.forEach((v5, k4) => to.set(k4, Buffer2.from(v5)));
   }
 };
+var PsbtConversionMaps = class extends PsbtV2Maps {
+  /**
+   * Builds the unsigned transaction that is required on global map key 0x00 for
+   * a PSBTv0. Relies on bitcoinjs-lib to construct the transaction.
+   */
+  buildUnsignedTx() {
+    const tx = new Transaction();
+    tx.version = this.globalMap.get("02" /* PSBT_GLOBAL_TX_VERSION */)?.readUInt8() || 0;
+    tx.locktime = this.globalMap.get("03" /* PSBT_GLOBAL_FALLBACK_LOCKTIME */)?.readUInt32LE() || 0;
+    const numInputs = this.globalMap.get("04" /* PSBT_GLOBAL_INPUT_COUNT */)?.readUInt8() || 0;
+    const numOutputs = this.globalMap.get("05" /* PSBT_GLOBAL_OUTPUT_COUNT */)?.readUInt8() || 0;
+    for (let i6 = 0; i6 < numInputs; i6++) {
+      if (!this.inputMaps[i6].has("0e" /* PSBT_IN_PREVIOUS_TXID */)) {
+        console.warn(`Input ${i6} is missing previous txid. Skipping.`);
+        continue;
+      }
+      tx.addInput(
+        this.inputMaps[i6].get("0e" /* PSBT_IN_PREVIOUS_TXID */),
+        this.inputMaps[i6].get("0f" /* PSBT_IN_OUTPUT_INDEX */)?.readUint32LE() || 0,
+        this.inputMaps[i6].get("10" /* PSBT_IN_SEQUENCE */)?.readUint32LE()
+      );
+    }
+    for (let i6 = 0; i6 < numOutputs; i6++) {
+      if (!this.outputMaps[i6].has("04" /* PSBT_OUT_SCRIPT */) || !this.outputMaps[i6].has("03" /* PSBT_OUT_AMOUNT */)) {
+        console.warn(
+          `Output ${i6} is missing previous out script or amount. Skipping.`
+        );
+        continue;
+      }
+      const bigintAmount = this.outputMaps[i6].get("03" /* PSBT_OUT_AMOUNT */).readBigInt64LE();
+      const numberAmount = parseInt(bigintAmount.toString());
+      tx.addOutput(
+        this.outputMaps[i6].get("04" /* PSBT_OUT_SCRIPT */),
+        numberAmount
+      );
+    }
+    return tx.toBuffer();
+  }
+  /**
+   * Warns and then deletes map values. Intended for use when converting to a
+   * PsbtV0.
+   */
+  v0delete(map, key) {
+    if (map.has(key)) {
+      const keyName = Object.keys(KeyType)[Object.values(KeyType).indexOf(key)];
+      console.warn(
+        `Key ${keyName} key is not supported on PSBTv0 and will be omitted.`
+      );
+    }
+    map.delete(key);
+  }
+  /**
+   * Constructs an unsigned txn to be added to the PSBT_GLOBAL_UNSIGNED_TX key
+   * which is required on PsbtV0. Then removes all the fields which a PsbtV0 is
+   * incompatible with.
+   */
+  convertToV0 = () => {
+    this.globalMap.set(
+      "00" /* PSBT_GLOBAL_UNSIGNED_TX */,
+      this.buildUnsignedTx()
+    );
+    this.v0delete(this.globalMap, "02" /* PSBT_GLOBAL_TX_VERSION */);
+    this.v0delete(this.globalMap, "03" /* PSBT_GLOBAL_FALLBACK_LOCKTIME */);
+    this.v0delete(this.globalMap, "04" /* PSBT_GLOBAL_INPUT_COUNT */);
+    this.v0delete(this.globalMap, "05" /* PSBT_GLOBAL_OUTPUT_COUNT */);
+    this.v0delete(this.globalMap, "06" /* PSBT_GLOBAL_TX_MODIFIABLE */);
+    this.v0delete(this.globalMap, "fb" /* PSBT_GLOBAL_VERSION */);
+    for (const inputMap of this.inputMaps) {
+      this.v0delete(inputMap, "0e" /* PSBT_IN_PREVIOUS_TXID */);
+      this.v0delete(inputMap, "0f" /* PSBT_IN_OUTPUT_INDEX */);
+      this.v0delete(inputMap, "10" /* PSBT_IN_SEQUENCE */);
+      this.v0delete(inputMap, "11" /* PSBT_IN_REQUIRED_TIME_LOCKTIME */);
+      this.v0delete(inputMap, "12" /* PSBT_IN_REQUIRED_HEIGHT_LOCKTIME */);
+    }
+    for (const outputMap of this.outputMaps) {
+      this.v0delete(outputMap, "03" /* PSBT_OUT_AMOUNT */);
+      this.v0delete(outputMap, "04" /* PSBT_OUT_SCRIPT */);
+    }
+  };
+};
 
 // src/psbtv2/psbtv2.ts
 var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
@@ -866,7 +995,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     witnessUtxo,
     redeemScript,
     witnessScript,
-    bip32Derivation
+    bip32Derivation,
+    sighashType
   }) {
     if (!this.isReadyForConstructor) {
       throw Error(
@@ -917,6 +1047,10 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
         map.set(key, bw.render());
       }
     }
+    if (sighashType !== void 0) {
+      bw.writeU32(sighashType);
+      map.set("03" /* PSBT_IN_SIGHASH_TYPE */, bw.render());
+    }
     this.PSBT_GLOBAL_INPUT_COUNT = this.inputMaps.push(map);
   }
   addOutput({
@@ -1168,8 +1302,9 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
    * Attempts to return a PsbtV2 by converting from a PsbtV0 string or Buffer.
    *
    * This method first starts with a fresh PsbtV2 having just been created. It
-   * then takes the PsbtV2 through its operator saga through the Signer role. In
-   * this sense validation for each operator role will be performed.
+   * then takes the PsbtV2 through its operator saga and through the Input
+   * Finalizer role. In this sense, validation for each operator role will be
+   * performed as the Psbt saga is replayed.
    */
   static FromV0(psbt, allowTxnVersion1 = false) {
     const psbtv0Buf = bufferize(psbt);
@@ -1182,6 +1317,7 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
     } else {
       psbtv2.PSBT_GLOBAL_TX_VERSION = psbtv0.data.getTransaction().readInt32LE(0);
     }
+    psbtv2.PSBT_GLOBAL_FALLBACK_LOCKTIME = psbtv0.locktime;
     for (const globalXpub of psbtv0GlobalMap.globalXpub ?? []) {
       psbtv2.addGlobalXpub(
         globalXpub.extendedPubkey,
@@ -1206,7 +1342,8 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
         },
         redeemScript: input.redeemScript,
         witnessScript: input.witnessScript,
-        bip32Derivation: input.bip32Derivation
+        bip32Derivation: input.bip32Derivation,
+        sighashType: input.sighashType
       });
     }
     const txOutputs = [];
@@ -1228,8 +1365,32 @@ var PsbtV2 = class _PsbtV2 extends PsbtV2Maps {
         psbtv2.addPartialSig(index, sig.pubkey, sig.signature);
       }
     }
+    for (const [index, input] of psbtv0.data.inputs.entries()) {
+      if (input.finalScriptSig) {
+        psbtv2.inputMaps[index].set(
+          "07" /* PSBT_IN_FINAL_SCRIPTSIG */,
+          input.finalScriptSig
+        );
+      }
+      if (input.finalScriptWitness) {
+        psbtv2.inputMaps[index].set(
+          "08" /* PSBT_IN_FINAL_SCRIPTWITNESS */,
+          input.finalScriptWitness
+        );
+      }
+    }
     return psbtv2;
   }
+  /**
+   * Outputs a serialized PSBTv0 from a best-attempt conversion of the fields in
+   * this PSBTv2. Accepts optional desired format as a string (default base64).
+   */
+  toV0(format2) {
+    const converterMap = new PsbtConversionMaps();
+    this.copy(converterMap);
+    converterMap.convertToV0();
+    return converterMap.serialize(format2);
+  }
 };
 
 // src/psbtv0/psbt.ts
@@ -1241,9 +1402,10 @@ import {
   multisigSignatureBuffer,
   networkData,
   P2SH as P2SH2,
+  P2WSH as P2WSH2,
   signatureNoSighashType
 } from "@caravan/bitcoin";
-import { Psbt as Psbt3, Transaction } from "bitcoinjs-lib-v6";
+import { Psbt as Psbt3, Transaction as Transaction2 } from "bitcoinjs-lib-v6";
 import { toOutputScript } from "bitcoinjs-lib-v6/src/address.js";
 
 // vendor/tiny-secp256k1-asmjs/lib/index.js
@@ -93891,7 +94053,7 @@ var getUnsignedMultisigPsbtV0 = ({
   return psbt;
 };
 var psbtInputFormatter = (input, addressType) => {
-  const tx = Transaction.fromHex(input.transactionHex);
+  const tx = Transaction2.fromHex(input.transactionHex);
   const inputData = { ...input };
   const nonWitnessUtxo = tx.toBuffer();
   if (addressType === P2SH2) {
@@ -93982,8 +94144,8 @@ var validateMultisigPsbtSignature = (raw, inputIndex, inputSignature, inputAmoun
   }
   return false;
 };
-var getHashForSignature = (psbt, inputIndex, inputAmount, sigHashFlag = Transaction.SIGHASH_ALL) => {
-  const tx = Transaction.fromBuffer(psbt.data.globalMap.unsignedTx.toBuffer());
+var getHashForSignature = (psbt, inputIndex, inputAmount, sigHashFlag = Transaction2.SIGHASH_ALL) => {
+  const tx = Transaction2.fromBuffer(psbt.data.globalMap.unsignedTx.toBuffer());
   const input = psbt.data.inputs[inputIndex];
   if (!input.witnessScript && input.redeemScript) {
     return tx.hashForSignature(inputIndex, input.redeemScript, sigHashFlag);
@@ -94002,11 +94164,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 +94186,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 fundingTx = Transaction2.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.7.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": "*",