@bitgo/wasm-utxo 4.6.0 → 4.8.0

package/dist/cjs/js/fixedScriptWallet/BitGoPsbt.d.ts

@@ -147,21 +147,40 @@ export declare class BitGoPsbt extends PsbtBase<WasmBitGoPsbt> implements IPsbtW
     /**
      * Convert a half-signed legacy transaction to a psbt-lite.
      *
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
+     *
      * Extracts partial signatures from scriptSig/witness and creates a PSBT
      * with proper wallet metadata (bip32Derivation, scripts, witnessUtxo).
      * Only supports p2sh, p2shP2wsh, and p2wsh inputs (not taproot).
      *
      * Supports both Bitcoin-like coins (BTC, LTC, DOGE) and Dash (DASH).
-     * Zcash is NOT supported; use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead.
+     * Zcash is NOT supported; use ZcashBitGoPsbt.fromNetworkFormat instead.
      *
      * @param txBytesOrTx - Transaction bytes or decoded transaction instance (Bitcoin-like or Dash)
      * @param network - Network name
      * @param walletKeys - The wallet's root keys
      * @param unspents - Chain, index, and value for each input
      * @param _options - Reserved for future use and signature compatibility with subclasses
-     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead)
+     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromNetworkFormat instead)
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx: Uint8Array | Transaction | DashTransaction, network: NetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], _options?: unknown): BitGoPsbt;
+    /**
+     * Convert a network-format transaction to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5-slot scriptSig/witness with OP_0
+     * placeholders) and the fully-signed network format (compact 4-item form). The
+     * resulting PSBT will contain all partial signatures present in the transaction.
+     *
+     * Use this when you don't know ahead of time whether the transaction is half-signed
+     * or fully-signed. For Zcash, use ZcashBitGoPsbt.fromNetworkFormat() instead.
+     *
+     * @param txBytesOrTx - Transaction bytes or decoded Transaction/DashTransaction
+     * @param network - Network name
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     */
+    static fromNetworkFormat(txBytesOrTx: Uint8Array | Transaction | DashTransaction, network: NetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], _options?: unknown): BitGoPsbt;
     /**
      * Add an input to the PSBT
      *

package/dist/cjs/js/fixedScriptWallet/BitGoPsbt.js

@@ -61,19 +61,22 @@ class BitGoPsbt extends psbtBase_js_1.PsbtBase {
     /**
      * Convert a half-signed legacy transaction to a psbt-lite.
      *
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
+     *
      * Extracts partial signatures from scriptSig/witness and creates a PSBT
      * with proper wallet metadata (bip32Derivation, scripts, witnessUtxo).
      * Only supports p2sh, p2shP2wsh, and p2wsh inputs (not taproot).
      *
      * Supports both Bitcoin-like coins (BTC, LTC, DOGE) and Dash (DASH).
-     * Zcash is NOT supported; use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead.
+     * Zcash is NOT supported; use ZcashBitGoPsbt.fromNetworkFormat instead.
      *
      * @param txBytesOrTx - Transaction bytes or decoded transaction instance (Bitcoin-like or Dash)
      * @param network - Network name
      * @param walletKeys - The wallet's root keys
      * @param unspents - Chain, index, and value for each input
      * @param _options - Reserved for future use and signature compatibility with subclasses
-     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead)
+     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromNetworkFormat instead)
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx, network, walletKeys, unspents, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -93,6 +96,36 @@ class BitGoPsbt extends psbtBase_js_1.PsbtBase {
             : wasm_utxo_js_1.BitGoPsbt.from_half_signed_legacy_transaction(tx.wasm, network, keys.wasm, unspents);
         return new BitGoPsbt(wasm);
     }
+    /**
+     * Convert a network-format transaction to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5-slot scriptSig/witness with OP_0
+     * placeholders) and the fully-signed network format (compact 4-item form). The
+     * resulting PSBT will contain all partial signatures present in the transaction.
+     *
+     * Use this when you don't know ahead of time whether the transaction is half-signed
+     * or fully-signed. For Zcash, use ZcashBitGoPsbt.fromNetworkFormat() instead.
+     *
+     * @param txBytesOrTx - Transaction bytes or decoded Transaction/DashTransaction
+     * @param network - Network name
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     */
+    static fromNetworkFormat(txBytesOrTx, network, walletKeys, unspents, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _options) {
+        const keys = RootWalletKeys_js_1.RootWalletKeys.from(walletKeys);
+        const tx = txBytesOrTx instanceof Uint8Array
+            ? transaction_js_1.Transaction.fromBytes(txBytesOrTx, (0, coinName_js_1.toCoinName)(network))
+            : txBytesOrTx;
+        if (tx instanceof transaction_js_1.ZcashTransaction) {
+            throw new Error("Use ZcashBitGoPsbt.fromNetworkFormat() for Zcash transactions");
+        }
+        const wasm = tx instanceof transaction_js_1.DashTransaction
+            ? wasm_utxo_js_1.BitGoPsbt.from_network_format_dash(tx.wasm, network, keys.wasm, unspents)
+            : wasm_utxo_js_1.BitGoPsbt.from_network_format(tx.wasm, network, keys.wasm, unspents);
+        return new BitGoPsbt(wasm);
+    }
     addInputAtIndex(index, txidOrOptions, voutOrScript, value, script, sequence) {
         if (typeof txidOrOptions === "string") {
             return this._wasm.add_input_at_index(index, txidOrOptions, voutOrScript, value, script, sequence);

package/dist/cjs/js/fixedScriptWallet/ZcashBitGoPsbt.d.ts

@@ -102,11 +102,14 @@ export declare class ZcashBitGoPsbt extends BitGoPsbt {
      */
     static fromBytes(bytes: Uint8Array, network: ZcashNetworkName): ZcashBitGoPsbt;
     /**
-     * Reconstruct a Zcash PSBT from a half-signed legacy transaction
+     * Reconstruct a Zcash PSBT from a network-format transaction (unsigned, half-signed, or fully-signed).
      *
-     * This is the inverse of `getHalfSignedLegacyFormat()` for Zcash. It decodes the Zcash wire
-     * format (which includes version_group_id, expiry_height, and sapling fields), extracts
-     * partial signatures, and reconstructs a proper Zcash PSBT with consensus metadata.
+     * This is the Zcash equivalent of `BitGoPsbt.fromNetworkFormat()`. It decodes the Zcash wire
+     * format (which includes version_group_id, expiry_height, and sapling fields), extracts any
+     * partial signatures present, and reconstructs a proper Zcash PSBT with consensus metadata.
+     *
+     * Use this as the modern replacement for `fromHalfSignedLegacyTransaction`. Signature-count
+     * discovery (unsigned / half-signed / fully-signed) is left to the caller.
      *
      * Supports two modes for determining consensus_branch_id:
      * - **Recommended**: Pass `blockHeight` to auto-determine consensus_branch_id via network upgrade activation heights
@@ -118,28 +121,24 @@ export declare class ZcashBitGoPsbt extends BitGoPsbt {
      * @param unspents - Chain, index, and value for each input
      * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
      * @returns A ZcashBitGoPsbt instance
+     */
+    static fromNetworkFormat(txBytesOrTx: Uint8Array | ITransaction, network: ZcashNetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], options: {
+        blockHeight: number;
+    } | {
+        consensusBranchId: number;
+    }): ZcashBitGoPsbt;
+    /**
+     * Reconstruct a Zcash PSBT from a half-signed legacy transaction.
      *
-     * @example
-     * ```typescript
-     * // Round-trip with block height (recommended)
-     * const legacyBytes = psbt.getHalfSignedLegacyFormat();
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { blockHeight: 1687105 }  // NU5 activation height
-     * );
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
      *
-     * // Or with explicit consensus branch ID
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { consensusBranchId: 0xC2D6D0B4 }  // NU5 branch ID
-     * );
-     * ```
+     * @param txBytesOrTx - Either serialized Zcash transaction bytes or a decoded ZcashTransaction instance
+     * @param network - Zcash network name ("zcash", "zcashTest", "zec", "tzec")
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
+     * @returns A ZcashBitGoPsbt instance
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx: Uint8Array | ITransaction, network: ZcashNetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], options: {
         blockHeight: number;

package/dist/cjs/js/fixedScriptWallet/ZcashBitGoPsbt.js

@@ -97,11 +97,14 @@ class ZcashBitGoPsbt extends BitGoPsbt_js_1.BitGoPsbt {
         return new ZcashBitGoPsbt(wasm);
     }
     /**
-     * Reconstruct a Zcash PSBT from a half-signed legacy transaction
+     * Reconstruct a Zcash PSBT from a network-format transaction (unsigned, half-signed, or fully-signed).
      *
-     * This is the inverse of `getHalfSignedLegacyFormat()` for Zcash. It decodes the Zcash wire
-     * format (which includes version_group_id, expiry_height, and sapling fields), extracts
-     * partial signatures, and reconstructs a proper Zcash PSBT with consensus metadata.
+     * This is the Zcash equivalent of `BitGoPsbt.fromNetworkFormat()`. It decodes the Zcash wire
+     * format (which includes version_group_id, expiry_height, and sapling fields), extracts any
+     * partial signatures present, and reconstructs a proper Zcash PSBT with consensus metadata.
+     *
+     * Use this as the modern replacement for `fromHalfSignedLegacyTransaction`. Signature-count
+     * discovery (unsigned / half-signed / fully-signed) is left to the caller.
      *
      * Supports two modes for determining consensus_branch_id:
      * - **Recommended**: Pass `blockHeight` to auto-determine consensus_branch_id via network upgrade activation heights
@@ -113,28 +116,33 @@ class ZcashBitGoPsbt extends BitGoPsbt_js_1.BitGoPsbt {
      * @param unspents - Chain, index, and value for each input
      * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
      * @returns A ZcashBitGoPsbt instance
+     */
+    static fromNetworkFormat(txBytesOrTx, network, walletKeys, unspents, options) {
+        const keys = RootWalletKeys_js_1.RootWalletKeys.from(walletKeys);
+        const tx = txBytesOrTx instanceof Uint8Array
+            ? transaction_js_1.ZcashTransaction.fromBytes(txBytesOrTx)
+            : txBytesOrTx;
+        if ("blockHeight" in options) {
+            const wasm = wasm_utxo_js_1.BitGoPsbt.from_network_format_zcash_with_block_height(tx.wasm, network, keys.wasm, unspents, options.blockHeight);
+            return new ZcashBitGoPsbt(wasm);
+        }
+        else {
+            const wasm = wasm_utxo_js_1.BitGoPsbt.from_network_format_zcash_with_branch_id(tx.wasm, network, keys.wasm, unspents, options.consensusBranchId);
+            return new ZcashBitGoPsbt(wasm);
+        }
+    }
+    /**
+     * Reconstruct a Zcash PSBT from a half-signed legacy transaction.
      *
-     * @example
-     * ```typescript
-     * // Round-trip with block height (recommended)
-     * const legacyBytes = psbt.getHalfSignedLegacyFormat();
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { blockHeight: 1687105 }  // NU5 activation height
-     * );
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
      *
-     * // Or with explicit consensus branch ID
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { consensusBranchId: 0xC2D6D0B4 }  // NU5 branch ID
-     * );
-     * ```
+     * @param txBytesOrTx - Either serialized Zcash transaction bytes or a decoded ZcashTransaction instance
+     * @param network - Zcash network name ("zcash", "zcashTest", "zec", "tzec")
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
+     * @returns A ZcashBitGoPsbt instance
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx, network, walletKeys, unspents, options) {
         const keys = RootWalletKeys_js_1.RootWalletKeys.from(walletKeys);
@@ -142,11 +150,11 @@ class ZcashBitGoPsbt extends BitGoPsbt_js_1.BitGoPsbt {
             ? transaction_js_1.ZcashTransaction.fromBytes(txBytesOrTx)
             : txBytesOrTx;
         if ("blockHeight" in options) {
-            const wasm = wasm_utxo_js_1.BitGoPsbt.from_half_signed_legacy_transaction_zcash_with_block_height(tx.wasm, network, keys.wasm, unspents, options.blockHeight);
+            const wasm = wasm_utxo_js_1.BitGoPsbt.from_network_format_zcash_with_block_height(tx.wasm, network, keys.wasm, unspents, options.blockHeight);
             return new ZcashBitGoPsbt(wasm);
         }
         else {
-            const wasm = wasm_utxo_js_1.BitGoPsbt.from_half_signed_legacy_transaction_zcash_with_branch_id(tx.wasm, network, keys.wasm, unspents, options.consensusBranchId);
+            const wasm = wasm_utxo_js_1.BitGoPsbt.from_network_format_zcash_with_branch_id(tx.wasm, network, keys.wasm, unspents, options.consensusBranchId);
             return new ZcashBitGoPsbt(wasm);
         }
     }

package/dist/cjs/js/wasm/wasm_utxo.d.ts

@@ -318,8 +318,27 @@ export class BitGoPsbt {
      */
     static from_half_signed_legacy_transaction_dash(tx: WasmDashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any): BitGoPsbt;
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with block height).
-     * Thin wrapper: resolves block_height → consensus_branch_id and delegates to the explicit variant.
+     * Convert a network-format transaction (half-signed OR fully-signed) to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5 items with OP_0 placeholders) and
+     * the fully-signed network format (4 items, no placeholders). The PSBT will contain
+     * all partial signatures present in the transaction.
+     *
+     * # Arguments
+     * * `tx` - The decoded Bitcoin-like (non-Dash, non-Zcash) transaction
+     * * `network` - Network name (e.g., "bitcoin", "btc")
+     * * `wallet_keys` - The wallet's root keys
+     * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` per input
+     */
+    static from_network_format(tx: WasmTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any): BitGoPsbt;
+    /**
+     * Convert a network-format Dash transaction (half-signed OR fully-signed) to a PSBT.
+     */
+    static from_network_format_dash(tx: WasmDashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any): BitGoPsbt;
+    /**
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with block height).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -328,9 +347,11 @@ export class BitGoPsbt {
      * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` for each input
      * * `block_height` - Block height to determine consensus branch ID
      */
