@arkade-os/sdk 0.4.12 → 0.4.13

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 (3) hide show
  1. package/dist/cjs/identity/seedIdentity.js +11 -12
  2. package/dist/esm/identity/seedIdentity.js +6 -7
  3. package/package.json +3 -4
package/dist/cjs/identity/seedIdentity.js CHANGED
@@ -7,8 +7,7 @@ const utils_js_1 = require("@scure/btc-signer/utils.js");
7
7
  const btc_signer_1 = require("@scure/btc-signer");
8
8
  const signingSession_1 = require("../tree/signingSession");
9
9
  const secp256k1_1 = require("@noble/secp256k1");
10
- const bitcoin_descriptors_1 = require("@kukks/bitcoin-descriptors");
11
- const { expand } = bitcoin_descriptors_1.defaultFactory;
10
+ const descriptors_scure_1 = require("@bitcoinerlab/descriptors-scure");
12
11
  const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x === "number");
13
12
  /**
14
13
  * Detects the network from a descriptor string by checking for tpub (testnet)
@@ -16,7 +15,7 @@ const ALL_SIGHASH = Object.values(btc_signer_1.SigHash).filter((x) => typeof x =
16
15
  * @internal
17
16
  */
18
17
  function detectNetwork(descriptor) {
19
- return descriptor.includes("tpub") ? bitcoin_descriptors_1.networks.testnet : bitcoin_descriptors_1.networks.bitcoin;
18
+ return descriptor.includes("tpub") ? descriptors_scure_1.networks.testnet : descriptors_scure_1.networks.bitcoin;
20
19
  }
