@xyo-network/wallet 4.3.0 → 5.0.1

package/dist/browser/HDWallet.d.ts

@@ -5,10 +5,10 @@ import type { PrivateKeyInstance } from '@xyo-network/key-model';
 import { WalletInstance } from '@xyo-network/wallet-model';
 import { HDNodeWallet, Mnemonic } from 'ethers';
 export declare class HDWallet extends Account implements WalletInstance {
-    protected readonly node: HDNodeWallet;
     static readonly uniqueName: string;
     protected static _addressMap: Record<Address, WeakRef<WalletInstance>>;
-    constructor(key: unknown, node: HDNodeWallet, privateKey: PrivateKeyInstance);
+    protected readonly node: HDNodeWallet;
+    constructor(key: symbol, node: HDNodeWallet, privateKey: PrivateKeyInstance);
     get address(): Address;
     get addressBytes(): ArrayBufferLike;
     get chainCode(): string;

package/dist/browser/HDWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HDWallet.d.ts","sourceRoot":"","sources":["../../src/HDWallet.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAAa,GAAG,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EACL,aAAa,EAId,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAgB,MAAM,2BAA2B,CAAA;AACxE,OAAO,EACQ,YAAY,EAAE,QAAQ,EACpC,MAAM,QAAQ,CAAA;AAEf,qBACa,QAAS,SAAQ,OAAQ,YAAW,cAAc;IAM3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IALvC,gBAAyB,UAAU,SAA8C;IACjF,iBAA0B,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAK;gBAGlF,GAAG,EAAE,OAAO,EACO,IAAI,EAAE,YAAY,EACrC,UAAU,EAAE,kBAAkB;IAKhC,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,YAAY,IAAI,eAAe,CAE3C;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED,IAAI,UAAU,IAAI,GAAG,CAEpB;IAED,IAAI,SAAS,IAAI,GAAG,CAEnB;WAEqB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;WAa9D,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAIlF,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrD,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAI/E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAM9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,GAAE,MAAM,EAAoB,EAAE,QAAQ,GAAE,MAAY,GAAG,MAAM;WAIvE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;qBAIhC,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjH,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc;IAUzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,MAAM,EAAE,MAAM,QAAQ,CAGrB;CACF"}
+{"version":3,"file":"HDWallet.d.ts","sourceRoot":"","sources":["../../src/HDWallet.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAAa,GAAG,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EACL,aAAa,EAId,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAgB,MAAM,2BAA2B,CAAA;AACxE,OAAO,EACQ,YAAY,EAAE,QAAQ,EACpC,MAAM,QAAQ,CAAA;AAEf,qBACa,QAAS,SAAQ,OAAQ,YAAW,cAAc;IAC7D,gBAAyB,UAAU,SAA8C;IACjF,iBAA0B,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAK;IAEpF,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;gBAGnC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,kBAAkB;IAMhC,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,YAAY,IAAI,eAAe,CAE3C;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED,IAAI,UAAU,IAAI,GAAG,CAEpB;IAED,IAAI,SAAS,IAAI,GAAG,CAEnB;WAEqB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;WAa9D,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAIlF,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrD,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAI/E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAM9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,GAAE,MAAM,EAAoB,EAAE,QAAQ,GAAE,MAAY,GAAG,MAAM;WAIvE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;qBAIhC,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjH,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc;IAUzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,MAAM,EAAE,MAAM,QAAQ,CAGrB;CACF"}

package/dist/browser/index.mjs

@@ -34,8 +34,9 @@ import {
   Mnemonic
 } from "ethers";
 var HDWallet = class extends Account {
+  node;
   constructor(key, node, privateKey) {
-    super(Account._protectedConstructorKey, privateKey);
+    super(key, privateKey);
     this.node = node;
   }
   get address() {

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HDWallet.ts"],"sourcesContent":["import { generateMnemonic } from '@scure/bip39'\nimport { wordlist as englishWordlist } from '@scure/bip39/wordlists/english'\nimport { toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport {\n  Address, asAddress, Hex, hexFromHexString,\n} from '@xylabs/hex'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Account, PrivateKey } from '@xyo-network/account'\nimport {\n  AccountConfig,\n  isMnemonicInitializationConfig,\n  isPhraseInitializationConfig,\n  isPrivateKeyInitializationConfig,\n} from '@xyo-network/account-model'\nimport type { PrivateKeyInstance } from '@xyo-network/key-model'\nimport { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'\nimport {\n  defaultPath, HDNodeWallet, Mnemonic,\n} from 'ethers'\n\n@staticImplements<WalletStatic>()\nexport class HDWallet extends Account implements WalletInstance {\n  static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')\n  protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}\n\n  constructor(\n    key: unknown,\n    protected readonly node: HDNodeWallet,\n    privateKey: PrivateKeyInstance,\n  ) {\n    super(Account._protectedConstructorKey, privateKey)\n  }\n\n  override get address(): Address {\n    return asAddress(hexFromHexString(this.node.address, { prefix: false }), true)\n  }\n\n  override get addressBytes(): ArrayBufferLike {\n    return toUint8Array(this.address, undefined, 16).buffer\n  }\n\n  get chainCode(): string {\n    return this.node.chainCode\n  }\n\n  get depth(): number {\n    return this.node.depth\n  }\n\n  get extendedKey(): string {\n    return this.node.extendedKey\n  }\n\n  get fingerprint(): string {\n    return this.node.fingerprint\n  }\n\n  get index(): number {\n    return this.node.index\n  }\n\n  get mnemonic(): Mnemonic | null {\n    return this.node.mnemonic\n  }\n\n  get parentFingerprint(): string {\n    return this.node.parentFingerprint\n  }\n\n  get path(): string | null {\n    return this.node.path\n  }\n\n  get privateKey(): Hex {\n    return this.node.privateKey.toLowerCase() as Hex\n  }\n\n  get publicKey(): Hex {\n    return this.node.publicKey.toLowerCase() as Hex\n  }\n\n  static override async create(opts?: AccountConfig): Promise<WalletInstance> {\n    if (isPhraseInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.phrase)\n    }\n    if (isMnemonicInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.mnemonic, opts.path)\n    }\n    if (isPrivateKeyInitializationConfig(opts)) {\n      throw new Error('Invalid initialization config. from privateKey not supported.  Use Account.fromPrivateKey instead.')\n    }\n    throw new Error('Invalid initialization config')\n  }\n\n  static async createFromNode(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    return await this.createFromNodeInternal(node, previousHash)\n  }\n\n  static async fromExtendedKey(key: string): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromExtendedKey(key)\n    /* TODO: Handle HDNodeVoidWallet */\n    return await HDWallet.createFromNode(node as HDNodeWallet)\n  }\n\n  static async fromMnemonic(mnemonic: Mnemonic, path: string = defaultPath): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromMnemonic(mnemonic, path)\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static async fromPhrase(phrase: string, path: string = defaultPath): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(phrase), path)\n  }\n\n  static async fromSeed(seed: string | ArrayBufferLike): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromSeed(toUint8Array(seed))\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static generateMnemonic(wordlist: string[] = englishWordlist, strength: number = 256): string {\n    return generateMnemonic(wordlist, strength)\n  }\n\n  static override async random(): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(HDWallet.generateMnemonic()))\n  }\n\n  protected static async createFromNodeInternal(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    const privateKey = toUint8Array(node.privateKey.replace('0x', ''))\n    assertEx(privateKey.length === 32, () => `Private key must be 32 bytes [${privateKey?.length}]`)\n    const newWallet = await new HDWallet(Account._protectedConstructorKey, node, await PrivateKey.create(privateKey.buffer)).loadPreviousHash(previousHash)\n    return HDWallet._addressMap[newWallet.address]?.deref() ?? newWallet\n  }\n\n  protected static getCachedWalletOrCacheNewWallet(createdWallet: WalletInstance): WalletInstance {\n    const existingWallet = this._addressMap[createdWallet.address]?.deref()\n    if (existingWallet) {\n      return existingWallet\n    }\n    const ref = new WeakRef(createdWallet)\n    this._addressMap[createdWallet.address] = ref\n    return createdWallet\n  }\n\n  async derivePath(path: string): Promise<WalletInstance> {\n    // if an absolute path, check if it matches the parent root and work with it\n    if (path.startsWith('m/')) {\n      const parentPath = this.path\n      if (parentPath !== null && path.startsWith(parentPath)) {\n        const childPath = path.slice(parentPath.length + 1)\n        return await HDWallet.createFromNode(this.node.derivePath(childPath))\n      }\n      throw new Error(`Invalid absolute path ${path} for wallet with path ${parentPath}`)\n    }\n    return await HDWallet.createFromNode(this.node.derivePath(path))\n  }\n\n  neuter: () => HDWallet = () => {\n    this.node.neuter()\n    return this\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/HDWallet.ts"],"sourcesContent":["import { generateMnemonic } from '@scure/bip39'\nimport { wordlist as englishWordlist } from '@scure/bip39/wordlists/english'\nimport { toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport {\n  Address, asAddress, Hex, hexFromHexString,\n} from '@xylabs/hex'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Account, PrivateKey } from '@xyo-network/account'\nimport {\n  AccountConfig,\n  isMnemonicInitializationConfig,\n  isPhraseInitializationConfig,\n  isPrivateKeyInitializationConfig,\n} from '@xyo-network/account-model'\nimport type { PrivateKeyInstance } from '@xyo-network/key-model'\nimport { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'\nimport {\n  defaultPath, HDNodeWallet, Mnemonic,\n} from 'ethers'\n\n@staticImplements<WalletStatic>()\nexport class HDWallet extends Account implements WalletInstance {\n  static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')\n  protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}\n\n  protected readonly node: HDNodeWallet\n\n  constructor(\n    key: symbol,\n    node: HDNodeWallet,\n    privateKey: PrivateKeyInstance,\n  ) {\n    super(key, privateKey)\n    this.node = node\n  }\n\n  override get address(): Address {\n    return asAddress(hexFromHexString(this.node.address, { prefix: false }), true)\n  }\n\n  override get addressBytes(): ArrayBufferLike {\n    return toUint8Array(this.address, undefined, 16).buffer\n  }\n\n  get chainCode(): string {\n    return this.node.chainCode\n  }\n\n  get depth(): number {\n    return this.node.depth\n  }\n\n  get extendedKey(): string {\n    return this.node.extendedKey\n  }\n\n  get fingerprint(): string {\n    return this.node.fingerprint\n  }\n\n  get index(): number {\n    return this.node.index\n  }\n\n  get mnemonic(): Mnemonic | null {\n    return this.node.mnemonic\n  }\n\n  get parentFingerprint(): string {\n    return this.node.parentFingerprint\n  }\n\n  get path(): string | null {\n    return this.node.path\n  }\n\n  get privateKey(): Hex {\n    return this.node.privateKey.toLowerCase() as Hex\n  }\n\n  get publicKey(): Hex {\n    return this.node.publicKey.toLowerCase() as Hex\n  }\n\n  static override async create(opts?: AccountConfig): Promise<WalletInstance> {\n    if (isPhraseInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.phrase)\n    }\n    if (isMnemonicInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.mnemonic, opts.path)\n    }\n    if (isPrivateKeyInitializationConfig(opts)) {\n      throw new Error('Invalid initialization config. from privateKey not supported.  Use Account.fromPrivateKey instead.')\n    }\n    throw new Error('Invalid initialization config')\n  }\n\n  static async createFromNode(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    return await this.createFromNodeInternal(node, previousHash)\n  }\n\n  static async fromExtendedKey(key: string): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromExtendedKey(key)\n    /* TODO: Handle HDNodeVoidWallet */\n    return await HDWallet.createFromNode(node as HDNodeWallet)\n  }\n\n  static async fromMnemonic(mnemonic: Mnemonic, path: string = defaultPath): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromMnemonic(mnemonic, path)\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static async fromPhrase(phrase: string, path: string = defaultPath): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(phrase), path)\n  }\n\n  static async fromSeed(seed: string | ArrayBufferLike): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromSeed(toUint8Array(seed))\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static generateMnemonic(wordlist: string[] = englishWordlist, strength: number = 256): string {\n    return generateMnemonic(wordlist, strength)\n  }\n\n  static override async random(): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(HDWallet.generateMnemonic()))\n  }\n\n  protected static async createFromNodeInternal(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    const privateKey = toUint8Array(node.privateKey.replace('0x', ''))\n    assertEx(privateKey.length === 32, () => `Private key must be 32 bytes [${privateKey?.length}]`)\n    const newWallet = await new HDWallet(Account._protectedConstructorKey, node, await PrivateKey.create(privateKey.buffer)).loadPreviousHash(previousHash)\n    return HDWallet._addressMap[newWallet.address]?.deref() ?? newWallet\n  }\n\n  protected static getCachedWalletOrCacheNewWallet(createdWallet: WalletInstance): WalletInstance {\n    const existingWallet = this._addressMap[createdWallet.address]?.deref()\n    if (existingWallet) {\n      return existingWallet\n    }\n    const ref = new WeakRef(createdWallet)\n    this._addressMap[createdWallet.address] = ref\n    return createdWallet\n  }\n\n  async derivePath(path: string): Promise<WalletInstance> {\n    // if an absolute path, check if it matches the parent root and work with it\n    if (path.startsWith('m/')) {\n      const parentPath = this.path\n      if (parentPath !== null && path.startsWith(parentPath)) {\n        const childPath = path.slice(parentPath.length + 1)\n        return await HDWallet.createFromNode(this.node.derivePath(childPath))\n      }\n      throw new Error(`Invalid absolute path ${path} for wallet with path ${parentPath}`)\n    }\n    return await HDWallet.createFromNode(this.node.derivePath(path))\n  }\n\n  neuter: () => HDWallet = () => {\n    this.node.neuter()\n    return this\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/neutral/HDWallet.d.ts

@@ -5,10 +5,10 @@ import type { PrivateKeyInstance } from '@xyo-network/key-model';
 import { WalletInstance } from '@xyo-network/wallet-model';
 import { HDNodeWallet, Mnemonic } from 'ethers';
 export declare class HDWallet extends Account implements WalletInstance {
-    protected readonly node: HDNodeWallet;
     static readonly uniqueName: string;
     protected static _addressMap: Record<Address, WeakRef<WalletInstance>>;
-    constructor(key: unknown, node: HDNodeWallet, privateKey: PrivateKeyInstance);
+    protected readonly node: HDNodeWallet;
+    constructor(key: symbol, node: HDNodeWallet, privateKey: PrivateKeyInstance);
     get address(): Address;
     get addressBytes(): ArrayBufferLike;
     get chainCode(): string;

package/dist/neutral/HDWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HDWallet.d.ts","sourceRoot":"","sources":["../../src/HDWallet.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAAa,GAAG,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EACL,aAAa,EAId,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAgB,MAAM,2BAA2B,CAAA;AACxE,OAAO,EACQ,YAAY,EAAE,QAAQ,EACpC,MAAM,QAAQ,CAAA;AAEf,qBACa,QAAS,SAAQ,OAAQ,YAAW,cAAc;IAM3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IALvC,gBAAyB,UAAU,SAA8C;IACjF,iBAA0B,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAK;gBAGlF,GAAG,EAAE,OAAO,EACO,IAAI,EAAE,YAAY,EACrC,UAAU,EAAE,kBAAkB;IAKhC,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,YAAY,IAAI,eAAe,CAE3C;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED,IAAI,UAAU,IAAI,GAAG,CAEpB;IAED,IAAI,SAAS,IAAI,GAAG,CAEnB;WAEqB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;WAa9D,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAIlF,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrD,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAI/E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAM9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,GAAE,MAAM,EAAoB,EAAE,QAAQ,GAAE,MAAY,GAAG,MAAM;WAIvE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;qBAIhC,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjH,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc;IAUzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,MAAM,EAAE,MAAM,QAAQ,CAGrB;CACF"}
+{"version":3,"file":"HDWallet.d.ts","sourceRoot":"","sources":["../../src/HDWallet.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAAa,GAAG,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EACL,aAAa,EAId,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAgB,MAAM,2BAA2B,CAAA;AACxE,OAAO,EACQ,YAAY,EAAE,QAAQ,EACpC,MAAM,QAAQ,CAAA;AAEf,qBACa,QAAS,SAAQ,OAAQ,YAAW,cAAc;IAC7D,gBAAyB,UAAU,SAA8C;IACjF,iBAA0B,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAK;IAEpF,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;gBAGnC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,kBAAkB;IAMhC,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,YAAY,IAAI,eAAe,CAE3C;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED,IAAI,UAAU,IAAI,GAAG,CAEpB;IAED,IAAI,SAAS,IAAI,GAAG,CAEnB;WAEqB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;WAa9D,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAIlF,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrD,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAI/E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAM9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,GAAE,MAAM,EAAoB,EAAE,QAAQ,GAAE,MAAY,GAAG,MAAM;WAIvE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;qBAIhC,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjH,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc;IAUzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,MAAM,EAAE,MAAM,QAAQ,CAGrB;CACF"}

package/dist/neutral/index.mjs

@@ -34,8 +34,9 @@ import {
   Mnemonic
 } from "ethers";
 var HDWallet = class extends Account {
+  node;
   constructor(key, node, privateKey) {
-    super(Account._protectedConstructorKey, privateKey);
+    super(key, privateKey);
     this.node = node;
   }
   get address() {

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HDWallet.ts"],"sourcesContent":["import { generateMnemonic } from '@scure/bip39'\nimport { wordlist as englishWordlist } from '@scure/bip39/wordlists/english'\nimport { toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport {\n  Address, asAddress, Hex, hexFromHexString,\n} from '@xylabs/hex'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Account, PrivateKey } from '@xyo-network/account'\nimport {\n  AccountConfig,\n  isMnemonicInitializationConfig,\n  isPhraseInitializationConfig,\n  isPrivateKeyInitializationConfig,\n} from '@xyo-network/account-model'\nimport type { PrivateKeyInstance } from '@xyo-network/key-model'\nimport { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'\nimport {\n  defaultPath, HDNodeWallet, Mnemonic,\n} from 'ethers'\n\n@staticImplements<WalletStatic>()\nexport class HDWallet extends Account implements WalletInstance {\n  static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')\n  protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}\n\n  constructor(\n    key: unknown,\n    protected readonly node: HDNodeWallet,\n    privateKey: PrivateKeyInstance,\n  ) {\n    super(Account._protectedConstructorKey, privateKey)\n  }\n\n  override get address(): Address {\n    return asAddress(hexFromHexString(this.node.address, { prefix: false }), true)\n  }\n\n  override get addressBytes(): ArrayBufferLike {\n    return toUint8Array(this.address, undefined, 16).buffer\n  }\n\n  get chainCode(): string {\n    return this.node.chainCode\n  }\n\n  get depth(): number {\n    return this.node.depth\n  }\n\n  get extendedKey(): string {\n    return this.node.extendedKey\n  }\n\n  get fingerprint(): string {\n    return this.node.fingerprint\n  }\n\n  get index(): number {\n    return this.node.index\n  }\n\n  get mnemonic(): Mnemonic | null {\n    return this.node.mnemonic\n  }\n\n  get parentFingerprint(): string {\n    return this.node.parentFingerprint\n  }\n\n  get path(): string | null {\n    return this.node.path\n  }\n\n  get privateKey(): Hex {\n    return this.node.privateKey.toLowerCase() as Hex\n  }\n\n  get publicKey(): Hex {\n    return this.node.publicKey.toLowerCase() as Hex\n  }\n\n  static override async create(opts?: AccountConfig): Promise<WalletInstance> {\n    if (isPhraseInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.phrase)\n    }\n    if (isMnemonicInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.mnemonic, opts.path)\n    }\n    if (isPrivateKeyInitializationConfig(opts)) {\n      throw new Error('Invalid initialization config. from privateKey not supported.  Use Account.fromPrivateKey instead.')\n    }\n    throw new Error('Invalid initialization config')\n  }\n\n  static async createFromNode(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    return await this.createFromNodeInternal(node, previousHash)\n  }\n\n  static async fromExtendedKey(key: string): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromExtendedKey(key)\n    /* TODO: Handle HDNodeVoidWallet */\n    return await HDWallet.createFromNode(node as HDNodeWallet)\n  }\n\n  static async fromMnemonic(mnemonic: Mnemonic, path: string = defaultPath): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromMnemonic(mnemonic, path)\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static async fromPhrase(phrase: string, path: string = defaultPath): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(phrase), path)\n  }\n\n  static async fromSeed(seed: string | ArrayBufferLike): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromSeed(toUint8Array(seed))\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static generateMnemonic(wordlist: string[] = englishWordlist, strength: number = 256): string {\n    return generateMnemonic(wordlist, strength)\n  }\n\n  static override async random(): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(HDWallet.generateMnemonic()))\n  }\n\n  protected static async createFromNodeInternal(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    const privateKey = toUint8Array(node.privateKey.replace('0x', ''))\n    assertEx(privateKey.length === 32, () => `Private key must be 32 bytes [${privateKey?.length}]`)\n    const newWallet = await new HDWallet(Account._protectedConstructorKey, node, await PrivateKey.create(privateKey.buffer)).loadPreviousHash(previousHash)\n    return HDWallet._addressMap[newWallet.address]?.deref() ?? newWallet\n  }\n\n  protected static getCachedWalletOrCacheNewWallet(createdWallet: WalletInstance): WalletInstance {\n    const existingWallet = this._addressMap[createdWallet.address]?.deref()\n    if (existingWallet) {\n      return existingWallet\n    }\n    const ref = new WeakRef(createdWallet)\n    this._addressMap[createdWallet.address] = ref\n    return createdWallet\n  }\n\n  async derivePath(path: string): Promise<WalletInstance> {\n    // if an absolute path, check if it matches the parent root and work with it\n    if (path.startsWith('m/')) {\n      const parentPath = this.path\n      if (parentPath !== null && path.startsWith(parentPath)) {\n        const childPath = path.slice(parentPath.length + 1)\n        return await HDWallet.createFromNode(this.node.derivePath(childPath))\n      }\n      throw new Error(`Invalid absolute path ${path} for wallet with path ${parentPath}`)\n    }\n    return await HDWallet.createFromNode(this.node.derivePath(path))\n  }\n\n  neuter: () => HDWallet = () => {\n    this.node.neuter()\n    return this\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/HDWallet.ts"],"sourcesContent":["import { generateMnemonic } from '@scure/bip39'\nimport { wordlist as englishWordlist } from '@scure/bip39/wordlists/english'\nimport { toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport {\n  Address, asAddress, Hex, hexFromHexString,\n} from '@xylabs/hex'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Account, PrivateKey } from '@xyo-network/account'\nimport {\n  AccountConfig,\n  isMnemonicInitializationConfig,\n  isPhraseInitializationConfig,\n  isPrivateKeyInitializationConfig,\n} from '@xyo-network/account-model'\nimport type { PrivateKeyInstance } from '@xyo-network/key-model'\nimport { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'\nimport {\n  defaultPath, HDNodeWallet, Mnemonic,\n} from 'ethers'\n\n@staticImplements<WalletStatic>()\nexport class HDWallet extends Account implements WalletInstance {\n  static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')\n  protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}\n\n  protected readonly node: HDNodeWallet\n\n  constructor(\n    key: symbol,\n    node: HDNodeWallet,\n    privateKey: PrivateKeyInstance,\n  ) {\n    super(key, privateKey)\n    this.node = node\n  }\n\n  override get address(): Address {\n    return asAddress(hexFromHexString(this.node.address, { prefix: false }), true)\n  }\n\n  override get addressBytes(): ArrayBufferLike {\n    return toUint8Array(this.address, undefined, 16).buffer\n  }\n\n  get chainCode(): string {\n    return this.node.chainCode\n  }\n\n  get depth(): number {\n    return this.node.depth\n  }\n\n  get extendedKey(): string {\n    return this.node.extendedKey\n  }\n\n  get fingerprint(): string {\n    return this.node.fingerprint\n  }\n\n  get index(): number {\n    return this.node.index\n  }\n\n  get mnemonic(): Mnemonic | null {\n    return this.node.mnemonic\n  }\n\n  get parentFingerprint(): string {\n    return this.node.parentFingerprint\n  }\n\n  get path(): string | null {\n    return this.node.path\n  }\n\n  get privateKey(): Hex {\n    return this.node.privateKey.toLowerCase() as Hex\n  }\n\n  get publicKey(): Hex {\n    return this.node.publicKey.toLowerCase() as Hex\n  }\n\n  static override async create(opts?: AccountConfig): Promise<WalletInstance> {\n    if (isPhraseInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.phrase)\n    }\n    if (isMnemonicInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.mnemonic, opts.path)\n    }\n    if (isPrivateKeyInitializationConfig(opts)) {\n      throw new Error('Invalid initialization config. from privateKey not supported.  Use Account.fromPrivateKey instead.')\n    }\n    throw new Error('Invalid initialization config')\n  }\n\n  static async createFromNode(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    return await this.createFromNodeInternal(node, previousHash)\n  }\n\n  static async fromExtendedKey(key: string): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromExtendedKey(key)\n    /* TODO: Handle HDNodeVoidWallet */\n    return await HDWallet.createFromNode(node as HDNodeWallet)\n  }\n\n  static async fromMnemonic(mnemonic: Mnemonic, path: string = defaultPath): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromMnemonic(mnemonic, path)\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static async fromPhrase(phrase: string, path: string = defaultPath): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(phrase), path)\n  }\n\n  static async fromSeed(seed: string | ArrayBufferLike): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromSeed(toUint8Array(seed))\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static generateMnemonic(wordlist: string[] = englishWordlist, strength: number = 256): string {\n    return generateMnemonic(wordlist, strength)\n  }\n\n  static override async random(): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(HDWallet.generateMnemonic()))\n  }\n\n  protected static async createFromNodeInternal(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    const privateKey = toUint8Array(node.privateKey.replace('0x', ''))\n    assertEx(privateKey.length === 32, () => `Private key must be 32 bytes [${privateKey?.length}]`)\n    const newWallet = await new HDWallet(Account._protectedConstructorKey, node, await PrivateKey.create(privateKey.buffer)).loadPreviousHash(previousHash)\n    return HDWallet._addressMap[newWallet.address]?.deref() ?? newWallet\n  }\n\n  protected static getCachedWalletOrCacheNewWallet(createdWallet: WalletInstance): WalletInstance {\n    const existingWallet = this._addressMap[createdWallet.address]?.deref()\n    if (existingWallet) {\n      return existingWallet\n    }\n    const ref = new WeakRef(createdWallet)\n    this._addressMap[createdWallet.address] = ref\n    return createdWallet\n  }\n\n  async derivePath(path: string): Promise<WalletInstance> {\n    // if an absolute path, check if it matches the parent root and work with it\n    if (path.startsWith('m/')) {\n      const parentPath = this.path\n      if (parentPath !== null && path.startsWith(parentPath)) {\n        const childPath = path.slice(parentPath.length + 1)\n        return await HDWallet.createFromNode(this.node.derivePath(childPath))\n      }\n      throw new Error(`Invalid absolute path ${path} for wallet with path ${parentPath}`)\n    }\n    return await HDWallet.createFromNode(this.node.derivePath(path))\n  }\n\n  neuter: () => HDWallet = () => {\n    this.node.neuter()\n    return this\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/node/HDWallet.d.ts

@@ -5,10 +5,10 @@ import type { PrivateKeyInstance } from '@xyo-network/key-model';
 import { WalletInstance } from '@xyo-network/wallet-model';
 import { HDNodeWallet, Mnemonic } from 'ethers';
 export declare class HDWallet extends Account implements WalletInstance {
-    protected readonly node: HDNodeWallet;
     static readonly uniqueName: string;
     protected static _addressMap: Record<Address, WeakRef<WalletInstance>>;
-    constructor(key: unknown, node: HDNodeWallet, privateKey: PrivateKeyInstance);
+    protected readonly node: HDNodeWallet;
+    constructor(key: symbol, node: HDNodeWallet, privateKey: PrivateKeyInstance);
     get address(): Address;
     get addressBytes(): ArrayBufferLike;
     get chainCode(): string;

package/dist/node/HDWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HDWallet.d.ts","sourceRoot":"","sources":["../../src/HDWallet.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAAa,GAAG,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EACL,aAAa,EAId,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAgB,MAAM,2BAA2B,CAAA;AACxE,OAAO,EACQ,YAAY,EAAE,QAAQ,EACpC,MAAM,QAAQ,CAAA;AAEf,qBACa,QAAS,SAAQ,OAAQ,YAAW,cAAc;IAM3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY;IALvC,gBAAyB,UAAU,SAA8C;IACjF,iBAA0B,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAK;gBAGlF,GAAG,EAAE,OAAO,EACO,IAAI,EAAE,YAAY,EACrC,UAAU,EAAE,kBAAkB;IAKhC,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,YAAY,IAAI,eAAe,CAE3C;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED,IAAI,UAAU,IAAI,GAAG,CAEpB;IAED,IAAI,SAAS,IAAI,GAAG,CAEnB;WAEqB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;WAa9D,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAIlF,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrD,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAI/E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAM9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,GAAE,MAAM,EAAoB,EAAE,QAAQ,GAAE,MAAY,GAAG,MAAM;WAIvE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;qBAIhC,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjH,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc;IAUzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,MAAM,EAAE,MAAM,QAAQ,CAGrB;CACF"}
+{"version":3,"file":"HDWallet.d.ts","sourceRoot":"","sources":["../../src/HDWallet.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,OAAO,EAAa,GAAG,EACxB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EACL,aAAa,EAId,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAgB,MAAM,2BAA2B,CAAA;AACxE,OAAO,EACQ,YAAY,EAAE,QAAQ,EACpC,MAAM,QAAQ,CAAA;AAEf,qBACa,QAAS,SAAQ,OAAQ,YAAW,cAAc;IAC7D,gBAAyB,UAAU,SAA8C;IACjF,iBAA0B,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAK;IAEpF,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;gBAGnC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,kBAAkB;IAMhC,IAAa,OAAO,IAAI,OAAO,CAE9B;IAED,IAAa,YAAY,IAAI,eAAe,CAE3C;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,IAAI,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,IAAI,IAAI,MAAM,GAAG,IAAI,CAExB;IAED,IAAI,UAAU,IAAI,GAAG,CAEpB;IAED,IAAI,SAAS,IAAI,GAAG,CAEnB;WAEqB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;WAa9D,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAIlF,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrD,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAMrF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;WAI/E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAM9E,MAAM,CAAC,gBAAgB,CAAC,QAAQ,GAAE,MAAM,EAAoB,EAAE,QAAQ,GAAE,MAAY,GAAG,MAAM;WAIvE,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;qBAIhC,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAOjH,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc;IAUzF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,MAAM,EAAE,MAAM,QAAQ,CAGrB;CACF"}

package/dist/node/index.mjs

@@ -34,8 +34,9 @@ import {
   Mnemonic
 } from "ethers";
 var HDWallet = class extends Account {
+  node;
   constructor(key, node, privateKey) {
-    super(Account._protectedConstructorKey, privateKey);
+    super(key, privateKey);
     this.node = node;
   }
   get address() {

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/HDWallet.ts"],"sourcesContent":["import { generateMnemonic } from '@scure/bip39'\nimport { wordlist as englishWordlist } from '@scure/bip39/wordlists/english'\nimport { toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport {\n  Address, asAddress, Hex, hexFromHexString,\n} from '@xylabs/hex'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Account, PrivateKey } from '@xyo-network/account'\nimport {\n  AccountConfig,\n  isMnemonicInitializationConfig,\n  isPhraseInitializationConfig,\n  isPrivateKeyInitializationConfig,\n} from '@xyo-network/account-model'\nimport type { PrivateKeyInstance } from '@xyo-network/key-model'\nimport { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'\nimport {\n  defaultPath, HDNodeWallet, Mnemonic,\n} from 'ethers'\n\n@staticImplements<WalletStatic>()\nexport class HDWallet extends Account implements WalletInstance {\n  static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')\n  protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}\n\n  constructor(\n    key: unknown,\n    protected readonly node: HDNodeWallet,\n    privateKey: PrivateKeyInstance,\n  ) {\n    super(Account._protectedConstructorKey, privateKey)\n  }\n\n  override get address(): Address {\n    return asAddress(hexFromHexString(this.node.address, { prefix: false }), true)\n  }\n\n  override get addressBytes(): ArrayBufferLike {\n    return toUint8Array(this.address, undefined, 16).buffer\n  }\n\n  get chainCode(): string {\n    return this.node.chainCode\n  }\n\n  get depth(): number {\n    return this.node.depth\n  }\n\n  get extendedKey(): string {\n    return this.node.extendedKey\n  }\n\n  get fingerprint(): string {\n    return this.node.fingerprint\n  }\n\n  get index(): number {\n    return this.node.index\n  }\n\n  get mnemonic(): Mnemonic | null {\n    return this.node.mnemonic\n  }\n\n  get parentFingerprint(): string {\n    return this.node.parentFingerprint\n  }\n\n  get path(): string | null {\n    return this.node.path\n  }\n\n  get privateKey(): Hex {\n    return this.node.privateKey.toLowerCase() as Hex\n  }\n\n  get publicKey(): Hex {\n    return this.node.publicKey.toLowerCase() as Hex\n  }\n\n  static override async create(opts?: AccountConfig): Promise<WalletInstance> {\n    if (isPhraseInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.phrase)\n    }\n    if (isMnemonicInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.mnemonic, opts.path)\n    }\n    if (isPrivateKeyInitializationConfig(opts)) {\n      throw new Error('Invalid initialization config. from privateKey not supported.  Use Account.fromPrivateKey instead.')\n    }\n    throw new Error('Invalid initialization config')\n  }\n\n  static async createFromNode(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    return await this.createFromNodeInternal(node, previousHash)\n  }\n\n  static async fromExtendedKey(key: string): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromExtendedKey(key)\n    /* TODO: Handle HDNodeVoidWallet */\n    return await HDWallet.createFromNode(node as HDNodeWallet)\n  }\n\n  static async fromMnemonic(mnemonic: Mnemonic, path: string = defaultPath): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromMnemonic(mnemonic, path)\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static async fromPhrase(phrase: string, path: string = defaultPath): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(phrase), path)\n  }\n\n  static async fromSeed(seed: string | ArrayBufferLike): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromSeed(toUint8Array(seed))\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static generateMnemonic(wordlist: string[] = englishWordlist, strength: number = 256): string {\n    return generateMnemonic(wordlist, strength)\n  }\n\n  static override async random(): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(HDWallet.generateMnemonic()))\n  }\n\n  protected static async createFromNodeInternal(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    const privateKey = toUint8Array(node.privateKey.replace('0x', ''))\n    assertEx(privateKey.length === 32, () => `Private key must be 32 bytes [${privateKey?.length}]`)\n    const newWallet = await new HDWallet(Account._protectedConstructorKey, node, await PrivateKey.create(privateKey.buffer)).loadPreviousHash(previousHash)\n    return HDWallet._addressMap[newWallet.address]?.deref() ?? newWallet\n  }\n\n  protected static getCachedWalletOrCacheNewWallet(createdWallet: WalletInstance): WalletInstance {\n    const existingWallet = this._addressMap[createdWallet.address]?.deref()\n    if (existingWallet) {\n      return existingWallet\n    }\n    const ref = new WeakRef(createdWallet)\n    this._addressMap[createdWallet.address] = ref\n    return createdWallet\n  }\n\n  async derivePath(path: string): Promise<WalletInstance> {\n    // if an absolute path, check if it matches the parent root and work with it\n    if (path.startsWith('m/')) {\n      const parentPath = this.path\n      if (parentPath !== null && path.startsWith(parentPath)) {\n        const childPath = path.slice(parentPath.length + 1)\n        return await HDWallet.createFromNode(this.node.derivePath(childPath))\n      }\n      throw new Error(`Invalid absolute path ${path} for wallet with path ${parentPath}`)\n    }\n    return await HDWallet.createFromNode(this.node.derivePath(path))\n  }\n\n  neuter: () => HDWallet = () => {\n    this.node.neuter()\n    return this\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA,SAAS,wBAAwB;AACjC,SAAS,YAAY,uBAAuB;AAC5C,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB;AACzB,SAAS,sBAAsB;AAC/B;AAAA,EACW;AAAA,EAAgB;AAAA,OACpB;AACP,SAAS,wBAAwB;AACjC,SAAS,SAAS,kBAAkB;AACpC;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGP;AAAA,EACE;AAAA,EAAa;AAAA,EAAc;AAAA,OACtB;AAGA,IAAM,WAAN,cAAuB,QAAkC;AAAA,EAI9D,YACE,KACmB,MACnB,YACA;AACA,UAAM,QAAQ,0BAA0B,UAAU;AAH/B;AAAA,EAIrB;AAAA,EAEA,IAAa,UAAmB;AAC9B,WAAO,UAAU,iBAAiB,KAAK,KAAK,SAAS,EAAE,QAAQ,MAAM,CAAC,GAAG,IAAI;AAAA,EAC/E;AAAA,EAEA,IAAa,eAAgC;AAC3C,WAAO,aAAa,KAAK,SAAS,QAAW,EAAE,EAAE;AAAA,EACnD;AAAA,EAEA,IAAI,YAAoB;AACtB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,QAAgB;AAClB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,cAAsB;AACxB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,cAAsB;AACxB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,QAAgB;AAClB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,WAA4B;AAC9B,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,oBAA4B;AAC9B,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,OAAsB;AACxB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAI,aAAkB;AACpB,WAAO,KAAK,KAAK,WAAW,YAAY;AAAA,EAC1C;AAAA,EAEA,IAAI,YAAiB;AACnB,WAAO,KAAK,KAAK,UAAU,YAAY;AAAA,EACzC;AAAA,EAEA,aAAsB,OAAO,MAA+C;AAC1E,QAAI,6BAA6B,IAAI,GAAG;AACtC,aAAO,MAAM,KAAK,WAAW,KAAK,MAAM;AAAA,IAC1C;AACA,QAAI,+BAA+B,IAAI,GAAG;AACxC,aAAO,MAAM,KAAK,WAAW,KAAK,UAAU,KAAK,IAAI;AAAA,IACvD;AACA,QAAI,iCAAiC,IAAI,GAAG;AAC1C,YAAM,IAAI,MAAM,oGAAoG;AAAA,IACtH;AACA,UAAM,IAAI,MAAM,+BAA+B;AAAA,EACjD;AAAA,EAEA,aAAa,eAAe,MAAoB,cAAgD;AAC9F,WAAO,MAAM,KAAK,uBAAuB,MAAM,YAAY;AAAA,EAC7D;AAAA,EAEA,aAAa,gBAAgB,KAAsC;AACjE,UAAM,OAAO,aAAa,gBAAgB,GAAG;AAE7C,WAAO,MAAM,SAAS,eAAe,IAAoB;AAAA,EAC3D;AAAA,EAEA,aAAa,aAAa,UAAoB,OAAe,aAAsC;AACjG,UAAM,OAAO,aAAa,aAAa,UAAU,IAAI;AACrD,UAAM,gBAAgB,MAAM,KAAK,uBAAuB,IAAI;AAC5D,WAAO,KAAK,gCAAgC,aAAa;AAAA,EAC3D;AAAA,EAEA,aAAa,WAAW,QAAgB,OAAe,aAAsC;AAC3F,WAAO,MAAM,KAAK,aAAa,SAAS,WAAW,MAAM,GAAG,IAAI;AAAA,EAClE;AAAA,EAEA,aAAa,SAAS,MAAyD;AAC7E,UAAM,OAAO,aAAa,SAAS,aAAa,IAAI,CAAC;AACrD,UAAM,gBAAgB,MAAM,KAAK,uBAAuB,IAAI;AAC5D,WAAO,KAAK,gCAAgC,aAAa;AAAA,EAC3D;AAAA,EAEA,OAAO,iBAAiB,WAAqB,iBAAiB,WAAmB,KAAa;AAC5F,WAAO,iBAAiB,UAAU,QAAQ;AAAA,EAC5C;AAAA,EAEA,aAAsB,SAAkC;AACtD,WAAO,MAAM,KAAK,aAAa,SAAS,WAAW,SAAS,iBAAiB,CAAC,CAAC;AAAA,EACjF;AAAA,EAEA,aAAuB,uBAAuB,MAAoB,cAAgD;AAChH,UAAM,aAAa,aAAa,KAAK,WAAW,QAAQ,MAAM,EAAE,CAAC;AACjE,aAAS,WAAW,WAAW,IAAI,MAAM,iCAAiC,YAAY,MAAM,GAAG;AAC/F,UAAM,YAAY,MAAM,IAAI,SAAS,QAAQ,0BAA0B,MAAM,MAAM,WAAW,OAAO,WAAW,MAAM,CAAC,EAAE,iBAAiB,YAAY;AACtJ,WAAO,SAAS,YAAY,UAAU,OAAO,GAAG,MAAM,KAAK;AAAA,EAC7D;AAAA,EAEA,OAAiB,gCAAgC,eAA+C;AAC9F,UAAM,iBAAiB,KAAK,YAAY,cAAc,OAAO,GAAG,MAAM;AACtE,QAAI,gBAAgB;AAClB,aAAO;AAAA,IACT;AACA,UAAM,MAAM,IAAI,QAAQ,aAAa;AACrC,SAAK,YAAY,cAAc,OAAO,IAAI;AAC1C,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,WAAW,MAAuC;AAEtD,QAAI,KAAK,WAAW,IAAI,GAAG;AACzB,YAAM,aAAa,KAAK;AACxB,UAAI,eAAe,QAAQ,KAAK,WAAW,UAAU,GAAG;AACtD,cAAM,YAAY,KAAK,MAAM,WAAW,SAAS,CAAC;AAClD,eAAO,MAAM,SAAS,eAAe,KAAK,KAAK,WAAW,SAAS,CAAC;AAAA,MACtE;AACA,YAAM,IAAI,MAAM,yBAAyB,IAAI,yBAAyB,UAAU,EAAE;AAAA,IACpF;AACA,WAAO,MAAM,SAAS,eAAe,KAAK,KAAK,WAAW,IAAI,CAAC;AAAA,EACjE;AAAA,EAEA,SAAyB,MAAM;AAC7B,SAAK,KAAK,OAAO;AACjB,WAAO;AAAA,EACT;AACF;AA5IE,cADW,UACc,cAAa,eAAe,YAAY,UAAU,KAAK;AAChF,cAFW,UAEe,eAAwD,CAAC;AAFxE,WAAN;AAAA,EADN,iBAA+B;AAAA,GACnB;","names":[]}
+{"version":3,"sources":["../../src/HDWallet.ts"],"sourcesContent":["import { generateMnemonic } from '@scure/bip39'\nimport { wordlist as englishWordlist } from '@scure/bip39/wordlists/english'\nimport { toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/base'\nimport {\n  Address, asAddress, Hex, hexFromHexString,\n} from '@xylabs/hex'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Account, PrivateKey } from '@xyo-network/account'\nimport {\n  AccountConfig,\n  isMnemonicInitializationConfig,\n  isPhraseInitializationConfig,\n  isPrivateKeyInitializationConfig,\n} from '@xyo-network/account-model'\nimport type { PrivateKeyInstance } from '@xyo-network/key-model'\nimport { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'\nimport {\n  defaultPath, HDNodeWallet, Mnemonic,\n} from 'ethers'\n\n@staticImplements<WalletStatic>()\nexport class HDWallet extends Account implements WalletInstance {\n  static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')\n  protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}\n\n  protected readonly node: HDNodeWallet\n\n  constructor(\n    key: symbol,\n    node: HDNodeWallet,\n    privateKey: PrivateKeyInstance,\n  ) {\n    super(key, privateKey)\n    this.node = node\n  }\n\n  override get address(): Address {\n    return asAddress(hexFromHexString(this.node.address, { prefix: false }), true)\n  }\n\n  override get addressBytes(): ArrayBufferLike {\n    return toUint8Array(this.address, undefined, 16).buffer\n  }\n\n  get chainCode(): string {\n    return this.node.chainCode\n  }\n\n  get depth(): number {\n    return this.node.depth\n  }\n\n  get extendedKey(): string {\n    return this.node.extendedKey\n  }\n\n  get fingerprint(): string {\n    return this.node.fingerprint\n  }\n\n  get index(): number {\n    return this.node.index\n  }\n\n  get mnemonic(): Mnemonic | null {\n    return this.node.mnemonic\n  }\n\n  get parentFingerprint(): string {\n    return this.node.parentFingerprint\n  }\n\n  get path(): string | null {\n    return this.node.path\n  }\n\n  get privateKey(): Hex {\n    return this.node.privateKey.toLowerCase() as Hex\n  }\n\n  get publicKey(): Hex {\n    return this.node.publicKey.toLowerCase() as Hex\n  }\n\n  static override async create(opts?: AccountConfig): Promise<WalletInstance> {\n    if (isPhraseInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.phrase)\n    }\n    if (isMnemonicInitializationConfig(opts)) {\n      return await this.fromPhrase(opts.mnemonic, opts.path)\n    }\n    if (isPrivateKeyInitializationConfig(opts)) {\n      throw new Error('Invalid initialization config. from privateKey not supported.  Use Account.fromPrivateKey instead.')\n    }\n    throw new Error('Invalid initialization config')\n  }\n\n  static async createFromNode(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    return await this.createFromNodeInternal(node, previousHash)\n  }\n\n  static async fromExtendedKey(key: string): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromExtendedKey(key)\n    /* TODO: Handle HDNodeVoidWallet */\n    return await HDWallet.createFromNode(node as HDNodeWallet)\n  }\n\n  static async fromMnemonic(mnemonic: Mnemonic, path: string = defaultPath): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromMnemonic(mnemonic, path)\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static async fromPhrase(phrase: string, path: string = defaultPath): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(phrase), path)\n  }\n\n  static async fromSeed(seed: string | ArrayBufferLike): Promise<WalletInstance> {\n    const node = HDNodeWallet.fromSeed(toUint8Array(seed))\n    const createdWallet = await this.createFromNodeInternal(node)\n    return this.getCachedWalletOrCacheNewWallet(createdWallet)\n  }\n\n  static generateMnemonic(wordlist: string[] = englishWordlist, strength: number = 256): string {\n    return generateMnemonic(wordlist, strength)\n  }\n\n  static override async random(): Promise<WalletInstance> {\n    return await this.fromMnemonic(Mnemonic.fromPhrase(HDWallet.generateMnemonic()))\n  }\n\n  protected static async createFromNodeInternal(node: HDNodeWallet, previousHash?: string): Promise<WalletInstance> {\n    const privateKey = toUint8Array(node.privateKey.replace('0x', ''))\n    assertEx(privateKey.length === 32, () => `Private key must be 32 bytes [${privateKey?.length}]`)\n    const newWallet = await new HDWallet(Account._protectedConstructorKey, node, await PrivateKey.create(privateKey.buffer)).loadPreviousHash(previousHash)\n    return HDWallet._addressMap[newWallet.address]?.deref() ?? newWallet\n  }\n\n  protected static getCachedWalletOrCacheNewWallet(createdWallet: WalletInstance): WalletInstance {\n    const existingWallet = this._addressMap[createdWallet.address]?.deref()\n    if (existingWallet) {\n      return existingWallet\n    }\n    const ref = new WeakRef(createdWallet)\n    this._addressMap[createdWallet.address] = ref\n    return createdWallet\n  }\n\n  async derivePath(path: string): Promise<WalletInstance> {\n    // if an absolute path, check if it matches the parent root and work with it\n    if (path.startsWith('m/')) {\n      const parentPath = this.path\n      if (parentPath !== null && path.startsWith(parentPath)) {\n        const childPath = path.slice(parentPath.length + 1)\n        return await HDWallet.createFromNode(this.node.derivePath(childPath))\n      }\n      throw new Error(`Invalid absolute path ${path} for wallet with path ${parentPath}`)\n    }\n    return await HDWallet.createFromNode(this.node.derivePath(path))\n  }\n\n  neuter: () => HDWallet = () => {\n    this.node.neuter()\n    return this\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/wallet",
-  "version": "4.3.0",
+  "version": "5.0.1",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -28,25 +28,29 @@
   },
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
+  "files": [
+    "dist",
+    "src"
+  ],
   "dependencies": {
-    "@scure/bip39": "^1.6.0",
-    "@xylabs/arraybuffer": "^4.15.0",
-    "@xylabs/assert": "^4.15.0",
-    "@xylabs/base": "^4.15.0",
-    "@xylabs/hex": "^4.15.0",
-    "@xylabs/static-implements": "^4.15.0",
-    "@xyo-network/account": "^4.3.0",
-    "@xyo-network/account-model": "^4.3.0",
-    "@xyo-network/key-model": "^4.3.0",
-    "@xyo-network/wallet-model": "^4.3.0",
-    "ethers": "^6.15.0"
+    "@scure/bip39": "~1.6.0",
+    "@xylabs/arraybuffer": "~5.0.3",
+    "@xylabs/assert": "~5.0.3",
+    "@xylabs/base": "~5.0.3",
+    "@xylabs/hex": "~5.0.3",
+    "@xylabs/static-implements": "~5.0.3",
+    "@xyo-network/account": "~5.0.1",
+    "@xyo-network/account-model": "~5.0.1",
+    "@xyo-network/key-model": "~5.0.1",
+    "@xyo-network/wallet-model": "~5.0.1",
+    "ethers": "~6.15.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^7.0.1",
-    "@xylabs/tsconfig": "^7.0.1",
-    "@xylabs/vitest-matchers": "^4.15.0",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "@xylabs/ts-scripts-yarn3": "~7.1.0",
+    "@xylabs/tsconfig": "~7.1.0",
+    "@xylabs/vitest-matchers": "~5.0.3",
+    "typescript": "~5.9.2",
+    "vitest": "~3.2.4"
   },
   "publishConfig": {
     "access": "public"

package/src/HDWallet.ts

@@ -25,12 +25,15 @@ export class HDWallet extends Account implements WalletInstance {
   static override readonly uniqueName = globallyUnique('HDWallet', HDWallet, 'xyo')
   protected static override _addressMap: Record<Address, WeakRef<WalletInstance>> = {}
 
+  protected readonly node: HDNodeWallet
+
   constructor(
-    key: unknown,
-    protected readonly node: HDNodeWallet,
+    key: symbol,
+    node: HDNodeWallet,
     privateKey: PrivateKeyInstance,
   ) {
-    super(Account._protectedConstructorKey, privateKey)
+    super(key, privateKey)
+    this.node = node
   }
 
   override get address(): Address {

package/src/spec/AddressRoundTrip.spec.ts

@@ -0,0 +1,17 @@
+import { Account } from '@xyo-network/account'
+import {
+  describe, expect, it,
+} from 'vitest'
+
+import { HDWallet } from '../HDWallet.ts'
+
+describe('Address', () => {
+  it('should round trip from BigInt', async () => {
+    for (let index = 0; index < 100; index++) {
+      const foo = await HDWallet.random()
+      const privateKey = BigInt(foo.privateKey)
+      const sharedAccount = await Account.fromPrivateKey(privateKey)
+      expect(sharedAccount).toBeDefined()
+    }
+  })
+})

package/src/spec/HDWallet/HDWallet.browser.spec.ts

@@ -0,0 +1,20 @@
+import {
+  describe, expect, it,
+} from 'vitest'
+
+// import { HDWallet } from '../../HDWallet'
+// import { generateHDWalletTests } from './HDWallet.spec'
+
+/**
+ * @group jsdom
+ */
+/* describe.skip('Node Wallet Test', () => {
+  generateHDWalletTests('HDWallet: Browser', HDWallet)
+})
+*/
+
+describe('Node Wallet Test - Commented Out', () => {
+  it('Stub', () => {
+    expect(true).toBe(true)
+  })
+})

package/src/spec/HDWallet/HDWallet.node.spec.ts

@@ -0,0 +1,11 @@
+import { describe } from 'vitest'
+
+import { HDWallet } from '../../HDWallet.ts'
+import { generateHDWalletTests } from './HDWallet.spec.ts'
+
+/**
+ * @group nodejs
+ */
+describe('Node Wallet Test', () => {
+  generateHDWalletTests('HDWallet: Node', HDWallet)
+})

package/src/spec/HDWallet/HDWallet.spec.ts

@@ -0,0 +1,228 @@
+import type { Address, Hex } from '@xylabs/hex'
+import { isAddress } from '@xylabs/hex'
+import { matchers } from '@xylabs/vitest-matchers'
+import type { WalletInstance, WalletStatic } from '@xyo-network/wallet-model'
+import {
+  defaultPath, Mnemonic, SigningKey,
+} from 'ethers'
+import {
+  describe, expect, it,
+  test,
+} from 'vitest'
+
+expect.extend(matchers)
+
+import { HDWallet } from '../../HDWallet.ts'
+
+/**
+ * The wallet types that can be tested
+ */
+type Wallet = HDWallet | WalletInstance
+
+/**
+ * The serializable information of a wallet
+ */
+interface WalletSnapshot {
+  address: Address
+  path: string | null
+  privateKey: Hex
+  publicKey: Hex
+}
+
+/**
+ * Converts a compressed public key to an uncompressed public key
+ * @param compressed The compressed public key
+ * @returns The uncompressed public key
+ */
+const toUncompressedPublicKey = (compressed: string): string => SigningKey.computePublicKey(compressed, false).toLowerCase().replace('0x04', '')
+
+/**
+ * Standardizes the representation of a hex string
+ * @param unformatted The unformatted hex string
+ * @returns The formatted hex string
+ */
+const formatHexString = (unformatted: string): string => unformatted.toLowerCase().replace('0x', '')
+
+/**
+ * Serializes a wallet to its snapshot representation
+ * @param wallet The wallet to snapshot
+ * @returns The snapshot representation of the wallet
+ */
+const toWalletSnapshot = (wallet: Wallet): WalletSnapshot => {
+  const {
+    address, path, privateKey, publicKey,
+  } = wallet as WalletInstance
+  return {
+    address, path, privateKey, publicKey,
+  }
+}
+
+/**
+ * Snapshots the instances of two wallets to ensure repeatability
+ * of creation from the same source and prevent unintentional changes
+ * to the wallet protocol
+ * @param walletA The first wallet to snapshot
+ * @param walletB The second wallet to snapshot
+ */
+const snapshotWalletInstances = (walletA: Wallet, walletB: Wallet) => {
+  expect(toWalletSnapshot(walletA)).toMatchSnapshot()
+  expect([toWalletSnapshot(walletA), toWalletSnapshot(walletB)]).toMatchSnapshot()
+}
+
+/**
+ * Compares two wallets to ensure their public/private keys are equal
+ * @param sutA The first wallet to compare
+ * @param sutB The second wallet to compare
+ */
+const expectWalletsEqual = (sutA: WalletInstance, sutB: Wallet) => {
+  expect(sutA.address).toEqual(formatHexString(sutB.address))
+  expect(sutA.privateKey).toEqual(sutB.privateKey)
+  expect(sutA.private?.hex).toEqual(formatHexString(sutB.privateKey))
+  expect(sutA.publicKey).toEqual(sutB.publicKey)
+  expect(sutA.public?.hex).toEqual(toUncompressedPublicKey(sutB.publicKey))
+}
+
+/**
+ * Compares two wallets to ensure their public/private keys and paths are equal
+ * @param sutA The first wallet to compare
+ * @param sutB The second wallet to compare
+ */
+const expectWalletsAndPathsEqual = (sutA: WalletInstance, sutB: Wallet) => {
+  expectWalletsEqual(sutA, sutB)
+  expect(sutA.path).toEqual(sutB.path)
+}
+
+/**
+ * Generates tests for a wallet type
+ * @param title The title of the test suite
+ * @param HDWallet The wallet type to test
+ */
+export const generateHDWalletTests = (title: string, HDWallet: WalletStatic) => {
+  describe(title, () => {
+    const phrase = 'later puppy sound rebuild rebuild noise ozone amazing hope broccoli crystal grief'
+    const paths = ['0/4', "44'/0'/0'", "44'/60'/0'/0/0", "44'/60'/0'/0/1", "49'/0'/0'", "84'/0'/0'", "84'/0'/0'/0"]
+
+    describe('constructor', () => {
+      it('can be created from mnemonic', async () => {
+        const sut = await HDWallet.fromPhrase(phrase)
+        console.log('address', sut.address)
+        console.log('privateKeyX', sut.privateKey)
+        const mnemonic = Mnemonic.fromPhrase(phrase)
+        console.log('mnemonic.entropy', mnemonic.entropy)
+        expect(isAddress(sut.address)).toBe(true)
+        expect(sut).toBeDefined()
+      })
+      it.each(paths)('works repeatably & interoperably with Ethers', async (path: string) => {
+        const sutA = await HDWallet.fromPhrase(phrase)
+        const sutB = await HDWallet.fromMnemonic(Mnemonic.fromPhrase(phrase))
+        expectWalletsAndPathsEqual(sutA, sutB)
+        snapshotWalletInstances(sutA, sutB)
+        const accountA = await sutA.derivePath(path)
+        const accountB = await sutB.derivePath(path)
+        expectWalletsAndPathsEqual(accountA, accountB)
+        snapshotWalletInstances(accountA, accountB)
+      })
+    })
+    describe('derivePath', () => {
+      it.each(paths)('works repeatably & interoperably from phrase & extended key', async (path: string) => {
+        const sutA = await HDWallet.fromPhrase(phrase)
+        const sutB = await HDWallet.fromExtendedKey(sutA.extendedKey)
+        expectWalletsEqual(sutA, sutB)
+        expect(sutA.path).not.toBeNull()
+        expect(sutB.path).not.toBeNull()
+        snapshotWalletInstances(sutA, sutB)
+        const accountA = await sutA.derivePath?.(path)
+        const accountB = await sutB.derivePath?.(path)
+        expectWalletsEqual(accountA, accountB)
+        expect(accountA.path).not.toBeNull()
+        expect(accountB.path).not.toBeNull()
+        snapshotWalletInstances(accountA, accountB)
+      })
+
+      it('works when paths provided incrementally', async () => {
+        const parentRelativePath = "44'/60'/0'"
+        const childRelativePath = '0/1'
+        const sutA = await HDWallet.fromPhrase(phrase)
+        const sutB = await HDWallet.fromPhrase(phrase)
+        expectWalletsAndPathsEqual(sutA, sutB)
+        snapshotWalletInstances(sutA, sutB)
+        const accountA = await (await sutA.derivePath(parentRelativePath)).derivePath?.(childRelativePath)
+        const accountB = await sutB.derivePath?.([parentRelativePath, childRelativePath].join('/'))
+        expectWalletsAndPathsEqual(accountA, accountB)
+        snapshotWalletInstances(accountA, accountB)
+      })
+      it('works when paths provided absolutely', async () => {
+        const parentAbsolutePath = "m/44'/60'/0'"
+        const childRelativePath = '0/1'
+        const absolutePath = [parentAbsolutePath, childRelativePath].join('/')
+        const sutA = await HDWallet.fromPhrase(phrase, absolutePath)
+        const sutB = await HDWallet.fromPhrase(phrase, parentAbsolutePath)
+        expect(sutA.path).toEqual(absolutePath)
+        expect(sutB.path).toEqual(parentAbsolutePath)
+        // Skip intermediate snapshot since wallets currently have different paths
+        // snapshotWalletInstances(sutA, sutB)
+        const accountA = sutA
+        const accountB = await sutB.derivePath(childRelativePath)
+        expectWalletsAndPathsEqual(accountA, accountB)
+        // accountA and accountB should be the same instance
+        // expect(accountA).toBe(accountB)
+        snapshotWalletInstances(accountA, accountB)
+      })
+      it('returns cached instances on subsequent requests', async () => {
+        const parent = "44'/60'/0'"
+        const child = '0/1'
+        const sutA = await HDWallet.fromPhrase(phrase)
+        const sutB = await HDWallet.fromPhrase(phrase)
+        expectWalletsAndPathsEqual(sutA, sutB)
+        // sutA and sutB should be the same instance
+        expect(sutA).toBe(sutB)
+        const accountA = await (await sutA.derivePath(parent)).derivePath?.(child)
+        const accountB = await sutB.derivePath?.([parent, child].join('/'))
+        expectWalletsAndPathsEqual(accountA, accountB)
+        // accountA and accountB should be the same instance
+        // expect(accountA).toBe(accountB)
+        snapshotWalletInstances(accountA, accountB)
+      })
+    })
+  })
+}
+
+test('HDWallet tests generator is defined', () => {
+  expect(typeof generateHDWalletTests).toBe('function')
+})
+
+test('Same address, two paths', async () => {
+  const sut = await HDWallet.fromMnemonic(Mnemonic.fromPhrase('later puppy sound rebuild rebuild noise ozone amazing hope broccoli crystal grief'))
+  const accountNode = await sut.derivePath('0')
+  expect(accountNode.path).toBe(`${defaultPath}/0`)
+  const accountA = await sut.derivePath('0/2')
+  const accountB = await accountNode.derivePath('2')
+  const accountAPrime = await accountNode.derivePath("0'/2")
+  const accountAPrime2 = await accountNode.derivePath("0/2'")
+  expect(accountA.address).toEqual(accountB.address)
+  expect(accountNode.address === accountB.address).toBe(false)
+  expect(accountA.address === accountAPrime.address).toBe(false)
+  expect(accountA.address === accountAPrime2.address).toBe(false)
+
+  expect(accountNode.address).toMatchSnapshot()
+  expect(accountA.address).toMatchSnapshot()
+  expect(accountB.address).toMatchSnapshot()
+  expect(accountAPrime.address).toMatchSnapshot()
+})
+
+test('Random Wallet', async () => {
+  const sut = await HDWallet.random()
+  expect(sut).toBeDefined()
+  expect(sut.address).toBeDefined()
+  expect(sut.privateKey).toBeDefined()
+  expect(sut.publicKey).toBeDefined()
+  expect(sut.extendedKey).toBeDefined()
+  expect(sut.path).toBeDefined()
+  expect(sut.path).toBe(defaultPath)
+})
+
+test('HDWallet can be created from mnemonic', async () => {
+  const sut = await HDWallet.fromPhrase('abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about', "m/44'/0'/0'/0/0")
+  expect(sut).toBeDefined()
+  console.log('privateKey', sut.privateKey)
+})