-    static from_half_signed_legacy_transaction_zcash_with_block_height(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, block_height: number): BitGoPsbt;
+    static from_network_format_zcash_with_block_height(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, block_height: number): BitGoPsbt;
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with consensus branch ID).
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with consensus branch ID).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -339,7 +360,7 @@ export class BitGoPsbt {
      * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` for each input
      * * `consensus_branch_id` - Zcash consensus branch ID
      */
-    static from_half_signed_legacy_transaction_zcash_with_branch_id(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, consensus_branch_id: number): BitGoPsbt;
+    static from_network_format_zcash_with_branch_id(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, consensus_branch_id: number): BitGoPsbt;
     /**
      * Generate and store MuSig2 nonces for all MuSig2 inputs
      *

package/dist/cjs/js/wasm/wasm_utxo.js

@@ -1225,8 +1225,73 @@ class BitGoPsbt {
         }
     }
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with block height).
-     * Thin wrapper: resolves block_height → consensus_branch_id and delegates to the explicit variant.
+     * Convert a network-format transaction (half-signed OR fully-signed) to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5 items with OP_0 placeholders) and
+     * the fully-signed network format (4 items, no placeholders). The PSBT will contain
+     * all partial signatures present in the transaction.
+     *
+     * # Arguments
+     * * `tx` - The decoded Bitcoin-like (non-Dash, non-Zcash) transaction
+     * * `network` - Network name (e.g., "bitcoin", "btc")
+     * * `wallet_keys` - The wallet's root keys
+     * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` per input
+     * @param {WasmTransaction} tx
+     * @param {string} network
+     * @param {WasmRootWalletKeys} wallet_keys
+     * @param {any} unspents
+     * @returns {BitGoPsbt}
+     */
+    static from_network_format(tx, network, wallet_keys, unspents) {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            _assertClass(tx, WasmTransaction);
+            const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+            const len0 = WASM_VECTOR_LEN;
+            _assertClass(wallet_keys, WasmRootWalletKeys);
+            wasm.bitgopsbt_from_network_format(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents));
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+            if (r2) {
+                throw takeObject(r1);
+            }
+            return BitGoPsbt.__wrap(r0);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * Convert a network-format Dash transaction (half-signed OR fully-signed) to a PSBT.
+     * @param {WasmDashTransaction} tx
+     * @param {string} network
+     * @param {WasmRootWalletKeys} wallet_keys
+     * @param {any} unspents
+     * @returns {BitGoPsbt}
+     */
+    static from_network_format_dash(tx, network, wallet_keys, unspents) {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            _assertClass(tx, WasmDashTransaction);
+            const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+            const len0 = WASM_VECTOR_LEN;
+            _assertClass(wallet_keys, WasmRootWalletKeys);
+            wasm.bitgopsbt_from_network_format_dash(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents));
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+            if (r2) {
+                throw takeObject(r1);
+            }
+            return BitGoPsbt.__wrap(r0);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with block height).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -1241,14 +1306,14 @@ class BitGoPsbt {
      * @param {number} block_height
      * @returns {BitGoPsbt}
      */
-    static from_half_signed_legacy_transaction_zcash_with_block_height(tx, network, wallet_keys, unspents, block_height) {
+    static from_network_format_zcash_with_block_height(tx, network, wallet_keys, unspents, block_height) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             _assertClass(tx, WasmZcashTransaction);
             const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
             const len0 = WASM_VECTOR_LEN;
             _assertClass(wallet_keys, WasmRootWalletKeys);
-            wasm.bitgopsbt_from_half_signed_legacy_transaction_zcash_with_block_height(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), block_height);
+            wasm.bitgopsbt_from_network_format_zcash_with_block_height(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), block_height);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -1261,7 +1326,9 @@ class BitGoPsbt {
         }
     }
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with consensus branch ID).
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with consensus branch ID).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -1276,14 +1343,14 @@ class BitGoPsbt {
      * @param {number} consensus_branch_id
      * @returns {BitGoPsbt}
      */
-    static from_half_signed_legacy_transaction_zcash_with_branch_id(tx, network, wallet_keys, unspents, consensus_branch_id) {
+    static from_network_format_zcash_with_branch_id(tx, network, wallet_keys, unspents, consensus_branch_id) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             _assertClass(tx, WasmZcashTransaction);
             const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
             const len0 = WASM_VECTOR_LEN;
             _assertClass(wallet_keys, WasmRootWalletKeys);
-            wasm.bitgopsbt_from_half_signed_legacy_transaction_zcash_with_branch_id(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), consensus_branch_id);
+            wasm.bitgopsbt_from_network_format_zcash_with_branch_id(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), consensus_branch_id);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);