21
20
  function hasDescriptor(opts) {
22
21
  return "descriptor" in opts && typeof opts.descriptor === "string";
@@ -26,9 +25,9 @@ function hasDescriptor(opts) {
26
25
  * @internal
27
26
  */
28
27
  function buildDescriptor(seed, isMainnet) {
29
- const network = isMainnet ? bitcoin_descriptors_1.networks.bitcoin : bitcoin_descriptors_1.networks.testnet;
30
- const masterNode = bitcoin_descriptors_1.scureBIP32.fromSeed(seed, network);
31
- return bitcoin_descriptors_1.scriptExpressions.trBIP32({
28
+ const network = isMainnet ? descriptors_scure_1.networks.bitcoin : descriptors_scure_1.networks.testnet;
29
+ const masterNode = descriptors_scure_1.HDKey.fromMasterSeed(seed, network.bip32);
30
+ return descriptors_scure_1.scriptExpressions.trBIP32({
32
31
  masterNode,
33
32
  network,
34
33
  account: 0,
@@ -72,22 +71,22 @@ class SeedIdentity {
72
71
  this.descriptor = descriptor;
73
72
  const network = detectNetwork(descriptor);
74
73
  // Parse and validate the descriptor using the library
75
- const expansion = expand({ descriptor, network });
74
+ const expansion = (0, descriptors_scure_1.expand)({ descriptor, network });
76
75
  const keyInfo = expansion.expansionMap?.["@0"];
77
76
  if (!keyInfo?.originPath) {
78
77
  throw new Error("Descriptor must include a key origin path");
79
78
  }
80
79
  // Verify the xpub in the descriptor matches our seed
81
- const masterNode = bitcoin_descriptors_1.scureBIP32.fromSeed(seed, network);
82
- const accountNode = masterNode.derivePath(`m${keyInfo.originPath}`);
83
- if (accountNode.neutered().toBase58() !== keyInfo.bip32?.toBase58()) {
80
+ const masterNode = descriptors_scure_1.HDKey.fromMasterSeed(seed, network.bip32);
81
+ const accountNode = masterNode.derive(`m${keyInfo.originPath}`);
82
+ if (accountNode.publicExtendedKey !== keyInfo.bip32?.toBase58()) {
84
83
  throw new Error("xpub mismatch: derived key does not match descriptor");
85
84
  }
86
85
  // Derive the private key using the full path from the descriptor
87
86
  if (!keyInfo.path) {
88
87
  throw new Error("Descriptor must specify a full derivation path");
89
88
  }
90
- const derivedNode = masterNode.derivePath(keyInfo.path);
89
+ const derivedNode = masterNode.derive(keyInfo.path);
91
90
  if (!derivedNode.privateKey) {
92
91
  throw new Error("Failed to derive private key");
93
92
  }
@@ -217,7 +216,7 @@ class ReadonlyDescriptorIdentity {
217
216
  constructor(descriptor) {
218
217
  this.descriptor = descriptor;
219
218
  const network = detectNetwork(descriptor);
220
- const expansion = expand({ descriptor, network });
219
+ const expansion = (0, descriptors_scure_1.expand)({ descriptor, network });
221
220
  const keyInfo = expansion.expansionMap?.["@0"];
222
221
  if (!keyInfo?.pubkey) {
223
222
  throw new Error("Failed to derive public key from descriptor");
package/dist/esm/identity/seedIdentity.js CHANGED
@@ -4,8 +4,7 @@ import { pubECDSA, pubSchnorr } from "@scure/btc-signer/utils.js";
4
4
  import { SigHash } from "@scure/btc-signer";
5
5
  import { TreeSignerSession } from '../tree/signingSession.js';
6
6
  import { schnorr, signAsync } from "@noble/secp256k1";
7
- import { defaultFactory, scureBIP32 as BIP32, networks, scriptExpressions, } from "@kukks/bitcoin-descriptors";
8
- const { expand } = defaultFactory;
7
+ import { HDKey, expand, networks, scriptExpressions, } from "@bitcoinerlab/descriptors-scure";
9
8
  const ALL_SIGHASH = Object.values(SigHash).filter((x) => typeof x === "number");
10
9
  /**
11
10
  * Detects the network from a descriptor string by checking for tpub (testnet)
@@ -24,7 +23,7 @@ function hasDescriptor(opts) {
24
23
  */
25
24
  function buildDescriptor(seed, isMainnet) {
26
25
  const network = isMainnet ? networks.bitcoin : networks.testnet;
27
- const masterNode = BIP32.fromSeed(seed, network);
26
+ const masterNode = HDKey.fromMasterSeed(seed, network.bip32);
28
27
  return scriptExpressions.trBIP32({
29
28
  masterNode,
30
29
  network,
@@ -75,16 +74,16 @@ export class SeedIdentity {
75
74
  throw new Error("Descriptor must include a key origin path");
76
75
  }
77
76
  // Verify the xpub in the descriptor matches our seed
78
- const masterNode = BIP32.fromSeed(seed, network);
79
- const accountNode = masterNode.derivePath(`m${keyInfo.originPath}`);
80
- if (accountNode.neutered().toBase58() !== keyInfo.bip32?.toBase58()) {
77
+ const masterNode = HDKey.fromMasterSeed(seed, network.bip32);
78
+ const accountNode = masterNode.derive(`m${keyInfo.originPath}`);
79
+ if (accountNode.publicExtendedKey !== keyInfo.bip32?.toBase58()) {
81
80
  throw new Error("xpub mismatch: derived key does not match descriptor");
82
81
  }
83
82
  // Derive the private key using the full path from the descriptor
84
83
  if (!keyInfo.path) {
85
84
  throw new Error("Descriptor must specify a full derivation path");
86
85
  }
87
- const derivedNode = masterNode.derivePath(keyInfo.path);
86
+ const derivedNode = masterNode.derive(keyInfo.path);
88
87
  if (!derivedNode.privateKey) {
89
88
  throw new Error("Failed to derive private key");
90
89
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arkade-os/sdk",
3
- "version": "0.4.12",
3
+ "version": "0.4.13",
4
4
  "description": "Bitcoin wallet SDK with Taproot and Ark integration",
5
5
  "type": "module",
6
6
  "main": "./dist/cjs/index.js",
@@ -80,12 +80,11 @@
80
80
  "registry": "https://registry.npmjs.org/"
81
81
  },
82
82
  "dependencies": {
83
- "@kukks/bitcoin-descriptors": "3.2.3",
83
+ "@bitcoinerlab/descriptors-scure": "3.1.4",
84
84
  "@marcbachmann/cel-js": "7.3.1",
85
- "@noble/curves": "2.0.0",
85
+ "@noble/curves": "2.0.1",
86
86
  "@noble/secp256k1": "3.0.0",
87
87
  "@scure/base": "2.0.0",
88
- "@scure/bip32": "2.0.0",
89
88
  "@scure/bip39": "2.0.1",
90
89
  "@scure/btc-signer": "2.0.1",
91
90
  "bip68": "1.0.4"