@ledgerhq/hw-app-btc 10.5.0 → 10.6.0-next.0

package/lib-es/startUntrustedHashTransactionInput.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { createVarint } from "./varint";
 import { MAX_SCRIPT_BLOCK } from "./constants";
 export function startUntrustedHashTransactionInputRaw(transport, newTransaction, firstRound, transactionData, bip143 = false, overwinter = false, additionals = []) {
@@ -21,67 +12,65 @@ export function startUntrustedHashTransactionInputRaw(transport, newTransaction,
             : 0x00;
     return transport.send(0xe0, 0x44, firstRound ? 0x00 : 0x80, newTransaction ? p2 : 0x80, transactionData);
 }
-export function startUntrustedHashTransactionInput(transport_1, newTransaction_1, transaction_1, inputs_1) {
-    return __awaiter(this, arguments, void 0, function* (transport, newTransaction, transaction, inputs, bip143 = false, overwinter = false, additionals = [], useTrustedInputForSegwit = false) {
-        let data = Buffer.concat([
-            transaction.version,
-            transaction.timestamp || Buffer.alloc(0),
-            transaction.nVersionGroupId || Buffer.alloc(0),
-            createVarint(transaction.inputs.length),
-        ]);
-        yield startUntrustedHashTransactionInputRaw(transport, newTransaction, true, data, bip143, overwinter, additionals);
-        let i = 0;
-        const isDecred = additionals.includes("decred");
-        for (const input of transaction.inputs) {
-            let prefix;
-            const inputValue = inputs[i].value;
-            if (bip143) {
-                if (useTrustedInputForSegwit && inputs[i].trustedInput) {
-                    prefix = Buffer.from([0x01, inputValue.length]);
-                }
-                else {
-                    prefix = Buffer.from([0x02]);
-                }
+export async function startUntrustedHashTransactionInput(transport, newTransaction, transaction, inputs, bip143 = false, overwinter = false, additionals = [], useTrustedInputForSegwit = false) {
+    let data = Buffer.concat([
+        transaction.version,
+        transaction.timestamp || Buffer.alloc(0),
+        transaction.nVersionGroupId || Buffer.alloc(0),
+        createVarint(transaction.inputs.length),
+    ]);
+    await startUntrustedHashTransactionInputRaw(transport, newTransaction, true, data, bip143, overwinter, additionals);
+    let i = 0;
+    const isDecred = additionals.includes("decred");
+    for (const input of transaction.inputs) {
+        let prefix;
+        const inputValue = inputs[i].value;
+        if (bip143) {
+            if (useTrustedInputForSegwit && inputs[i].trustedInput) {
+                prefix = Buffer.from([0x01, inputValue.length]);
             }
             else {
-                if (inputs[i].trustedInput) {
-                    prefix = Buffer.from([0x01, inputs[i].value.length]);
-                }
-                else {
-                    prefix = Buffer.from([0x00]);
-                }
+                prefix = Buffer.from([0x02]);
             }
-            data = Buffer.concat([
-                prefix,
-                inputValue,
-                isDecred ? Buffer.from([0x00]) : Buffer.alloc(0),
-                createVarint(input.script.length),
-            ]);
-            yield startUntrustedHashTransactionInputRaw(transport, newTransaction, false, data, bip143, overwinter, additionals);
-            const scriptBlocks = [];
-            let offset = 0;
-            if (input.script.length === 0) {
-                scriptBlocks.push(input.sequence);
+        }
+        else {
+            if (inputs[i].trustedInput) {
+                prefix = Buffer.from([0x01, inputs[i].value.length]);
             }
             else {
-                while (offset !== input.script.length) {
-                    const blockSize = input.script.length - offset > MAX_SCRIPT_BLOCK
-                        ? MAX_SCRIPT_BLOCK
-                        : input.script.length - offset;
-                    if (offset + blockSize !== input.script.length) {
-                        scriptBlocks.push(input.script.slice(offset, offset + blockSize));
-                    }
-                    else {
-                        scriptBlocks.push(Buffer.concat([input.script.slice(offset, offset + blockSize), input.sequence]));
-                    }
-                    offset += blockSize;
-                }
+                prefix = Buffer.from([0x00]);
             }
-            for (const scriptBlock of scriptBlocks) {
-                yield startUntrustedHashTransactionInputRaw(transport, newTransaction, false, scriptBlock, bip143, overwinter, additionals);
+        }
+        data = Buffer.concat([
+            prefix,
+            inputValue,
+            isDecred ? Buffer.from([0x00]) : Buffer.alloc(0),
+            createVarint(input.script.length),
+        ]);
+        await startUntrustedHashTransactionInputRaw(transport, newTransaction, false, data, bip143, overwinter, additionals);
+        const scriptBlocks = [];
+        let offset = 0;
+        if (input.script.length === 0) {
+            scriptBlocks.push(input.sequence);
+        }
+        else {
+            while (offset !== input.script.length) {
+                const blockSize = input.script.length - offset > MAX_SCRIPT_BLOCK
+                    ? MAX_SCRIPT_BLOCK
+                    : input.script.length - offset;
+                if (offset + blockSize !== input.script.length) {
+                    scriptBlocks.push(input.script.slice(offset, offset + blockSize));
+                }
+                else {
+                    scriptBlocks.push(Buffer.concat([input.script.slice(offset, offset + blockSize), input.sequence]));
+                }
+                offset += blockSize;
             }
-            i++;
         }
-    });
+        for (const scriptBlock of scriptBlocks) {
+            await startUntrustedHashTransactionInputRaw(transport, newTransaction, false, scriptBlock, bip143, overwinter, additionals);
+        }
+        i++;
+    }
 }
 //# sourceMappingURL=startUntrustedHashTransactionInput.js.map

package/lib-es/startUntrustedHashTransactionInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"startUntrustedHashTransactionInput.js","sourceRoot":"","sources":["../src/startUntrustedHashTransactionInput.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"startUntrustedHashTransactionInput.js","sourceRoot":"","sources":["../src/startUntrustedHashTransactionInput.ts"],"names":[],"mappings":"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"}

package/lib-es/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 /**
  */
 export interface TransactionInput {

package/lib-es/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA;GACG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;GACG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;GACG;AACH,MAAM,WAAW,WAAW;IAG1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAG9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,eAAe,CAAC,EAAE,MAAM,CAAC;IAKzB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;AAAA;GACG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;GACG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;GACG;AACH,MAAM,WAAW,WAAW;IAG1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAG9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,eAAe,CAAC,EAAE,MAAM,CAAC;IAKzB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB"}

package/lib-es/varint.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function getVarint(data: Buffer, offset: number): [number, number];
 export declare function createVarint(value: number): Buffer;
 //# sourceMappingURL=varint.d.ts.map

package/lib-es/varint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"varint.d.ts","sourceRoot":"","sources":["../src/varint.ts"],"names":[],"mappings":";AAAA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAoBxE;AACD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAsBlD"}
+{"version":3,"file":"varint.d.ts","sourceRoot":"","sources":["../src/varint.ts"],"names":[],"mappings":";;AAAA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAoBxE;AACD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAsBlD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-btc",
-  "version": "10.5.0",
+  "version": "10.6.0-next.0",
   "description": "Ledger Hardware Wallet Bitcoin Application API",
   "keywords": [
     "Ledger",
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.10",
-    "@types/node": "^20.8.10",
+    "@types/node": "^22.10.10",
     "axios": "1.7.7",
     "documentation": "14.0.2",
     "jest": "^29.7.0",
@@ -89,10 +89,11 @@
   "gitHead": "dd0dea64b58e5a9125c8a422dcffd29e5ef6abec",
   "scripts": {
     "clean": "rimraf lib lib-es",
-    "build": "tsc && tsc -m ES6 --outDir lib-es",
+    "coverage": "jest --coverage --testPathIgnorePatterns='/.test.ts.disabled|node_modules|lib-es|lib/' --passWithNoTests && mv coverage/coverage-final.json coverage/coverage-hw-app-btc.json",
+    "build": "tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es",
     "prewatch": "pnpm build",
     "watch": "tsc --watch",
-    "watch:es": "tsc --watch -m ES6 --outDir lib-es",
+    "watch:es": "tsc --watch -m esnext --moduleResolution bundler --outDir lib-es",
     "doc": "documentation readme src/** --section=API --pe ts --re ts --re d.ts",
     "lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx --cache",
     "lint:fix": "pnpm lint --fix",

package/src/BtcNew.ts

@@ -349,7 +349,13 @@ export default class BtcNew {
   private async setInput(
     psbt: PsbtV2,
     i: number,
-    input: [Transaction, number, string | null | undefined, number | null | undefined],
+    input: [
+      Transaction,
+      number,
+      string | null | undefined,
+      number | null | undefined,
+      (number | null | undefined)?,
+    ],
     pathElements: number[],
     accountType: AccountType,
     masterFP: Buffer,

package/src/constants.ts

@@ -16,3 +16,6 @@ export const OP_EQUAL = 0x87;
 export const OP_EQUALVERIFY = 0x88;
 export const OP_CHECKSIG = 0xac;
 export const OP_RETURN = 0x6a;
+
+// https://zips.z.cash/zip-0253
+export const ZCASH_NU6_ACTIVATION_HEIGHT = 2726400;

package/src/createTransaction.ts

@@ -21,9 +21,11 @@ import {
   HASH_SIZE,
   OP_EQUALVERIFY,
   OP_CHECKSIG,
+  ZCASH_NU6_ACTIVATION_HEIGHT,
 } from "./constants";
 import { shouldUseTrustedInputForSegwit } from "./shouldUseTrustedInputForSegwit";
 export type { AddressFormat };
+
 const defaultsSignTransaction = {
   lockTime: DEFAULT_LOCKTIME,
   sigHashType: SIGHASH_ALL,
@@ -34,15 +36,67 @@ const defaultsSignTransaction = {
   onDeviceSignatureRequested: () => {},
 };
 
+const getZcashTransactionVersion = (blockHeight: number | null | undefined): Buffer => {
+  const version = Buffer.alloc(4);
+  if (blockHeight && blockHeight < ZCASH_NU6_ACTIVATION_HEIGHT) {
+    version.writeUInt32LE(0x80000005, 0);
+  } else {
+    // NOTE: null and undefined should default to latest version
+    version.writeUInt32LE(0x80000006, 0);
+  }
+  return version;
+};
+
+export const getDefaultVersions = ({
+  isZcash,
+  sapling,
+  isDecred,
+  expiryHeight,
+  blockHeight,
+}: {
+  isZcash: boolean;
+  sapling: boolean;
+  isDecred: boolean;
+  expiryHeight: Buffer | undefined;
+  blockHeight: number | undefined;
+}): { defaultVersion: Buffer; defaultVersionNu5Only: Buffer } => {
+  let defaultVersion = Buffer.alloc(4);
+  const defaultVersionNu5Only = Buffer.alloc(4);
+
+  if (!!expiryHeight && !isDecred) {
+    if (isZcash) {
+      defaultVersion = getZcashTransactionVersion(blockHeight);
+      defaultVersionNu5Only.writeUInt32LE(0x80000005, 0);
+    } else {
+      const version = sapling ? 0x80000004 : 0x80000003;
+      defaultVersion.writeUInt32LE(version, 0);
+      defaultVersionNu5Only.writeUInt32LE(version, 0);
+    }
+  } else {
+    defaultVersion.writeUInt32LE(1, 0);
+    defaultVersionNu5Only.writeUInt32LE(1, 0);
+  }
+  return { defaultVersion, defaultVersionNu5Only };
+};
+
 /**
  *
  */
 export type CreateTransactionArg = {
-  inputs: Array<[Transaction, number, string | null | undefined, number | null | undefined]>;
+  inputs: Array<
+    [
+      Transaction,
+      number,
+      string | null | undefined,
+      number | null | undefined,
+      (number | null | undefined)?,
+    ]
+  >;
   associatedKeysets: string[];
   changePath?: string;
   outputScriptHex: string;
   lockTime?: number;
+  blockHeight?: number;
   sigHashType?: number;
   segwit?: boolean;
   additionals: Array<string>;
@@ -60,6 +114,7 @@ export async function createTransaction(
   const {
     inputs,
     associatedKeysets,
+    blockHeight,
     changePath,
     outputScriptHex,
     lockTime,
@@ -121,10 +176,14 @@ export async function createTransaction(
   lockTimeBuffer.writeUInt32LE(lockTime, 0);
   const nullScript = Buffer.alloc(0);
   const nullPrevout = Buffer.alloc(0);
-  const defaultVersion = Buffer.alloc(4);
-  !!expiryHeight && !isDecred
-    ? defaultVersion.writeUInt32LE(isZcash ? 0x80000005 : sapling ? 0x80000004 : 0x80000003, 0) // v5 format for zcash refer to https://zips.z.cash/zip-0225
-    : defaultVersion.writeUInt32LE(1, 0);
+
+  const { defaultVersion, defaultVersionNu5Only } = getDefaultVersions({
+    isZcash,
+    sapling,
+    isDecred,
+    expiryHeight,
+    blockHeight,
+  });
   // Default version to 2 for XST not to have timestamp
   const trustedInputs: Array<any> = [];
   const regularOutputs: Array<TransactionOutput> = [];
@@ -144,6 +203,9 @@ export async function createTransaction(
   // first pass on inputs to get trusted inputs
   for (const input of inputs) {
     if (!resuming) {
+      if (isZcash) {
+        input[0].version = getZcashTransactionVersion(input[4]);
+      }
       const trustedInput = await getTrustedInputCall(transport, input[1], input[0], additionals);
       log("hw", "got trustedInput=" + trustedInput);
       const sequence = Buffer.alloc(4);
@@ -309,6 +371,7 @@ export async function createTransaction(
     }
   }
 
+  targetTransaction.version = defaultVersionNu5Only;
   // Populate the final input scripts
   for (let i = 0; i < inputs.length; i++) {
     if (segwit) {

package/tests/createTransaction.test.ts

@@ -0,0 +1,225 @@
+import { ZCASH_NU6_ACTIVATION_HEIGHT } from "../src/constants";
+import { getDefaultVersions } from "../src/createTransaction";
+import { openTransportReplayer, RecordStore } from "@ledgerhq/hw-transport-mocker";
+import Btc from "../src/Btc";
+
+describe("createTransaction", () => {
+  describe("createTransaction", () => {
+    test("zcash", async () => {
+      const transport = await openTransportReplayer(
+        RecordStore.fromString(`
+        => b001000000
+        <= 01055a6361736805322e332e3101029000
+        => e04200000d00000000050000800a27a72601
+        <= 9000
+        => e0428000251d73f1a467297aab205ee7a4ed506f28ea558056401b4f6d308016c1b58d27f4010000006a
+        <= 9000
+        => e0428000324730440220337050efe67689fdbdccd2058f6f7b7fe3b13070d91cd0d7ecb1f84e622a220b02201356d33259d64db1095879
+        <= 9000
+        => e042800032cfce666b016771cf4e239376497b7f82efedd9c54a01210396fcfd94e1bfb2949e0acbab934583c11ad29d14105d25528aff
+        <= 9000
+        => e04280000a75673c50650c00000000
+        <= 9000
+        => e04280000102
+        <= 9000
+        => e04280002250c30000000000001976a914de3542c396924ada3c5850225770f6dd3e2249b988ac
+        <= 9000
+        => e0428000223df2c202000000001976a914fc0da061ca85923e01d97ac276aa8dc890a28efa88ac
+        <= 9000
+        => e042800009000000000400000000
+        <= 3200ed40989caa0731d6526fe4e03d49c54720be148f911924129e15d7ecf6e190829edb0000000050c3000000000000d53c396d2f5c98619000
+        => e04200000d00000000060000800a27a72601
+        <= 9000
+        => e0428000258c63f70704d9987dafffc5481b171dee900e9b6d71261fee880543bc96c41d11000000006b
+        <= 9000
+        => e04280003248304502210098a92ce696ff51d46233885e5ea7d0bc0bcd04621c6d79e4230e579f9b13f1480220772d04b65133859ef7fb
+        <= 9000
+        => e042800032146a41080b1187335fed9daf62a237b6bd54657f555d0121039402a22682e936ab3c1e2f649859ba13b39a59bd74212ac903
+        <= 9000
+        => e04280000ba42b5aea50327900000000
+        <= 00009000
+        => e04280000102
+        <= 9000
+        => e042800022404b4c00000000001976a914c59ace9b52af703379f3f89ebbc8ec1813ca50ec88ac
+        <= 9000
+        => e0428000220e532a00000000001976a9144cd6509f71020b6a9e890bef43c4d5e61f9c0dad88ac
+        <= 9000
+        => e042800009000000000400000000
+        <= 320071857203407d7ff3f5832db7c37973ac01569a832cd78a6dbd3627e4f9ee7458532200000000404b4c0000000000aa2ea74bcab3a20a9000
+
+        => e04000000d03800000000000000000000000
+        <= 9000
+        => e04000000100
+        <= 9000
+        => e0440000050100000002
+        <= 9000
+
+        => e04480003b01383200ed40989caa0731d6526fe4e03d49c54720be148f911924129e15d7ecf6e190829edb0000000050c3000000000000d53c396d2f5c986119
+        <= 9000
+        => e04480001d76a914de3542c396924ada3c5850225770f6dd3e2249b988ac00000000
+        <= 009000
+        => e04480003b0138320071857203407d7ff3f5832db7c37973ac01569a832cd78a6dbd3627e4f9ee7458532200000000404b4c0000000000aa2ea74bcab3a20a19
+        <= 00009000
+
+        => e04480001d76a914c59ace9b52af703379f3f89ebbc8ec1813ca50ec88ac00000000
+        <= 00009000
+
+        => e04a0000320210270000000000001976a9140fef7d9e0afcc8e198ac049945b6499b6fe7aef288ac1a314700000000001976a914d83e71
+        <= 00009000
+
+        => e04a800013f7a39b28a617c7bcedbd925c2a621952b288ac
+        <= 00009000
+
+        => e04800001303800000000000000000000000000000000001
+        <= 00009000
+
+
+        => e0440080050100000002
+        <= 9000
+
+        => e04480803b01383200ed40989caa0731d6526fe4e03d49c54720be148f911924129e15d7ecf6e190829edb0000000050c3000000000000d53c396d2f5c986100
+        <= 9000
+        => e04480800400000000
+        <= 9000
+
+        => e04480803b0138320071857203407d7ff3f5832db7c37973ac01569a832cd78a6dbd3627e4f9ee7458532200000000404b4c0000000000aa2ea74bcab3a20a19
+        <= 9000
+
+        => e04480801d76a914c59ace9b52af703379f3f89ebbc8ec1813ca50ec88ac00000000
+        <= 314402200e4952c0763be7e81f342e80042ea0858911aa3c460b90698195f014ddc8bf120220723b14f186ad7a66829982f00210e8ae6289284a146ed90b706d9e0e3313ae12019000
+
+        => e04a0000320210270000000000001976a9140fef7d9e0afcc8e198ac049945b6499b6fe7aef288ac1a314700000000001976a914d83e71
+        <= 9000
+        => e04a800013f7a39b28a617c7bcedbd925c2a621952b288ac
+        <= 9000
+
+        => e04800000700000000000001
+        <= 9000
+
+        => e04800001f058000002c8000008580000001000000000000000a00000000000100000000
+        <= 3045022100fd7bcbec98aaa7768774db3a289e07d951a727cb65b6fbfb48e23c745c3a7d16022046f2246519789af567d970b396c9c8c5c462e5a13709ea93481b512479bdf2b3019000
+        `),
+      );
+      /*
+
+splitTransaction 050000800a27a726b4d0d6c20000000000000000011d73f1a467297aab205ee7a4ed506f28ea558056401b4f6d308016c1b58d27f4010000006a4730440220337050efe67689fdbdccd2058f6f7b7fe3b13070d91cd0d7ecb1f84e622a220b02201356d33259d64db1095879cfce666b016771cf4e239376497b7f82efedd9c54a01210396fcfd94e1bfb2949e0acbab934583c11ad29d14105d25528aff75673c50650c000000000250c30000000000001976a914de3542c396924ada3c5850225770f6dd3e2249b988ac3df2c202000000001976a914fc0da061ca85923e01d97ac276aa8dc890a28efa88ac000000:
+TX version 05000080 locktime 00000000 timestamp  nVersionGroupId 0a27a726 nExpiryHeight 00000000 extraData 
+input 0: prevout 1d73f1a467297aab205ee7a4ed506f28ea558056401b4f6d308016c1b58d27f401000000 script 4730440220337050efe67689fdbdccd2058f6f7b7fe3b13070d91cd0d7ecb1f84e622a220b02201356d33259d64db1095879cfce666b016771cf4e239376497b7f82efedd9c54a01210396fcfd94e1bfb2949e0acbab934583c11ad29d14105d25528aff75673c50650c sequence 00000000
+output 0: amount 50c3000000000000 script 76a914de3542c396924ada3c5850225770f6dd3e2249b988ac
+output 1: amount 3df2c20200000000 script 76a914fc0da061ca85923e01d97ac276aa8dc890a28efa88ac
+      */
+      // This test covers the old bitcoin Nano app 1.6 API, before the breaking changes that occurred in v2.1.0 of the app
+      const btc = new Btc({ transport, currency: "zcash" });
+      const tx1 = btc.splitTransaction(
+        "050000800a27a726b4d0d6c20000000000000000011d73f1a467297aab205ee7a4ed506f28ea558056401b4f6d308016c1b58d27f4010000006a4730440220337050efe67689fdbdccd2058f6f7b7fe3b13070d91cd0d7ecb1f84e622a220b02201356d33259d64db1095879cfce666b016771cf4e239376497b7f82efedd9c54a01210396fcfd94e1bfb2949e0acbab934583c11ad29d14105d25528aff75673c50650c000000000250c30000000000001976a914de3542c396924ada3c5850225770f6dd3e2249b988ac3df2c202000000001976a914fc0da061ca85923e01d97ac276aa8dc890a28efa88ac000000",
+        true,
+        true,
+        ["zcash", "sapling"],
+      );
+      /*
+       splitTransaction 050000800a27a7265510e7c80000000000000000018c63f70704d9987dafffc5481b171dee900e9b6d71261fee880543bc96c41d11000000006b48304502210098a92ce696ff51d46233885e5ea7d0bc0bcd04621c6d79e4230e579f9b13f1480220772d04b65133859ef7fb146a41080b1187335fed9daf62a237b6bd54657f555d0121039402a22682e936ab3c1e2f649859ba13b39a59bd74212ac903a42b5aea5032790000000002404b4c00000000001976a914c59ace9b52af703379f3f89ebbc8ec1813ca50ec88ac0e532a00000000001976a9144cd6509f71020b6a9e890bef43c4d5e61f9c0dad88ac000000:
+TX version 05000080 locktime 00000000 timestamp  nVersionGroupId 0a27a726 nExpiryHeight 00000000 extraData 
+input 0: prevout 8c63f70704d9987dafffc5481b171dee900e9b6d71261fee880543bc96c41d1100000000 script 48304502210098a92ce696ff51d46233885e5ea7d0bc0bcd04621c6d79e4230e579f9b13f1480220772d04b65133859ef7fb146a41080b1187335fed9daf62a237b6bd54657f555d0121039402a22682e936ab3c1e2f649859ba13b39a59bd74212ac903a42b5aea503279 sequence 00000000
+output 0: amount 404b4c0000000000 script 76a914c59ace9b52af703379f3f89ebbc8ec1813ca50ec88ac
+output 1: amount 0e532a0000000000 script 76a9144cd6509f71020b6a9e890bef43c4d5e61f9c0dad88ac
+      */
+      const tx2 = btc.splitTransaction(
+        "050000800a27a7265510e7c80000000000000000018c63f70704d9987dafffc5481b171dee900e9b6d71261fee880543bc96c41d11000000006b48304502210098a92ce696ff51d46233885e5ea7d0bc0bcd04621c6d79e4230e579f9b13f1480220772d04b65133859ef7fb146a41080b1187335fed9daf62a237b6bd54657f555d0121039402a22682e936ab3c1e2f649859ba13b39a59bd74212ac903a42b5aea5032790000000002404b4c00000000001976a914c59ace9b52af703379f3f89ebbc8ec1813ca50ec88ac0e532a00000000001976a9144cd6509f71020b6a9e890bef43c4d5e61f9c0dad88ac000000",
+        true,
+        true,
+        ["zcash", "sapling"],
+      );
+      const result = await btc.createPaymentTransaction({
+        inputs: [
+          [tx1, 0, null, 0, 1806010],
+          [tx2, 0, null, 0, 2733284],
+        ],
+        associatedKeysets: ["0'/0/0"],
+        changePath: undefined,
+        blockHeight: 2812009,
+        sigHashType: 1,
+        outputScriptHex:
+          "0210270000000000001976a9140fef7d9e0afcc8e198ac049945b6499b6fe7aef288ac1a314700000000001976a914d83e71f7a39b28a617c7bcedbd925c2a621952b288ac",
+        additionals: ["zcash", "sapling"],
+      });
+      expect(result).toEqual(
+        "010000005510e7c8000000000000000002989caa0731d6526fe4e03d49c54720be148f911924129e15d7ecf6e190829edb00000000050230000102000000007203407d7ff3f5832db7c37973ac01569a832cd78a6dbd3627e4f9ee745853220000000003000102000000000210270000000000001976a9140fef7d9e0afcc8e198ac049945b6499b6fe7aef288ac1a314700000000001976a914d83e71f7a39b28a617c7bcedbd925c2a621952b288ac000000",
+      );
+    });
+  });
+  describe("getDefaultVersions", () => {
+    it("should return default versions for non-Zcash and non-Decred with no expiryHeight", () => {
+      const result = getDefaultVersions({
+        isZcash: false,
+        sapling: false,
+        isDecred: false,
+        expiryHeight: undefined,
+        blockHeight: undefined,
+      });
+      expect(result.defaultVersion.readUInt32LE(0)).toBe(1);
+      expect(result.defaultVersionNu5Only.readUInt32LE(0)).toBe(1);
+    });
+
+    it("should return Zcash versions with expiryHeight and blockHeight below activation height", () => {
+      const result = getDefaultVersions({
+        isZcash: true,
+        sapling: false,
+        isDecred: false,
+        expiryHeight: Buffer.alloc(4),
+        blockHeight: 1000,
+      });
+      expect(result.defaultVersion.readUInt32LE(0)).toBe(0x80000005);
+      expect(result.defaultVersionNu5Only.readUInt32LE(0)).toBe(0x80000005);
+    });
+
+    it("should return Zcash versions with expiryHeight and blockHeight above activation height", () => {
+      const blockHeight = 3_000_000;
+      expect(blockHeight > ZCASH_NU6_ACTIVATION_HEIGHT).toBe(true);
+      const result = getDefaultVersions({
+        isZcash: true,
+        sapling: false,
+        isDecred: false,
+        expiryHeight: Buffer.alloc(4),
+        blockHeight: blockHeight,
+      });
+      expect(result.defaultVersion.readUInt32LE(0)).toBe(0x80000006);
+      expect(result.defaultVersionNu5Only.readUInt32LE(0)).toBe(0x80000005);
+    });
+
+    it("should return Sapling versions with expiryHeight", () => {
+      const result = getDefaultVersions({
+        isZcash: false,
+        sapling: true,
+        isDecred: false,
+        expiryHeight: Buffer.alloc(4),
+        blockHeight: undefined,
+      });
+      expect(result.defaultVersion.readUInt32LE(0)).toBe(0x80000004);
+      expect(result.defaultVersionNu5Only.readUInt32LE(0)).toBe(0x80000004);
+    });
+
+    it("should return non-Sapling versions with expiryHeight", () => {
+      const result = getDefaultVersions({
+        isZcash: false,
+        sapling: false,
+        isDecred: false,
+        expiryHeight: Buffer.alloc(4),
+        blockHeight: undefined,
+      });
+      expect(result.defaultVersion.readUInt32LE(0)).toBe(0x80000003);
+      expect(result.defaultVersionNu5Only.readUInt32LE(0)).toBe(0x80000003);
+    });
+
+    it("should return default versions for Decred with expiryHeight", () => {
+      const result = getDefaultVersions({
+        isZcash: false,
+        sapling: false,
+        isDecred: true,
+        expiryHeight: Buffer.alloc(4),
+        blockHeight: undefined,
+      });
+      expect(result.defaultVersion.readUInt32LE(0)).toBe(1);
+      expect(result.defaultVersionNu5Only.readUInt32LE(0)).toBe(1);
+    });
+  });
+});