package/dist/cjs/js/wasm/wasm_utxo_bg.wasm.d.ts

@@ -1,11 +1,30 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const __wbg_wrapdescriptor_free: (a: number, b: number) => void;
+export const __wbg_wrapminiscript_free: (a: number, b: number) => void;
+export const wrapdescriptor_atDerivationIndex: (a: number, b: number, c: number) => void;
+export const wrapdescriptor_descType: (a: number, b: number) => void;
+export const wrapdescriptor_encode: (a: number, b: number) => void;
+export const wrapdescriptor_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wrapdescriptor_fromStringDetectType: (a: number, b: number, c: number) => void;
+export const wrapdescriptor_hasWildcard: (a: number) => number;
+export const wrapdescriptor_maxWeightToSatisfy: (a: number, b: number) => void;
+export const wrapdescriptor_node: (a: number, b: number) => void;
+export const wrapdescriptor_scriptPubkey: (a: number, b: number) => void;
+export const wrapdescriptor_toAsmString: (a: number, b: number) => void;
+export const wrapdescriptor_toString: (a: number, b: number) => void;
+export const wrapminiscript_encode: (a: number, b: number) => void;
+export const wrapminiscript_fromBitcoinScript: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wrapminiscript_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wrapminiscript_node: (a: number, b: number) => void;
+export const wrapminiscript_toAsmString: (a: number, b: number) => void;
+export const wrapminiscript_toString: (a: number, b: number) => void;
 export const __wbg_bip322namespace_free: (a: number, b: number) => void;
 export const __wbg_bitgopsbt_free: (a: number, b: number) => void;
 export const __wbg_fixedscriptwalletnamespace_free: (a: number, b: number) => void;
