@ledgerhq/hw-app-btc 6.9.1-taproot.0 → 6.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (133) hide show
  1. package/README.md +602 -107
  2. package/lib/Btc.d.ts +11 -7
  3. package/lib/Btc.d.ts.map +1 -1
  4. package/lib/Btc.js +113 -31
  5. package/lib/Btc.js.map +1 -1
  6. package/lib/BtcNew.d.ts +81 -32
  7. package/lib/BtcNew.d.ts.map +1 -1
  8. package/lib/BtcNew.js +296 -99
  9. package/lib/BtcNew.js.map +1 -1
  10. package/lib/BtcOld.d.ts +3 -1
  11. package/lib/BtcOld.d.ts.map +1 -1
  12. package/lib/BtcOld.js +22 -6
  13. package/lib/BtcOld.js.map +1 -1
  14. package/lib/constants.d.ts +1 -0
  15. package/lib/constants.d.ts.map +1 -1
  16. package/lib/constants.js +2 -1
  17. package/lib/constants.js.map +1 -1
  18. package/lib/getAppAndVersion.d.ts +3 -2
  19. package/lib/getAppAndVersion.d.ts.map +1 -1
  20. package/lib/getAppAndVersion.js.map +1 -1
  21. package/lib/newops/appClient.d.ts +6 -2
  22. package/lib/newops/appClient.d.ts.map +1 -1
  23. package/lib/newops/appClient.js +9 -5
  24. package/lib/newops/appClient.js.map +1 -1
  25. package/lib/newops/clientCommands.d.ts +18 -2
  26. package/lib/newops/clientCommands.d.ts.map +1 -1
  27. package/lib/newops/clientCommands.js +20 -3
  28. package/lib/newops/clientCommands.js.map +1 -1
  29. package/lib/newops/merkelizedPsbt.d.ts +11 -0
  30. package/lib/newops/merkelizedPsbt.d.ts.map +1 -1
  31. package/lib/newops/merkelizedPsbt.js +11 -0
  32. package/lib/newops/merkelizedPsbt.js.map +1 -1
  33. package/lib/newops/merkle.d.ts +5 -0
  34. package/lib/newops/merkle.d.ts.map +1 -1
  35. package/lib/newops/merkle.js +5 -0
  36. package/lib/newops/merkle.js.map +1 -1
  37. package/lib/newops/merkleMap.d.ts +10 -0
  38. package/lib/newops/merkleMap.d.ts.map +1 -1
  39. package/lib/newops/merkleMap.js +10 -0
  40. package/lib/newops/merkleMap.js.map +1 -1
  41. package/lib/newops/policy.d.ts +8 -0
  42. package/lib/newops/policy.d.ts.map +1 -1
  43. package/lib/newops/policy.js +9 -1
  44. package/lib/newops/policy.js.map +1 -1
  45. package/lib/newops/psbtExtractor.d.ts +6 -0
  46. package/lib/newops/psbtExtractor.d.ts.map +1 -1
  47. package/lib/newops/psbtExtractor.js +6 -0
  48. package/lib/newops/psbtExtractor.js.map +1 -1
  49. package/lib/newops/psbtFinalizer.d.ts +11 -1
  50. package/lib/newops/psbtFinalizer.d.ts.map +1 -1
  51. package/lib/newops/psbtFinalizer.js +28 -4
  52. package/lib/newops/psbtFinalizer.js.map +1 -1
  53. package/lib/newops/psbtv2.d.ts +22 -2
  54. package/lib/newops/psbtv2.d.ts.map +1 -1
  55. package/lib/newops/psbtv2.js +37 -8
  56. package/lib/newops/psbtv2.js.map +1 -1
  57. package/lib-es/Btc.d.ts +11 -7
  58. package/lib-es/Btc.d.ts.map +1 -1
  59. package/lib-es/Btc.js +94 -31
  60. package/lib-es/Btc.js.map +1 -1
  61. package/lib-es/BtcNew.d.ts +81 -32
  62. package/lib-es/BtcNew.d.ts.map +1 -1
  63. package/lib-es/BtcNew.js +293 -101
  64. package/lib-es/BtcNew.js.map +1 -1
  65. package/lib-es/BtcOld.d.ts +3 -1
  66. package/lib-es/BtcOld.d.ts.map +1 -1
  67. package/lib-es/BtcOld.js +22 -6
  68. package/lib-es/BtcOld.js.map +1 -1
  69. package/lib-es/constants.d.ts +1 -0
  70. package/lib-es/constants.d.ts.map +1 -1
  71. package/lib-es/constants.js +1 -0
  72. package/lib-es/constants.js.map +1 -1
  73. package/lib-es/getAppAndVersion.d.ts +3 -2
  74. package/lib-es/getAppAndVersion.d.ts.map +1 -1
  75. package/lib-es/getAppAndVersion.js.map +1 -1
  76. package/lib-es/newops/appClient.d.ts +6 -2
  77. package/lib-es/newops/appClient.d.ts.map +1 -1
  78. package/lib-es/newops/appClient.js +9 -5
  79. package/lib-es/newops/appClient.js.map +1 -1
  80. package/lib-es/newops/clientCommands.d.ts +18 -2
  81. package/lib-es/newops/clientCommands.d.ts.map +1 -1
  82. package/lib-es/newops/clientCommands.js +20 -3
  83. package/lib-es/newops/clientCommands.js.map +1 -1
  84. package/lib-es/newops/merkelizedPsbt.d.ts +11 -0
  85. package/lib-es/newops/merkelizedPsbt.d.ts.map +1 -1
  86. package/lib-es/newops/merkelizedPsbt.js +11 -0
  87. package/lib-es/newops/merkelizedPsbt.js.map +1 -1
  88. package/lib-es/newops/merkle.d.ts +5 -0
  89. package/lib-es/newops/merkle.d.ts.map +1 -1
  90. package/lib-es/newops/merkle.js +5 -0
  91. package/lib-es/newops/merkle.js.map +1 -1
  92. package/lib-es/newops/merkleMap.d.ts +10 -0
  93. package/lib-es/newops/merkleMap.d.ts.map +1 -1
  94. package/lib-es/newops/merkleMap.js +10 -0
  95. package/lib-es/newops/merkleMap.js.map +1 -1
  96. package/lib-es/newops/policy.d.ts +8 -0
  97. package/lib-es/newops/policy.d.ts.map +1 -1
  98. package/lib-es/newops/policy.js +10 -2
  99. package/lib-es/newops/policy.js.map +1 -1
  100. package/lib-es/newops/psbtExtractor.d.ts +6 -0
  101. package/lib-es/newops/psbtExtractor.d.ts.map +1 -1
  102. package/lib-es/newops/psbtExtractor.js +6 -0
  103. package/lib-es/newops/psbtExtractor.js.map +1 -1
  104. package/lib-es/newops/psbtFinalizer.d.ts +11 -1
  105. package/lib-es/newops/psbtFinalizer.d.ts.map +1 -1
  106. package/lib-es/newops/psbtFinalizer.js +28 -4
  107. package/lib-es/newops/psbtFinalizer.js.map +1 -1
  108. package/lib-es/newops/psbtv2.d.ts +22 -2
  109. package/lib-es/newops/psbtv2.d.ts.map +1 -1
  110. package/lib-es/newops/psbtv2.js +37 -8
  111. package/lib-es/newops/psbtv2.js.map +1 -1
  112. package/package.json +4 -4
  113. package/src/Btc.ts +92 -21
  114. package/src/BtcNew.ts +295 -77
  115. package/src/BtcOld.ts +13 -9
  116. package/src/bip32.ts +1 -1
  117. package/src/constants.ts +1 -0
  118. package/src/getAppAndVersion.ts +7 -4
  119. package/src/newops/appClient.ts +13 -5
  120. package/src/newops/clientCommands.ts +19 -3
  121. package/src/newops/merkelizedPsbt.ts +11 -0
  122. package/src/newops/merkle.ts +5 -0
  123. package/src/newops/merkleMap.ts +10 -0
  124. package/src/newops/policy.ts +10 -2
  125. package/src/newops/psbtExtractor.ts +6 -0
  126. package/src/newops/psbtFinalizer.ts +28 -4
  127. package/src/newops/psbtv2.ts +38 -14
  128. package/tests/Btc.integration.test.ts +125 -15
  129. package/tests/Btc.test.ts +83 -0
  130. package/tests/newops/BtcNew.test.ts +75 -508
  131. package/tests/newops/integrationtools.ts +174 -0
  132. package/tests/newops/testtx.ts +676 -0
  133. package/tests/speculosclient.ts +47 -0
@@ -23,6 +23,10 @@ enum FrameworkIns {
23
23
  CONTINUE_INTERRUPTED = 0x01,
24
24
  }
25
25
 
26
+ /**
27
+ * This class encapsulates the APDU protocol documented at
28
+ * https://github.com/LedgerHQ/app-bitcoin-new/blob/master/doc/bitcoin.md
29
+ */
26
30
  export class AppClient {
27
31
  transport: Transport;
28
32
 
@@ -59,7 +63,10 @@ export class AppClient {
59
63
  return response.slice(0, -2); // drop the status word (can only be 0x9000 at this point)
60
64
  }
61
65
 
62
- async getPubkey(display: boolean, pathElements: number[]): Promise<string> {
66
+ async getExtendedPubkey(
67
+ display: boolean,
68
+ pathElements: number[]
69
+ ): Promise<string> {
63
70
  if (pathElements.length > 6) {
64
71
  throw new Error("Path too long. At most 6 levels allowed.");
65
72
  }
@@ -89,7 +96,7 @@ export class AppClient {
89
96
  throw new Error("Invalid HMAC length");
90
97
  }
91
98
 
92
- const clientInterpreter = new ClientCommandInterpreter();
99
+ const clientInterpreter = new ClientCommandInterpreter(() => {});
93
100
  clientInterpreter.addKnownList(
94
101
  walletPolicy.keys.map((k) => Buffer.from(k, "ascii"))
95
102
  );
@@ -116,7 +123,8 @@ export class AppClient {
116
123
  async signPsbt(
117
124
  psbt: PsbtV2,
118
125
  walletPolicy: WalletPolicy,
119
- walletHMAC: Buffer | null
126
+ walletHMAC: Buffer | null,
127
+ progressCallback: () => void
120
128
  ): Promise<Map<number, Buffer>> {
121
129
  const merkelizedPsbt = new MerkelizedPsbt(psbt);
122
130
 
@@ -124,7 +132,7 @@ export class AppClient {
124
132
  throw new Error("Invalid HMAC length");
125
133
  }
126
134
 
127
- const clientInterpreter = new ClientCommandInterpreter();
135
+ const clientInterpreter = new ClientCommandInterpreter(progressCallback);
128
136
 
129
137
  // prepare ClientCommandInterpreter
130
138
  clientInterpreter.addKnownList(
@@ -167,7 +175,7 @@ export class AppClient {
167
175
 
168
176
  const ret: Map<number, Buffer> = new Map();
169
177
  for (const inputAndSig of yielded) {
170
- ret[inputAndSig[0]] = inputAndSig.slice(1);
178
+ ret.set(inputAndSig[0], inputAndSig.slice(1));
171
179
  }
172
180
  return ret;
173
181
  }
@@ -21,13 +21,14 @@ export class YieldCommand extends ClientCommand {
21
21
 
22
22
  code = ClientCommandCode.YIELD;
23
23
 
24
- constructor(results: Buffer[]) {
24
+ constructor(results: Buffer[], private progressCallback: () => void) {
25
25
  super();
26
26
  this.results = results;
27
27
  }
28
28
 
29
29
  execute(request: Buffer): Buffer {
30
30
  this.results.push(Buffer.from(request.subarray(1)));
31
+ this.progressCallback();
31
32
  return Buffer.from("");
32
33
  }
33
34
  }
@@ -247,6 +248,21 @@ export class GetMoreElementsCommand extends ClientCommand {
247
248
  }
248
249
  }
249
250
 
251
+ /**
252
+ * This class will dispatch a client command coming from the hardware device to
253
+ * the appropriate client command implementation. Those client commands
254
+ * typically requests data from a merkle tree or merkelized maps.
255
+ *
256
+ * A ClientCommandInterpreter is prepared by adding the merkle trees and
257
+ * merkelized maps it should be able to serve to the hardware device. This class
258
+ * doesn't know anything about the semantics of the data it holds, it just
259
+ * serves merkle data. It doesn't even know in what context it is being
260
+ * executed, ie SignPsbt, getWalletAddress, etc.
261
+ *
262
+ * If the command yelds results to the client, as signPsbt does, the yielded
263
+ * data will be accessible after the command completed by calling getYielded(),
264
+ * which will return the yields in the same order as they came in.
265
+ */
250
266
  export class ClientCommandInterpreter {
251
267
  private roots: Map<string, Merkle> = new Map();
252
268
  private preimages: Map<string, Buffer> = new Map();
@@ -257,9 +273,9 @@ export class ClientCommandInterpreter {
257
273
 
258
274
  private commands: Map<ClientCommandCode, ClientCommand> = new Map();
259
275
 
260
- constructor() {
276
+ constructor(progressCallback: () => void) {
261
277
  const commands = [
262
- new YieldCommand(this.yielded),
278
+ new YieldCommand(this.yielded, progressCallback),
263
279
  new GetPreimageCommand(this.preimages, this.queue),
264
280
  new GetMerkleLeafIndexCommand(this.roots),
265
281
  new GetMerkleLeafProofCommand(this.roots, this.queue),
@@ -1,6 +1,17 @@
1
1
  import { MerkleMap } from "./merkleMap";
2
2
  import { PsbtV2 } from "./psbtv2";
3
3
 
4
+ /**
5
+ * This class merkelizes a PSBTv2, by merkelizing the different
6
+ * maps of the psbt. This is used during the transaction signing process,
7
+ * where the hardware app can request specific parts of the psbt from the
8
+ * client code and be sure that the response data actually belong to the psbt.
9
+ * The reason for this is the limited amount of memory available to the app,
10
+ * so it can't always store the full psbt in memory.
11
+ *
12
+ * The signing process is documented at
13
+ * https://github.com/LedgerHQ/app-bitcoin-new/blob/master/doc/bitcoin.md#sign_psbt
14
+ */
4
15
  export class MerkelizedPsbt extends PsbtV2 {
5
16
  public globalMerkleMap: MerkleMap;
6
17
  public inputMerkleMaps: MerkleMap[] = [];
@@ -1,5 +1,10 @@
1
1
  import { crypto } from "bitcoinjs-lib";
2
2
 
3
+ /**
4
+ * This class implements the merkle tree used by Ledger Bitcoin app v2+,
5
+ * which is documented at
6
+ * https://github.com/LedgerHQ/app-bitcoin-new/blob/master/doc/merkle.md
7
+ */
3
8
  export class Merkle {
4
9
  private leaves: Buffer[];
5
10
  private rootNode: Node;
@@ -1,6 +1,16 @@
1
1
  import { createVarint } from "../varint";
2
2
  import { hashLeaf, Merkle } from "./merkle";
3
3
 
4
+ /**
5
+ * This implements "Merkelized Maps", documented at
6
+ * https://github.com/LedgerHQ/app-bitcoin-new/blob/master/doc/merkle.md#merkleized-maps
7
+ *
8
+ * A merkelized map consist of two merkle trees, one for the keys of
9
+ * a map and one for the values of the same map, thus the two merkle
10
+ * trees have the same shape. The commitment is the number elements
11
+ * in the map followed by the keys' merkle root followed by the
12
+ * values' merkle root.
13
+ */
4
14
  export class MerkleMap {
5
15
  keys: Buffer[];
6
16
  keysTree: Merkle;
@@ -1,7 +1,7 @@
1
+ import { crypto } from "bitcoinjs-lib";
1
2
  import { pathArrayToString } from "../bip32";
2
3
  import { BufferWriter } from "../buffertools";
3
- import { crypto } from "bitcoinjs-lib";
4
- import { Merkle, hashLeaf } from "./merkle";
4
+ import { hashLeaf, Merkle } from "./merkle";
5
5
 
6
6
  export type DefaultDescriptorTemplate =
7
7
  | "pkh(@0)"
@@ -9,6 +9,14 @@ export type DefaultDescriptorTemplate =
9
9
  | "wpkh(@0)"
10
10
  | "tr(@0)";
11
11
 
12
+ /**
13
+ * The Bitcon hardware app uses a descriptors-like thing to describe
14
+ * how to construct output scripts from keys. A "Wallet Policy" consists
15
+ * of a "Descriptor Template" and a list of "keys". A key is basically
16
+ * a serialized BIP32 extended public key with some added derivation path
17
+ * information. This is documented at
18
+ * https://github.com/LedgerHQ/app-bitcoin-new/blob/master/doc/wallet.md
19
+ */
12
20
  export class WalletPolicy {
13
21
  descriptorTemplate: string;
14
22
  keys: string[];
@@ -1,6 +1,12 @@
1
1
  import { BufferWriter } from "../buffertools";
2
2
  import { PsbtV2 } from "./psbtv2";
3
3
 
4
+ /**
5
+ * This implements the "Transaction Extractor" role of BIP370 (PSBTv2
6
+ * https://github.com/bitcoin/bips/blob/master/bip-0370.mediawiki#transaction-extractor). However
7
+ * the role is partially documented in BIP174 (PSBTv0
8
+ * https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki#transaction-extractor).
9
+ */
4
10
  export function extract(psbt: PsbtV2): Buffer {
5
11
  const tx = new BufferWriter();
6
12
  tx.writeUInt32(psbt.getGlobalTxVersion());
@@ -2,8 +2,18 @@ import { BufferWriter } from "../buffertools";
2
2
  import { psbtIn, PsbtV2 } from "./psbtv2";
3
3
 
4
4
  /**
5
+ * This roughly implements the "input finalizer" role of BIP370 (PSBTv2
6
+ * https://github.com/bitcoin/bips/blob/master/bip-0370.mediawiki). However
7
+ * the role is documented in BIP174 (PSBTv0
8
+ * https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki).
5
9
  *
6
- * @param psbt The psbt with all signatures added as partial sigs, either through PSBT_IN_PARTIAL_SIG or PSBT_IN_TAP_KEY_SIG
10
+ * Verify that all inputs have a signature, and set inputFinalScriptwitness
11
+ * and/or inputFinalScriptSig depending on the type of the spent outputs. Clean
12
+ * fields that aren't useful anymore, partial signatures, redeem script and
13
+ * derivation paths.
14
+ *
15
+ * @param psbt The psbt with all signatures added as partial sigs, either
16
+ * through PSBT_IN_PARTIAL_SIG or PSBT_IN_TAP_KEY_SIG
7
17
  */
8
18
  export function finalize(psbt: PsbtV2): void {
9
19
  // First check that each input has a signature
@@ -63,19 +73,25 @@ export function finalize(psbt: PsbtV2): void {
63
73
  if (!signature) {
64
74
  throw Error("No taproot signature found");
65
75
  }
66
- if (signature.length != 64) {
76
+ if (signature.length != 64 && signature.length != 65) {
67
77
  throw Error("Unexpected length of schnorr signature.");
68
78
  }
69
79
  const witnessBuf = new BufferWriter();
70
80
  witnessBuf.writeVarInt(1);
71
- witnessBuf.writeVarInt(64);
72
- witnessBuf.writeSlice(signature);
81
+ witnessBuf.writeVarSlice(signature);
73
82
  psbt.setInputFinalScriptwitness(i, witnessBuf.buffer());
74
83
  }
75
84
  clearFinalizedInput(psbt, i);
76
85
  }
77
86
  }
78
87
 
88
+ /**
89
+ * Deletes fields that are no longer neccesary from the psbt.
90
+ *
91
+ * Note, the spec doesn't say anything about removing ouput fields
92
+ * like PSBT_OUT_BIP32_DERIVATION_PATH and others, so we keep them
93
+ * without actually knowing why. I think we should remove them too.
94
+ */
79
95
  function clearFinalizedInput(psbt: PsbtV2, inputIndex: number) {
80
96
  const keyTypes = [
81
97
  psbtIn.BIP32_DERIVATION,
@@ -94,6 +110,14 @@ function clearFinalizedInput(psbt: PsbtV2, inputIndex: number) {
94
110
  psbt.deleteInputEntries(inputIndex, keyTypes);
95
111
  }
96
112
 
113
+ /**
114
+ * Writes a script push operation to buf, which looks different
115
+ * depending on the size of the data. See
116
+ * https://en.bitcoin.it/wiki/Script#Constants
117
+ *
118
+ * @param buf the BufferWriter to write to
119
+ * @param data the Buffer to be pushed.
120
+ */
97
121
  function writePush(buf: BufferWriter, data: Buffer) {
98
122
  if (data.length <= 75) {
99
123
  buf.writeUInt8(data.length);
@@ -14,6 +14,7 @@ export enum psbtIn {
14
14
  NON_WITNESS_UTXO = 0x00,
15
15
  WITNESS_UTXO = 0x01,
16
16
  PARTIAL_SIG = 0x02,
17
+ SIGHASH_TYPE = 0x03,
17
18
  REDEEM_SCRIPT = 0x04,
18
19
  BIP32_DERIVATION = 0x06,
19
20
  FINAL_SCRIPTSIG = 0x07,
@@ -36,6 +37,24 @@ const PSBT_MAGIC_BYTES = Buffer.of(0x70, 0x73, 0x62, 0x74, 0xff);
36
37
 
37
38
  export class NoSuchEntry extends Error {}
38
39
 
40
+ /**
41
+ * Implements Partially Signed Bitcoin Transaction version 2, BIP370, as
42
+ * documented at https://github.com/bitcoin/bips/blob/master/bip-0370.mediawiki
43
+ * and https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki
44
+ *
45
+ * A psbt is a data structure that can carry all relevant information about a
46
+ * transaction through all stages of the signing process. From constructing an
47
+ * unsigned transaction to extracting the final serialized transaction ready for
48
+ * broadcast.
49
+ *
50
+ * This implementation is limited to what's needed in ledgerjs to carry out its
51
+ * duties, which means that support for features like multisig or taproot script
52
+ * path spending are not implemented. Specifically, it supports p2pkh,
53
+ * p2wpkhWrappedInP2sh, p2wpkh and p2tr key path spending.
54
+ *
55
+ * This class is made purposefully dumb, so it's easy to add support for
56
+ * complemantary fields as needed in the future.
57
+ */
39
58
  export class PsbtV2 {
40
59
  protected globalMap: Map<string, Buffer> = new Map();
41
60
  protected inputMaps: Map<string, Buffer>[] = [];
@@ -110,6 +129,14 @@ export class PsbtV2 {
110
129
  getInputPartialSig(inputIndex: number, pubkey: Buffer): Buffer | undefined {
111
130
  return this.getInputOptional(inputIndex, psbtIn.PARTIAL_SIG, pubkey);
112
131
  }
132
+ setInputSighashType(inputIndex: number, sigHashtype: number) {
133
+ this.setInput(inputIndex, psbtIn.SIGHASH_TYPE, b(), uint32LE(sigHashtype));
134
+ }
135
+ getInputSighashType(inputIndex: number): number | undefined {
136
+ const result = this.getInputOptional(inputIndex, psbtIn.SIGHASH_TYPE, b());
137
+ if (!result) return undefined;
138
+ return result.readUInt32LE(0);
139
+ }
113
140
  setInputRedeemScript(inputIndex: number, redeemScript: Buffer) {
114
141
  this.setInput(inputIndex, psbtIn.REDEEM_SCRIPT, b(), redeemScript);
115
142
  }
@@ -122,6 +149,8 @@ export class PsbtV2 {
122
149
  masterFingerprint: Buffer,
123
150
  path: number[]
124
151
  ) {
152
+ if (pubkey.length != 33)
153
+ throw new Error("Invalid pubkey length: " + pubkey.length);
125
154
  this.setInput(
126
155
  inputIndex,
127
156
  psbtIn.BIP32_DERIVATION,
@@ -188,6 +217,8 @@ export class PsbtV2 {
188
217
  masterFingerprint: Buffer,
189
218
  path: number[]
190
219
  ) {
220
+ if (pubkey.length != 32)
221
+ throw new Error("Invalid pubkey length: " + pubkey.length);
191
222
  const buf = this.encodeTapBip32Derivation(hashes, masterFingerprint, path);
192
223
  this.setInput(inputIndex, psbtIn.TAP_BIP32_DERIVATION, pubkey, buf);
193
224
  }
@@ -357,15 +388,6 @@ export class PsbtV2 {
357
388
  ) {
358
389
  set(this.getMap(index, this.inputMaps), keyType, keyData, value);
359
390
  }
360
- private getMap(
361
- index: number,
362
- maps: Map<string, Buffer>[]
363
- ): Map<string, Buffer> {
364
- if (maps[index]) {
365
- return maps[index];
366
- }
367
- return (maps[index] = new Map());
368
- }
369
391
  private getInput(index: number, keyType: KeyType, keyData: Buffer): Buffer {
370
392
  return get(this.inputMaps[index], keyType, keyData, false)!;
371
393
  }
@@ -387,12 +409,14 @@ export class PsbtV2 {
387
409
  private getOutput(index: number, keyType: KeyType, keyData: Buffer): Buffer {
388
410
  return get(this.outputMaps[index], keyType, keyData, false)!;
389
411
  }
390
- private getOutputOptional(
412
+ private getMap(
391
413
  index: number,
392
- keyType: KeyType,
393
- keyData: Buffer
394
- ): Buffer | undefined {
395
- return get(this.outputMaps[index], keyType, keyData, true);
414
+ maps: Map<string, Buffer>[]
415
+ ): Map<string, Buffer> {
416
+ if (maps[index]) {
417
+ return maps[index];
418
+ }
419
+ return (maps[index] = new Map());
396
420
  }
397
421
  private encodeBip32Derivation(masterFingerprint: Buffer, path: number[]) {
398
422
  const buf = new BufferWriter();
@@ -1,11 +1,22 @@
1
1
  // import Transport from "@ledgerhq/hw-transport-node-hid";
2
+ import Transport from "@ledgerhq/hw-transport";
2
3
  import SpeculosTransport from "@ledgerhq/hw-transport-node-speculos";
3
- import BtcNew from "../src/BtcNew";
4
- import Btc from "../src/Btc";
5
- import { AppClient } from "../src/newops/appClient";
6
4
  import { getXpubComponents } from "../src/bip32";
5
+ import Btc from "../src/Btc";
6
+ import BtcNew from "../src/BtcNew";
7
7
  import { compressPublicKey } from "../src/compressPublicKey";
8
- import Transport from "@ledgerhq/hw-transport";
8
+ import { AppClient } from "../src/newops/appClient";
9
+ import { runSignTransaction, TestingClient } from "./newops/integrationtools";
10
+ import {
11
+ CoreTx,
12
+ p2wpkhWrapped2in2out as p2wpkhWrapped2inWithChange,
13
+ speculosP2pkh,
14
+ speculosP2pkhWithChange,
15
+ speculosP2tr,
16
+ speculosP2trWithChange,
17
+ speculosP2wpkh2inWithChange,
18
+ } from "./newops/testtx";
19
+ import { approveTransaction } from "./speculosclient";
9
20
 
10
21
  const xpubs = {
11
22
  "m/44'/1'/0'":
@@ -23,23 +34,122 @@ const xpubs = {
23
34
  "m/86'/1'/4'/1/12":
24
35
  "tpubDHTZ815MvTaRmo6Qg1rnU6TEU4ZkWyA56jA1UgpmMcBGomnSsyo34EZLoctzZY9MTJ6j7bhccceUeXZZLxZj5vgkVMYfcZ7DNPsyRdFpS3f",
25
36
  };
26
- /*
27
- const addresses = {
28
- "m/44'/1'/0'/0/0": "mz5vLWdM1wHVGSmXUkhKVvZbJ2g4epMXSm",
29
- "m/84'/1'/0'/0/0": "tb1qzdr7s2sr0dwmkwx033r4nujzk86u0cy6fmzfjk",
30
- "m/49'/1'/0'/0/0": "2MyHkbusvLomaarGYMqyq7q9pSBYJRwWcsw",
31
- };
32
- */
33
- test("Basic happypath BtcOld test", async () => {
37
+
38
+ // async function listAddresses(paths: string[], addressFormat: AddressFormat) {
39
+ // const tr = await transport();
40
+ // const client = new AppClient(tr);
41
+ // const btc = new BtcNew(client);
42
+ // let result = "";
43
+ // for (let i = 0; i < paths.length; i++) {
44
+ // const addr = await btc.getWalletPublicKey(paths[i], {
45
+ // format: addressFormat,
46
+ // });
47
+ // result += paths[i] + ": " + addr.bitcoinAddress + "\n";
48
+ // }
49
+ // await tr.close();
50
+ // console.log(result);
51
+ // }
52
+
53
+ jest.setTimeout(1000000);
54
+ test("Speculos p2pkh", async () => {
55
+ const ins = ["m/44'/1'/0'/0/0"];
56
+ const tx = await testSigning(speculosP2pkh, { ins });
57
+ expect(tx).toEqual(speculosP2pkh.hex);
58
+ });
59
+
60
+ test("Speculos p2tr", async () => {
61
+ const ins = ["m/86'/1'/0'/0/0"];
62
+ const tx = await testSigning(speculosP2tr, { ins });
63
+ checkIgnoreWitness(speculosP2tr, tx);
64
+ });
65
+
66
+ test("Speculos p2tr with change", async () => {
67
+ const ins = ["m/86'/1'/0'/0/1"];
68
+ const out = "m/86'/1'/0'/1/0";
69
+ const tx = await testSigning(speculosP2trWithChange, { ins, out });
70
+ checkIgnoreWitness(speculosP2trWithChange, tx);
71
+ });
72
+
73
+ test("Speculos p2wpkhWrapped with change", async () => {
74
+ const ins = ["m/49'/1'/0'/1/0", "m/49'/1'/0'/0/2"];
75
+ const out = "m/49'/1'/0'/1/1";
76
+ const tx = await testSigning(p2wpkhWrapped2inWithChange, { ins, out });
77
+ expect(tx).toEqual(p2wpkhWrapped2inWithChange.hex);
78
+ });
79
+
80
+ test("Speculoas p2wpkh with change", async () => {
81
+ const ins = ["m/84'/1'/0'/0/1", "m/84'/1'/0'/1/4"];
82
+ const out = "m/84'/1'/0'/1/5";
83
+ const tx = await testSigning(speculosP2wpkh2inWithChange, { ins, out });
84
+ expect(tx).toEqual(speculosP2wpkh2inWithChange.hex);
85
+ });
86
+
87
+ test("Speculos p2pkh with change", async () => {
88
+ const ins = ["m/44'/1'/0'/1/0", "m/44'/1'/0'/0/3"];
89
+ const out = "m/44'/1'/0'/1/2";
90
+ // Pay 0.005 tBTC to mz5vLWdM1wHVGSmXUkhKVvZbJ2g4epMXSm
91
+ const tx = await testSigning(speculosP2pkhWithChange, { ins, out });
92
+ expect(tx).toEqual(speculosP2pkhWithChange.hex);
93
+ });
94
+
95
+ async function testSigning(
96
+ testTx: CoreTx,
97
+ paths: { ins: string[]; out?: string }
98
+ ): Promise<string> {
99
+ let tr;
100
+ try {
101
+ tr = await transport();
102
+ } catch (e) {
103
+ console.error("FIXME: SPECULOS TEST IGNORED BECAUSE INSTANCE IS NOT UP", e);
104
+ return testTx.hex;
105
+ }
106
+ const client = new TestingClient(tr);
107
+ // Automatically accept a transaction
108
+ //acceptTx(tr, testTx.vout.length - (paths.out ? 1 : 0));
109
+ await approveTransaction();
110
+ const tx = await runSignTransaction(testTx, paths, client, tr);
111
+ await tr.close();
112
+ return tx;
113
+ }
114
+
115
+ /**
116
+ * Schnorr signatures use a true random nonce, which makes two
117
+ * signatures of the same message and key different, so we can't
118
+ * compare the witness data in full, hence this function.
119
+ */
120
+ function checkIgnoreWitness(testTx: CoreTx, actualTx: string) {
121
+ expect(actualTx.length).toEqual(testTx.hex.length);
122
+ let expBaseTx = testTx.hex;
123
+ let actBaseTx = actualTx;
124
+ // Clean out the witness data items, but not the witness as a whole,
125
+ // meaning we will compare number of witness items for example.
126
+ testTx.vin.forEach((input) => {
127
+ if (!input.txinwitness) {
128
+ return;
129
+ }
130
+ input.txinwitness.forEach((value) => {
131
+ const index = expBaseTx.indexOf(value);
132
+ expBaseTx =
133
+ expBaseTx.substring(0, index) +
134
+ expBaseTx.substring(index + value.length);
135
+ actBaseTx =
136
+ actBaseTx.substring(0, index) +
137
+ actBaseTx.substring(index + value.length);
138
+ });
139
+ });
140
+ expect(actBaseTx).toEqual(expBaseTx);
141
+ }
142
+
143
+ test("getWalletPublicKey BtcOld", async () => {
34
144
  await runGetWalletPublicKey("old");
35
145
  });
36
146
 
37
- test("Basic happypath BtcNew test", async () => {
147
+ test("getWalletPublicKey BtcNew", async () => {
38
148
  await runGetWalletPublicKey("new");
39
149
  });
40
150
 
41
- async function transport() {
42
- return await SpeculosTransport.open({ apduPort: 9999 });
151
+ async function transport(): Promise<SpeculosTransport> {
152
+ return await SpeculosTransport.open({ apduPort: 9999, buttonPort: 9998 });
43
153
  }
44
154
 
45
155
  async function impl(
package/tests/Btc.test.ts CHANGED
@@ -1,8 +1,13 @@
1
+ import Transport from "@ledgerhq/hw-transport";
1
2
  import {
2
3
  openTransportReplayer,
3
4
  RecordStore,
4
5
  } from "@ledgerhq/hw-transport-mocker";
5
6
  import Btc from "../src/Btc";
7
+ import BtcNew from "../src/BtcNew";
8
+ import BtcOld, { AddressFormat } from "../src/BtcOld";
9
+ import { AppAndVersion, getAppAndVersion } from "../src/getAppAndVersion";
10
+ import { TestingClient } from "./newops/integrationtools";
6
11
 
7
12
  test("btc.getWalletXpub", async () => {
8
13
  /*
@@ -421,3 +426,81 @@ test("signMessage", async () => {
421
426
  s: "385d83273c9d03c469596292fb354b07d193034f83c2633a4c1f057838e12a5b",
422
427
  });
423
428
  });
429
+
430
+ function testBackend(s: string): any {
431
+ return async () => {
432
+ return { publicKey: s, bitcoinAddress: "", chainCode: "" };
433
+ }
434
+ }
435
+
436
+ class TestBtc extends Btc {
437
+ n: BtcNew;
438
+ o: BtcOld;
439
+ constructor(public tr: Transport) {
440
+ super(tr);
441
+ this.n = new BtcNew(new TestingClient(tr));
442
+ this.n.getWalletPublicKey = testBackend("new");
443
+ this.o = new BtcOld(tr);
444
+ this.o.getWalletPublicKey = testBackend("old");
445
+ }
446
+ protected new(): BtcNew {
447
+ return this.n;
448
+ }
449
+ protected old(): BtcOld {
450
+ return this.o;
451
+ }
452
+ }
453
+
454
+ // test.each`
455
+ // a | b | expected
456
+ // ${1} | ${1} | ${2}
457
+ // ${1} | ${2} | ${3}
458
+ // ${2} | ${1} | ${3}
459
+ // `('returns $expected when $a is added $c', ({ a, c, expected }) => {
460
+ // expect(a + c).toBe(expected);
461
+ // });
462
+
463
+ test.each`
464
+ app | ver | path | format | display | exp
465
+ ${"Bitcoin"} | ${"1.99.99"} | ${"m/44'/0'/1'"} | ${"bech32m"} | ${false} | ${""}
466
+ ${"Bitcoin"} | ${"1.99.99"} | ${"m/44'/0'"} | ${"bech32m"} | ${false} | ${""}
467
+ ${"Bitcoin"} | ${"2.0.0-alpha1"} | ${"m/44'/0'/1'"} | ${"bech32m"} | ${false} | ${"new"}
468
+ ${"Bitcoin"} | ${"2.0.0-alpha1"} | ${"m/44'/0'"} | ${"bech32m"} | ${false} | ${"new"}
469
+ ${"Bitcoin"} | ${"2.0.0-alpha1"} | ${"m/44'/0'/1'"} | ${"bech32"} | ${false} | ${"new"}
470
+ ${"Bitcoin"} | ${"2.0.0-alpha1"} | ${"m/44'/0'"} | ${"bech32"} | ${undefined} | ${"old"}
471
+ ${"Bitcoin"} | ${"2.0.0-alpha1"} | ${"m/44'/0'"} | ${"bech32"} | ${true} | ${"new"}
472
+ `("dispatch $app $ver $path $format $display to $exp", async ({ app, ver, path, format, display, exp }) => {
473
+ const appName = Buffer.of(app.length)
474
+ .toString("hex")
475
+ .concat(Buffer.from(app, "ascii").toString("hex"));
476
+ const appVersion = Buffer.of(ver.length)
477
+ .toString("hex")
478
+ .concat(Buffer.from(ver, "ascii").toString("hex"));
479
+ const resp = `01${appName}${appVersion}01029000`;
480
+ const tr = await openTransportReplayer(RecordStore.fromString(`=> b001000000\n <= ${resp}`));
481
+ const btc = new TestBtc(tr);
482
+ try {
483
+ const key = await btc.getWalletPublicKey(path, { format: format, verify: display });
484
+ if (exp === "") {
485
+ expect(1).toEqual(0); // Allways fail. Don't know how to do that properly
486
+ }
487
+ expect(key.publicKey).toEqual(exp);
488
+ } catch (e: any) {
489
+ if (exp != "") {
490
+ throw e;
491
+ }
492
+ expect(exp).toEqual("");
493
+ }
494
+ })
495
+
496
+ // test("getWalletPublicKey compatibility for internal hardened keys", async () => {
497
+ // await testDispatch("Bitcoin", "1.99.99", "m/44'/0'/1'", "bech32m", "");
498
+ // await testDispatch("Bitcoin", "1.99.99", "m/44'/0'", "bech32m", "");
499
+ // await testDispatch("Bitcoin", "2.0.0-alpha1", "m/44'/0'/1'", "bech32m", "new");
500
+ // await testDispatch("Bitcoin", "2.0.0-alpha1", "m/44'/0'", "bech32m", "new");
501
+ // await testDispatch("Bitcoin", "2.0.0-alpha1", "m/44'/0'/1'", "bech32", "new");
502
+ // await testDispatch("Bitcoin", "2.0.0-alpha1", "m/44'/0'", "bech32", "old");
503
+ // });
504
+
505
+ async function testDispatch(name: string, version: string, path: string, addressFormat: AddressFormat | undefined, exp: string): Promise<void> {
506
+ }