-export const __wbg_inscriptionsnamespace_free: (a: number, b: number) => void;
 export const __wbg_wasmbip32_free: (a: number, b: number) => void;
+export const __wbg_wasmreplayprotection_free: (a: number, b: number) => void;
 export const bip322namespace_add_bip322_input: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number) => void;
 export const bip322namespace_get_bip322_message: (a: number, b: number, c: number) => void;
 export const bip322namespace_verify_bip322_psbt_input: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => void;
@@ -42,8 +61,10 @@ export const bitgopsbt_finalize_all_inputs: (a: number, b: number) => void;
 export const bitgopsbt_from_bytes: (a: number, b: number, c: number, d: number, e: number) => void;
 export const bitgopsbt_from_half_signed_legacy_transaction: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
 export const bitgopsbt_from_half_signed_legacy_transaction_dash: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
-export const bitgopsbt_from_half_signed_legacy_transaction_zcash_with_block_height: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const bitgopsbt_from_half_signed_legacy_transaction_zcash_with_branch_id: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const bitgopsbt_from_network_format: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const bitgopsbt_from_network_format_dash: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const bitgopsbt_from_network_format_zcash_with_block_height: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const bitgopsbt_from_network_format_zcash_with_branch_id: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
 export const bitgopsbt_generate_musig2_nonces: (a: number, b: number, c: number, d: number, e: number) => void;
 export const bitgopsbt_get_global_xpubs: (a: number) => number;
 export const bitgopsbt_get_input_kv: (a: number, b: number, c: number, d: number) => void;
@@ -90,8 +111,6 @@ export const fixedscriptwalletnamespace_output_script_with_network_str: (a: numb
 export const fixedscriptwalletnamespace_p2sh_p2pk_output_script: (a: number, b: number, c: number) => void;
 export const fixedscriptwalletnamespace_supports_script_type: (a: number, b: number, c: number, d: number, e: number) => void;
 export const fixedscriptwalletnamespace_to_wallet_keys: (a: number, b: number, c: number, d: number, e: number) => void;
-export const inscriptionsnamespace_create_inscription_reveal_data: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const inscriptionsnamespace_sign_reveal_transaction: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: bigint) => void;
 export const wasmbip32_chain_code: (a: number) => number;
 export const wasmbip32_depth: (a: number) => number;
 export const wasmbip32_derive: (a: number, b: number, c: number) => void;
@@ -114,33 +133,19 @@ export const wasmbip32_private_key: (a: number) => number;
 export const wasmbip32_public_key: (a: number) => number;
 export const wasmbip32_to_base58: (a: number, b: number) => void;
 export const wasmbip32_to_wif: (a: number, b: number) => void;
+export const wasmreplayprotection_from_addresses: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wasmreplayprotection_from_output_scripts: (a: number, b: number) => number;
+export const wasmreplayprotection_from_public_keys: (a: number, b: number, c: number) => void;
 export const wasmbip32_from_bip32_properties: (a: number, b: number) => void;
 export const bitgopsbt_sign_wallet_input: (a: number, b: number, c: number, d: number) => void;
 export const bitgopsbt_sign_all_with_xpriv: (a: number, b: number, c: number) => void;
 export const bitgopsbt_sign_replay_protection_inputs: (a: number, b: number, c: number) => void;
-export const __wbg_wrapdescriptor_free: (a: number, b: number) => void;
-export const __wbg_wrapminiscript_free: (a: number, b: number) => void;
-export const wrapdescriptor_atDerivationIndex: (a: number, b: number, c: number) => void;
-export const wrapdescriptor_descType: (a: number, b: number) => void;
-export const wrapdescriptor_encode: (a: number, b: number) => void;
-export const wrapdescriptor_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wrapdescriptor_fromStringDetectType: (a: number, b: number, c: number) => void;
-export const wrapdescriptor_hasWildcard: (a: number) => number;
-export const wrapdescriptor_maxWeightToSatisfy: (a: number, b: number) => void;
-export const wrapdescriptor_node: (a: number, b: number) => void;
-export const wrapdescriptor_scriptPubkey: (a: number, b: number) => void;
-export const wrapdescriptor_toAsmString: (a: number, b: number) => void;
-export const wrapdescriptor_toString: (a: number, b: number) => void;
-export const wrapminiscript_encode: (a: number, b: number) => void;
-export const wrapminiscript_fromBitcoinScript: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wrapminiscript_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wrapminiscript_node: (a: number, b: number) => void;
-export const wrapminiscript_toAsmString: (a: number, b: number) => void;
-export const wrapminiscript_toString: (a: number, b: number) => void;
+export const __wbg_inscriptionsnamespace_free: (a: number, b: number) => void;
 export const __wbg_messagenamespace_free: (a: number, b: number) => void;
 export const __wbg_wasmecpair_free: (a: number, b: number) => void;
-export const __wbg_wasmreplayprotection_free: (a: number, b: number) => void;
 export const __wbg_wasmrootwalletkeys_free: (a: number, b: number) => void;
+export const inscriptionsnamespace_create_inscription_reveal_data: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const inscriptionsnamespace_sign_reveal_transaction: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: bigint) => void;
 export const messagenamespace_sign_message: (a: number, b: number, c: number, d: number) => void;
 export const messagenamespace_verify_message: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
 export const wasmecpair_from_private_key: (a: number, b: number, c: number) => void;
@@ -153,9 +158,6 @@ export const wasmecpair_public_key: (a: number) => number;
 export const wasmecpair_to_wif: (a: number, b: number) => void;
 export const wasmecpair_to_wif_mainnet: (a: number, b: number) => void;
 export const wasmecpair_to_wif_testnet: (a: number, b: number) => void;
-export const wasmreplayprotection_from_addresses: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wasmreplayprotection_from_output_scripts: (a: number, b: number) => number;
-export const wasmreplayprotection_from_public_keys: (a: number, b: number, c: number) => void;
 export const wasmrootwalletkeys_backup_key: (a: number) => number;
 export const wasmrootwalletkeys_bitgo_key: (a: number) => number;
 export const wasmrootwalletkeys_new: (a: number, b: number, c: number, d: number) => void;

package/dist/esm/js/fixedScriptWallet/BitGoPsbt.d.ts

@@ -147,21 +147,40 @@ export declare class BitGoPsbt extends PsbtBase<WasmBitGoPsbt> implements IPsbtW
     /**
      * Convert a half-signed legacy transaction to a psbt-lite.
      *
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
+     *
      * Extracts partial signatures from scriptSig/witness and creates a PSBT
      * with proper wallet metadata (bip32Derivation, scripts, witnessUtxo).
      * Only supports p2sh, p2shP2wsh, and p2wsh inputs (not taproot).
      *
      * Supports both Bitcoin-like coins (BTC, LTC, DOGE) and Dash (DASH).
-     * Zcash is NOT supported; use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead.
+     * Zcash is NOT supported; use ZcashBitGoPsbt.fromNetworkFormat instead.
      *
      * @param txBytesOrTx - Transaction bytes or decoded transaction instance (Bitcoin-like or Dash)
      * @param network - Network name
      * @param walletKeys - The wallet's root keys
      * @param unspents - Chain, index, and value for each input
      * @param _options - Reserved for future use and signature compatibility with subclasses
-     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead)
+     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromNetworkFormat instead)
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx: Uint8Array | Transaction | DashTransaction, network: NetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], _options?: unknown): BitGoPsbt;
+    /**
+     * Convert a network-format transaction to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5-slot scriptSig/witness with OP_0
+     * placeholders) and the fully-signed network format (compact 4-item form). The
+     * resulting PSBT will contain all partial signatures present in the transaction.
+     *
+     * Use this when you don't know ahead of time whether the transaction is half-signed
+     * or fully-signed. For Zcash, use ZcashBitGoPsbt.fromNetworkFormat() instead.
+     *
+     * @param txBytesOrTx - Transaction bytes or decoded Transaction/DashTransaction
+     * @param network - Network name
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     */
+    static fromNetworkFormat(txBytesOrTx: Uint8Array | Transaction | DashTransaction, network: NetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], _options?: unknown): BitGoPsbt;
     /**
      * Add an input to the PSBT
      *

package/dist/esm/js/fixedScriptWallet/BitGoPsbt.js

@@ -57,19 +57,22 @@ export class BitGoPsbt extends PsbtBase {
     /**
      * Convert a half-signed legacy transaction to a psbt-lite.
      *
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
+     *
      * Extracts partial signatures from scriptSig/witness and creates a PSBT
      * with proper wallet metadata (bip32Derivation, scripts, witnessUtxo).
      * Only supports p2sh, p2shP2wsh, and p2wsh inputs (not taproot).
      *
      * Supports both Bitcoin-like coins (BTC, LTC, DOGE) and Dash (DASH).
-     * Zcash is NOT supported; use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead.
+     * Zcash is NOT supported; use ZcashBitGoPsbt.fromNetworkFormat instead.
      *
      * @param txBytesOrTx - Transaction bytes or decoded transaction instance (Bitcoin-like or Dash)
      * @param network - Network name
      * @param walletKeys - The wallet's root keys
      * @param unspents - Chain, index, and value for each input
      * @param _options - Reserved for future use and signature compatibility with subclasses
-     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromHalfSignedLegacyTransaction instead)
+     * @throws Error if transaction is Zcash (use ZcashBitGoPsbt.fromNetworkFormat instead)
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx, network, walletKeys, unspents, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -89,6 +92,36 @@ export class BitGoPsbt extends PsbtBase {
             : WasmBitGoPsbt.from_half_signed_legacy_transaction(tx.wasm, network, keys.wasm, unspents);
         return new BitGoPsbt(wasm);
     }
+    /**
+     * Convert a network-format transaction to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5-slot scriptSig/witness with OP_0
+     * placeholders) and the fully-signed network format (compact 4-item form). The
+     * resulting PSBT will contain all partial signatures present in the transaction.
+     *
+     * Use this when you don't know ahead of time whether the transaction is half-signed
+     * or fully-signed. For Zcash, use ZcashBitGoPsbt.fromNetworkFormat() instead.
+     *
+     * @param txBytesOrTx - Transaction bytes or decoded Transaction/DashTransaction
+     * @param network - Network name
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     */
+    static fromNetworkFormat(txBytesOrTx, network, walletKeys, unspents, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _options) {
+        const keys = RootWalletKeys.from(walletKeys);
+        const tx = txBytesOrTx instanceof Uint8Array
+            ? Transaction.fromBytes(txBytesOrTx, toCoinName(network))
+            : txBytesOrTx;
+        if (tx instanceof ZcashTransaction) {
+            throw new Error("Use ZcashBitGoPsbt.fromNetworkFormat() for Zcash transactions");
+        }
+        const wasm = tx instanceof DashTransaction
+            ? WasmBitGoPsbt.from_network_format_dash(tx.wasm, network, keys.wasm, unspents)
+            : WasmBitGoPsbt.from_network_format(tx.wasm, network, keys.wasm, unspents);
+        return new BitGoPsbt(wasm);
+    }
     addInputAtIndex(index, txidOrOptions, voutOrScript, value, script, sequence) {
         if (typeof txidOrOptions === "string") {
             return this._wasm.add_input_at_index(index, txidOrOptions, voutOrScript, value, script, sequence);

package/dist/esm/js/fixedScriptWallet/ZcashBitGoPsbt.d.ts

@@ -102,11 +102,14 @@ export declare class ZcashBitGoPsbt extends BitGoPsbt {
      */
     static fromBytes(bytes: Uint8Array, network: ZcashNetworkName): ZcashBitGoPsbt;
     /**
-     * Reconstruct a Zcash PSBT from a half-signed legacy transaction
+     * Reconstruct a Zcash PSBT from a network-format transaction (unsigned, half-signed, or fully-signed).
      *
-     * This is the inverse of `getHalfSignedLegacyFormat()` for Zcash. It decodes the Zcash wire
-     * format (which includes version_group_id, expiry_height, and sapling fields), extracts
-     * partial signatures, and reconstructs a proper Zcash PSBT with consensus metadata.
+     * This is the Zcash equivalent of `BitGoPsbt.fromNetworkFormat()`. It decodes the Zcash wire
+     * format (which includes version_group_id, expiry_height, and sapling fields), extracts any
+     * partial signatures present, and reconstructs a proper Zcash PSBT with consensus metadata.
+     *
+     * Use this as the modern replacement for `fromHalfSignedLegacyTransaction`. Signature-count
+     * discovery (unsigned / half-signed / fully-signed) is left to the caller.
      *
      * Supports two modes for determining consensus_branch_id:
      * - **Recommended**: Pass `blockHeight` to auto-determine consensus_branch_id via network upgrade activation heights
@@ -118,28 +121,24 @@ export declare class ZcashBitGoPsbt extends BitGoPsbt {
      * @param unspents - Chain, index, and value for each input
      * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
      * @returns A ZcashBitGoPsbt instance
+     */
+    static fromNetworkFormat(txBytesOrTx: Uint8Array | ITransaction, network: ZcashNetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], options: {
+        blockHeight: number;
+    } | {
+        consensusBranchId: number;
+    }): ZcashBitGoPsbt;
+    /**
+     * Reconstruct a Zcash PSBT from a half-signed legacy transaction.
      *
-     * @example
-     * ```typescript
-     * // Round-trip with block height (recommended)
-     * const legacyBytes = psbt.getHalfSignedLegacyFormat();
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { blockHeight: 1687105 }  // NU5 activation height
-     * );
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
      *
-     * // Or with explicit consensus branch ID
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { consensusBranchId: 0xC2D6D0B4 }  // NU5 branch ID
-     * );
-     * ```
+     * @param txBytesOrTx - Either serialized Zcash transaction bytes or a decoded ZcashTransaction instance
+     * @param network - Zcash network name ("zcash", "zcashTest", "zec", "tzec")
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
+     * @returns A ZcashBitGoPsbt instance
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx: Uint8Array | ITransaction, network: ZcashNetworkName, walletKeys: WalletKeysArg, unspents: HydrationUnspent[], options: {
         blockHeight: number;

package/dist/esm/js/fixedScriptWallet/ZcashBitGoPsbt.js

@@ -94,11 +94,14 @@ export class ZcashBitGoPsbt extends BitGoPsbt {
         return new ZcashBitGoPsbt(wasm);
     }
     /**
-     * Reconstruct a Zcash PSBT from a half-signed legacy transaction
+     * Reconstruct a Zcash PSBT from a network-format transaction (unsigned, half-signed, or fully-signed).
      *
-     * This is the inverse of `getHalfSignedLegacyFormat()` for Zcash. It decodes the Zcash wire
-     * format (which includes version_group_id, expiry_height, and sapling fields), extracts
-     * partial signatures, and reconstructs a proper Zcash PSBT with consensus metadata.
+     * This is the Zcash equivalent of `BitGoPsbt.fromNetworkFormat()`. It decodes the Zcash wire
+     * format (which includes version_group_id, expiry_height, and sapling fields), extracts any
+     * partial signatures present, and reconstructs a proper Zcash PSBT with consensus metadata.
+     *
+     * Use this as the modern replacement for `fromHalfSignedLegacyTransaction`. Signature-count
+     * discovery (unsigned / half-signed / fully-signed) is left to the caller.
      *
      * Supports two modes for determining consensus_branch_id:
      * - **Recommended**: Pass `blockHeight` to auto-determine consensus_branch_id via network upgrade activation heights
@@ -110,28 +113,33 @@ export class ZcashBitGoPsbt extends BitGoPsbt {
      * @param unspents - Chain, index, and value for each input
      * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
      * @returns A ZcashBitGoPsbt instance
+     */
+    static fromNetworkFormat(txBytesOrTx, network, walletKeys, unspents, options) {
+        const keys = RootWalletKeys.from(walletKeys);
+        const tx = txBytesOrTx instanceof Uint8Array
+            ? ZcashTransaction.fromBytes(txBytesOrTx)
+            : txBytesOrTx;
+        if ("blockHeight" in options) {
+            const wasm = WasmBitGoPsbt.from_network_format_zcash_with_block_height(tx.wasm, network, keys.wasm, unspents, options.blockHeight);
+            return new ZcashBitGoPsbt(wasm);
+        }
+        else {
+            const wasm = WasmBitGoPsbt.from_network_format_zcash_with_branch_id(tx.wasm, network, keys.wasm, unspents, options.consensusBranchId);
+            return new ZcashBitGoPsbt(wasm);
+        }
+    }
+    /**
+     * Reconstruct a Zcash PSBT from a half-signed legacy transaction.
      *
-     * @example
-     * ```typescript
-     * // Round-trip with block height (recommended)
-     * const legacyBytes = psbt.getHalfSignedLegacyFormat();
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { blockHeight: 1687105 }  // NU5 activation height
-     * );
+     * @deprecated Use `fromNetworkFormat()` instead. Signature-count enforcement
+     * (exactly 1 sig per wallet input) is moving to the caller.
      *
-     * // Or with explicit consensus branch ID
-     * const reconstructed = ZcashBitGoPsbt.fromHalfSignedLegacyTransaction(
-     *   legacyBytes,
-     *   "zec",
-     *   walletKeys,
-     *   unspents,
-     *   { consensusBranchId: 0xC2D6D0B4 }  // NU5 branch ID
-     * );
-     * ```
+     * @param txBytesOrTx - Either serialized Zcash transaction bytes or a decoded ZcashTransaction instance
+     * @param network - Zcash network name ("zcash", "zcashTest", "zec", "tzec")
+     * @param walletKeys - The wallet's root keys
+     * @param unspents - Chain, index, and value for each input
+     * @param options - Either `{ blockHeight: number }` or `{ consensusBranchId: number }`
+     * @returns A ZcashBitGoPsbt instance
      */
     static fromHalfSignedLegacyTransaction(txBytesOrTx, network, walletKeys, unspents, options) {
         const keys = RootWalletKeys.from(walletKeys);
@@ -139,11 +147,11 @@ export class ZcashBitGoPsbt extends BitGoPsbt {
             ? ZcashTransaction.fromBytes(txBytesOrTx)
             : txBytesOrTx;
         if ("blockHeight" in options) {
-            const wasm = WasmBitGoPsbt.from_half_signed_legacy_transaction_zcash_with_block_height(tx.wasm, network, keys.wasm, unspents, options.blockHeight);
+            const wasm = WasmBitGoPsbt.from_network_format_zcash_with_block_height(tx.wasm, network, keys.wasm, unspents, options.blockHeight);
             return new ZcashBitGoPsbt(wasm);
         }
         else {
-            const wasm = WasmBitGoPsbt.from_half_signed_legacy_transaction_zcash_with_branch_id(tx.wasm, network, keys.wasm, unspents, options.consensusBranchId);
+            const wasm = WasmBitGoPsbt.from_network_format_zcash_with_branch_id(tx.wasm, network, keys.wasm, unspents, options.consensusBranchId);
             return new ZcashBitGoPsbt(wasm);
         }
     }

package/dist/esm/js/wasm/wasm_utxo.d.ts

@@ -318,8 +318,27 @@ export class BitGoPsbt {
      */
     static from_half_signed_legacy_transaction_dash(tx: WasmDashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any): BitGoPsbt;
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with block height).
-     * Thin wrapper: resolves block_height → consensus_branch_id and delegates to the explicit variant.
+     * Convert a network-format transaction (half-signed OR fully-signed) to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5 items with OP_0 placeholders) and
+     * the fully-signed network format (4 items, no placeholders). The PSBT will contain
+     * all partial signatures present in the transaction.
+     *
+     * # Arguments
+     * * `tx` - The decoded Bitcoin-like (non-Dash, non-Zcash) transaction
+     * * `network` - Network name (e.g., "bitcoin", "btc")
+     * * `wallet_keys` - The wallet's root keys
+     * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` per input
+     */
+    static from_network_format(tx: WasmTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any): BitGoPsbt;
+    /**
+     * Convert a network-format Dash transaction (half-signed OR fully-signed) to a PSBT.
+     */
+    static from_network_format_dash(tx: WasmDashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any): BitGoPsbt;
+    /**
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with block height).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -328,9 +347,11 @@ export class BitGoPsbt {
      * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` for each input
      * * `block_height` - Block height to determine consensus branch ID
      */
-    static from_half_signed_legacy_transaction_zcash_with_block_height(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, block_height: number): BitGoPsbt;
+    static from_network_format_zcash_with_block_height(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, block_height: number): BitGoPsbt;
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with consensus branch ID).
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with consensus branch ID).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -339,7 +360,7 @@ export class BitGoPsbt {
      * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` for each input
      * * `consensus_branch_id` - Zcash consensus branch ID
      */
-    static from_half_signed_legacy_transaction_zcash_with_branch_id(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, consensus_branch_id: number): BitGoPsbt;
+    static from_network_format_zcash_with_branch_id(tx: WasmZcashTransaction, network: string, wallet_keys: WasmRootWalletKeys, unspents: any, consensus_branch_id: number): BitGoPsbt;
     /**
      * Generate and store MuSig2 nonces for all MuSig2 inputs
      *

package/dist/esm/js/wasm/wasm_utxo_bg.js

@@ -1221,8 +1221,73 @@ export class BitGoPsbt {
         }
     }
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with block height).
-     * Thin wrapper: resolves block_height → consensus_branch_id and delegates to the explicit variant.
+     * Convert a network-format transaction (half-signed OR fully-signed) to a PSBT.
+     *
+     * Accepts both the half-signed legacy format (5 items with OP_0 placeholders) and
+     * the fully-signed network format (4 items, no placeholders). The PSBT will contain
+     * all partial signatures present in the transaction.
+     *
+     * # Arguments
+     * * `tx` - The decoded Bitcoin-like (non-Dash, non-Zcash) transaction
+     * * `network` - Network name (e.g., "bitcoin", "btc")
+     * * `wallet_keys` - The wallet's root keys
+     * * `unspents` - Array of `{ chain: number, index: number, value: bigint }` per input
+     * @param {WasmTransaction} tx
+     * @param {string} network
+     * @param {WasmRootWalletKeys} wallet_keys
+     * @param {any} unspents
+     * @returns {BitGoPsbt}
+     */
+    static from_network_format(tx, network, wallet_keys, unspents) {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            _assertClass(tx, WasmTransaction);
+            const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+            const len0 = WASM_VECTOR_LEN;
+            _assertClass(wallet_keys, WasmRootWalletKeys);
+            wasm.bitgopsbt_from_network_format(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents));
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+            if (r2) {
+                throw takeObject(r1);
+            }
+            return BitGoPsbt.__wrap(r0);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * Convert a network-format Dash transaction (half-signed OR fully-signed) to a PSBT.
+     * @param {WasmDashTransaction} tx
+     * @param {string} network
+     * @param {WasmRootWalletKeys} wallet_keys
+     * @param {any} unspents
+     * @returns {BitGoPsbt}
+     */
+    static from_network_format_dash(tx, network, wallet_keys, unspents) {
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            _assertClass(tx, WasmDashTransaction);
+            const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+            const len0 = WASM_VECTOR_LEN;
+            _assertClass(wallet_keys, WasmRootWalletKeys);
+            wasm.bitgopsbt_from_network_format_dash(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents));
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
+            if (r2) {
+                throw takeObject(r1);
+            }
+            return BitGoPsbt.__wrap(r0);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+        }
+    }
+    /**
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with block height).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -1237,14 +1302,14 @@ export class BitGoPsbt {
      * @param {number} block_height
      * @returns {BitGoPsbt}
      */
-    static from_half_signed_legacy_transaction_zcash_with_block_height(tx, network, wallet_keys, unspents, block_height) {
+    static from_network_format_zcash_with_block_height(tx, network, wallet_keys, unspents, block_height) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             _assertClass(tx, WasmZcashTransaction);
             const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
             const len0 = WASM_VECTOR_LEN;
             _assertClass(wallet_keys, WasmRootWalletKeys);
-            wasm.bitgopsbt_from_half_signed_legacy_transaction_zcash_with_block_height(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), block_height);
+            wasm.bitgopsbt_from_network_format_zcash_with_block_height(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), block_height);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
@@ -1257,7 +1322,9 @@ export class BitGoPsbt {
         }
     }
     /**
-     * Convert a half-signed legacy Zcash transaction to a psbt-lite (with consensus branch ID).
+     * Convert a network-format Zcash transaction (0, 1, or 2 sigs) to a PSBT (with consensus branch ID).
+     *
+     * Accepts unsigned, half-signed, and fully-signed Zcash transactions.
      *
      * # Arguments
      * * `tx` - The decoded Zcash transaction
@@ -1272,14 +1339,14 @@ export class BitGoPsbt {
      * @param {number} consensus_branch_id
      * @returns {BitGoPsbt}
      */
-    static from_half_signed_legacy_transaction_zcash_with_branch_id(tx, network, wallet_keys, unspents, consensus_branch_id) {
+    static from_network_format_zcash_with_branch_id(tx, network, wallet_keys, unspents, consensus_branch_id) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             _assertClass(tx, WasmZcashTransaction);
             const ptr0 = passStringToWasm0(network, wasm.__wbindgen_export, wasm.__wbindgen_export2);
             const len0 = WASM_VECTOR_LEN;
             _assertClass(wallet_keys, WasmRootWalletKeys);
-            wasm.bitgopsbt_from_half_signed_legacy_transaction_zcash_with_branch_id(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), consensus_branch_id);
+            wasm.bitgopsbt_from_network_format_zcash_with_branch_id(retptr, tx.__wbg_ptr, ptr0, len0, wallet_keys.__wbg_ptr, addHeapObject(unspents), consensus_branch_id);
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);

package/dist/esm/js/wasm/wasm_utxo_bg.wasm.d.ts

@@ -1,11 +1,30 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const __wbg_wrapdescriptor_free: (a: number, b: number) => void;
+export const __wbg_wrapminiscript_free: (a: number, b: number) => void;
+export const wrapdescriptor_atDerivationIndex: (a: number, b: number, c: number) => void;
+export const wrapdescriptor_descType: (a: number, b: number) => void;
+export const wrapdescriptor_encode: (a: number, b: number) => void;
+export const wrapdescriptor_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wrapdescriptor_fromStringDetectType: (a: number, b: number, c: number) => void;
+export const wrapdescriptor_hasWildcard: (a: number) => number;
+export const wrapdescriptor_maxWeightToSatisfy: (a: number, b: number) => void;
+export const wrapdescriptor_node: (a: number, b: number) => void;
+export const wrapdescriptor_scriptPubkey: (a: number, b: number) => void;
+export const wrapdescriptor_toAsmString: (a: number, b: number) => void;
+export const wrapdescriptor_toString: (a: number, b: number) => void;
+export const wrapminiscript_encode: (a: number, b: number) => void;
+export const wrapminiscript_fromBitcoinScript: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wrapminiscript_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wrapminiscript_node: (a: number, b: number) => void;
+export const wrapminiscript_toAsmString: (a: number, b: number) => void;
+export const wrapminiscript_toString: (a: number, b: number) => void;
 export const __wbg_bip322namespace_free: (a: number, b: number) => void;
 export const __wbg_bitgopsbt_free: (a: number, b: number) => void;
 export const __wbg_fixedscriptwalletnamespace_free: (a: number, b: number) => void;
-export const __wbg_inscriptionsnamespace_free: (a: number, b: number) => void;
 export const __wbg_wasmbip32_free: (a: number, b: number) => void;
+export const __wbg_wasmreplayprotection_free: (a: number, b: number) => void;
 export const bip322namespace_add_bip322_input: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number) => void;
 export const bip322namespace_get_bip322_message: (a: number, b: number, c: number) => void;
 export const bip322namespace_verify_bip322_psbt_input: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => void;
@@ -42,8 +61,10 @@ export const bitgopsbt_finalize_all_inputs: (a: number, b: number) => void;
 export const bitgopsbt_from_bytes: (a: number, b: number, c: number, d: number, e: number) => void;
 export const bitgopsbt_from_half_signed_legacy_transaction: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
 export const bitgopsbt_from_half_signed_legacy_transaction_dash: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
-export const bitgopsbt_from_half_signed_legacy_transaction_zcash_with_block_height: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const bitgopsbt_from_half_signed_legacy_transaction_zcash_with_branch_id: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const bitgopsbt_from_network_format: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const bitgopsbt_from_network_format_dash: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const bitgopsbt_from_network_format_zcash_with_block_height: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const bitgopsbt_from_network_format_zcash_with_branch_id: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
 export const bitgopsbt_generate_musig2_nonces: (a: number, b: number, c: number, d: number, e: number) => void;
 export const bitgopsbt_get_global_xpubs: (a: number) => number;
 export const bitgopsbt_get_input_kv: (a: number, b: number, c: number, d: number) => void;
@@ -90,8 +111,6 @@ export const fixedscriptwalletnamespace_output_script_with_network_str: (a: numb
 export const fixedscriptwalletnamespace_p2sh_p2pk_output_script: (a: number, b: number, c: number) => void;
 export const fixedscriptwalletnamespace_supports_script_type: (a: number, b: number, c: number, d: number, e: number) => void;
 export const fixedscriptwalletnamespace_to_wallet_keys: (a: number, b: number, c: number, d: number, e: number) => void;
-export const inscriptionsnamespace_create_inscription_reveal_data: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
-export const inscriptionsnamespace_sign_reveal_transaction: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: bigint) => void;
 export const wasmbip32_chain_code: (a: number) => number;
 export const wasmbip32_depth: (a: number) => number;
 export const wasmbip32_derive: (a: number, b: number, c: number) => void;
@@ -114,33 +133,19 @@ export const wasmbip32_private_key: (a: number) => number;
 export const wasmbip32_public_key: (a: number) => number;
 export const wasmbip32_to_base58: (a: number, b: number) => void;
 export const wasmbip32_to_wif: (a: number, b: number) => void;
+export const wasmreplayprotection_from_addresses: (a: number, b: number, c: number, d: number, e: number) => void;
+export const wasmreplayprotection_from_output_scripts: (a: number, b: number) => number;
+export const wasmreplayprotection_from_public_keys: (a: number, b: number, c: number) => void;
 export const wasmbip32_from_bip32_properties: (a: number, b: number) => void;
 export const bitgopsbt_sign_wallet_input: (a: number, b: number, c: number, d: number) => void;
 export const bitgopsbt_sign_all_with_xpriv: (a: number, b: number, c: number) => void;
 export const bitgopsbt_sign_replay_protection_inputs: (a: number, b: number, c: number) => void;
-export const __wbg_wrapdescriptor_free: (a: number, b: number) => void;
-export const __wbg_wrapminiscript_free: (a: number, b: number) => void;
-export const wrapdescriptor_atDerivationIndex: (a: number, b: number, c: number) => void;
-export const wrapdescriptor_descType: (a: number, b: number) => void;
-export const wrapdescriptor_encode: (a: number, b: number) => void;
-export const wrapdescriptor_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wrapdescriptor_fromStringDetectType: (a: number, b: number, c: number) => void;
-export const wrapdescriptor_hasWildcard: (a: number) => number;
-export const wrapdescriptor_maxWeightToSatisfy: (a: number, b: number) => void;
-export const wrapdescriptor_node: (a: number, b: number) => void;
-export const wrapdescriptor_scriptPubkey: (a: number, b: number) => void;
-export const wrapdescriptor_toAsmString: (a: number, b: number) => void;
-export const wrapdescriptor_toString: (a: number, b: number) => void;
-export const wrapminiscript_encode: (a: number, b: number) => void;
-export const wrapminiscript_fromBitcoinScript: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wrapminiscript_fromString: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wrapminiscript_node: (a: number, b: number) => void;
-export const wrapminiscript_toAsmString: (a: number, b: number) => void;
-export const wrapminiscript_toString: (a: number, b: number) => void;
+export const __wbg_inscriptionsnamespace_free: (a: number, b: number) => void;
 export const __wbg_messagenamespace_free: (a: number, b: number) => void;
 export const __wbg_wasmecpair_free: (a: number, b: number) => void;
-export const __wbg_wasmreplayprotection_free: (a: number, b: number) => void;
 export const __wbg_wasmrootwalletkeys_free: (a: number, b: number) => void;
+export const inscriptionsnamespace_create_inscription_reveal_data: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
+export const inscriptionsnamespace_sign_reveal_transaction: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: bigint) => void;
 export const messagenamespace_sign_message: (a: number, b: number, c: number, d: number) => void;
 export const messagenamespace_verify_message: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
 export const wasmecpair_from_private_key: (a: number, b: number, c: number) => void;
@@ -153,9 +158,6 @@ export const wasmecpair_public_key: (a: number) => number;
 export const wasmecpair_to_wif: (a: number, b: number) => void;
 export const wasmecpair_to_wif_mainnet: (a: number, b: number) => void;
 export const wasmecpair_to_wif_testnet: (a: number, b: number) => void;
-export const wasmreplayprotection_from_addresses: (a: number, b: number, c: number, d: number, e: number) => void;
-export const wasmreplayprotection_from_output_scripts: (a: number, b: number) => number;
-export const wasmreplayprotection_from_public_keys: (a: number, b: number, c: number) => void;
 export const wasmrootwalletkeys_backup_key: (a: number) => number;
 export const wasmrootwalletkeys_bitgo_key: (a: number) => number;
 export const wasmrootwalletkeys_new: (a: number, b: number, c: number, d: number) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitgo/wasm-utxo",
   "description": "WebAssembly wrapper for rust-bitcoin (beta)",
-  "version": "4.6.0",
+  "version": "4.8.0",
   "type": "module",
   "repository": {
     "type": "git",