@bsv/wallet-toolbox 1.5.21 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.5.21",
+  "version": "1.6.1",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -32,20 +32,23 @@
   "dependencies": {
     "@bsv/auth-express-middleware": "^1.2.3",
     "@bsv/payment-express-middleware": "^1.2.3",
-    "@bsv/sdk": "^1.6.23",
+    "@bsv/sdk": "^1.6.24",
     "express": "^4.21.2",
     "idb": "^8.0.2",
     "knex": "^3.1.0",
     "mysql2": "^3.12.0",
-    "sqlite3": "^5.1.7"
+    "sqlite3": "^5.1.7",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
+    "@types/cors": "^2.8.13",
     "@types/diff": "^6.0.0",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.4.0",
     "@types/jest-diff": "^20.0.1",
-    "@types/node": "^20.8.2",
+    "@types/node": "^22.5.0",
     "chalk": "^4.1.2",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.7",
     "fake-indexeddb": "^6.0.0",
     "fs-extra": "^11.2.0",
@@ -56,6 +59,6 @@
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "ts2md": "^0.2.8",
-    "typescript": "^5.2.2"
+    "typescript": "^5.5.4"
   }
 }

package/src/CWIStyleWalletManager.ts

@@ -112,7 +112,7 @@ async function pbkdf2NativeOrJs(
       )
       return Array.from(new Uint8Array(bits))
     } catch (err) {
-      console.warn('[pbkdf2] WebCrypto path failed → falling back to JS implementation', err)
+      //console.warn('[pbkdf2] WebCrypto path failed → falling back to JS implementation', err)
       /* fall through */
     }
   }

package/src/Setup.ts

@@ -1,3 +1,4 @@
+import { Knex, knex as makeKnex } from 'knex'
 import { KeyPairAddress, SetupWallet, SetupWalletClient } from './SetupWallet'
 import {
   BEEF,
@@ -12,24 +13,25 @@ import {
   P2PKH,
   PrivateKey,
   PublicKey,
+  ScriptTemplateUnlock,
   WalletInterface
 } from '@bsv/sdk'
-import {
-  Monitor,
-  randomBytesHex,
-  sdk,
-  Services,
-  StorageClient,
-  StorageKnex,
-  verifyTruthy,
-  Wallet,
-  WalletStorageManager
-} from './index.all'
-import { Knex, knex as makeKnex } from 'knex'
+import { Chain } from './sdk/types'
+import { verifyTruthy } from './utility/utilityHelpers'
+import { WERR_INVALID_OPERATION } from './sdk/WERR_errors'
+import { WalletStorageManager } from './storage/WalletStorageManager'
+import { Services } from './services/Services'
+import { Monitor } from './monitor/Monitor'
+import { PrivilegedKeyManager } from './sdk/PrivilegedKeyManager'
+import { Wallet } from './Wallet'
+import { StorageClient } from './storage/remoting/StorageClient'
+import { StorageKnex } from './storage/StorageKnex'
+import { WalletStorageProvider } from './sdk/WalletStorage.interfaces'
 
-import * as dotenv from 'dotenv'
 // To rely on your own headers service, uncomment the following line:
 // import { BHServiceClient } from './services/chaintracker'
+
+import * as dotenv from 'dotenv'
 dotenv.config()
 
 /**
@@ -43,7 +45,7 @@ export abstract class Setup {
    * @param chain
    * @returns true if .env is not valid for chain
    */
-  static noEnv(chain: sdk.Chain): boolean {
+  static noEnv(chain: Chain): boolean {
     try {
       Setup.getEnv(chain)
       return false
@@ -105,7 +107,7 @@ DEV_KEYS = '{
    *
    * @publicbody
    */
-  static getEnv(chain: sdk.Chain): SetupEnv {
+  static getEnv(chain: Chain): SetupEnv {
     // Identity keys of the lead maintainer of this repo...
     const identityKey = chain === 'main' ? process.env.MY_MAIN_IDENTITY : process.env.MY_TEST_IDENTITY
     const identityKey2 = chain === 'main' ? process.env.MY_MAIN_IDENTITY2 : process.env.MY_TEST_IDENTITY2
@@ -117,8 +119,7 @@ DEV_KEYS = '{
       `.env value for '${chain.toUpperCase()}_TAAL_API_KEY' is required.`
     )
 
-    if (!identityKey || !identityKey2)
-      throw new sdk.WERR_INVALID_OPERATION('.env is not a valid SetupEnv configuration.')
+    if (!identityKey || !identityKey2) throw new WERR_INVALID_OPERATION('.env is not a valid SetupEnv configuration.')
 
     return {
       chain,
@@ -158,7 +159,7 @@ DEV_KEYS = '{
     const monitor = new Monitor(monopts)
     monitor.addDefaultTasks()
     const privilegedKeyManager = args.privilegedKeyGetter
-      ? new sdk.PrivilegedKeyManager(args.privilegedKeyGetter)
+      ? new PrivilegedKeyManager(args.privilegedKeyGetter)
       : undefined
     const wallet = new Wallet({
       chain,
@@ -190,7 +191,7 @@ DEV_KEYS = '{
    * @param args.privilegedKeyGetter - Optional. Method that will return the privileged `PrivateKey`, on demand.
    */
   static async createWalletClientNoEnv(args: {
-    chain: sdk.Chain
+    chain: Chain
     rootKeyHex: string
     storageUrl?: string
     privilegedKeyGetter?: () => Promise<PrivateKey>
@@ -202,7 +203,7 @@ DEV_KEYS = '{
     const storage = new WalletStorageManager(keyDeriver.identityKey)
     const services = new Services(chain)
     const privilegedKeyManager = args.privilegedKeyGetter
-      ? new sdk.PrivilegedKeyManager(args.privilegedKeyGetter)
+      ? new PrivilegedKeyManager(args.privilegedKeyGetter)
       : undefined
     const wallet = new Wallet({
       chain,
@@ -259,7 +260,7 @@ DEV_KEYS = '{
   /**
    * @publicbody
    */
-  static getUnlockP2PKH(priv: PrivateKey, satoshis: number): sdk.ScriptTemplateUnlock {
+  static getUnlockP2PKH(priv: PrivateKey, satoshis: number): ScriptTemplateUnlock {
     const p2pkh = new P2PKH()
     const lock = Setup.getLockP2PKH(Setup.getKeyPair(priv).address)
     // Prepare to pay with SIGHASH_ALL and without ANYONE_CAN_PAY.
@@ -475,11 +476,11 @@ export interface SetupWalletArgs {
   /**
    * Optional. Active wallet storage. Can be added later.
    */
-  active?: sdk.WalletStorageProvider
+  active?: WalletStorageProvider
   /**
    * Optional. One or more storage providers managed as backup destinations. Can be added later.
    */
-  backups?: sdk.WalletStorageProvider[]
+  backups?: WalletStorageProvider[]
 }
 
 /**
@@ -515,7 +516,7 @@ export interface SetupWalletKnex extends SetupWallet {
   rootKey: PrivateKey
   identityKey: string
   keyDeriver: KeyDeriverApi
-  chain: sdk.Chain
+  chain: Chain
   storage: WalletStorageManager
   services: Services
   monitor: Monitor
@@ -533,7 +534,7 @@ export interface SetupEnv {
   /**
    * The chan being accessed: 'main' for mainnet, 'test' for 'testnet'.
    */
-  chain: sdk.Chain
+  chain: Chain
   /**
    * The user's primary identity key (public key).
    */
@@ -573,3 +574,6 @@ export interface SetupWalletClientArgs extends SetupWalletArgs {
    */
   endpointUrl?: string
 }
+function randomBytesHex(arg0: number): string {
+  throw new Error('Function not implemented.')
+}

package/src/SetupClient.ts

@@ -11,11 +11,19 @@ import {
   P2PKH,
   PrivateKey,
   PublicKey,
+  ScriptTemplateUnlock,
   WalletInterface
 } from '@bsv/sdk'
-import { Monitor, randomBytesHex, sdk, Services, StorageClient, Wallet, WalletStorageManager } from './index.client'
 import { KeyPairAddress, SetupClientWalletArgs, SetupWallet, SetupWalletClient } from './SetupWallet'
 import { StorageIdb } from './storage/StorageIdb'
+import { WalletStorageManager } from './storage/WalletStorageManager'
+import { Services } from './services/Services'
+import { Monitor } from './monitor/Monitor'
+import { PrivilegedKeyManager } from './sdk/PrivilegedKeyManager'
+import { Wallet } from './Wallet'
+import { Chain } from './sdk/types'
+import { randomBytesHex } from './utility/utilityHelpers'
+import { StorageClient } from './storage/remoting/StorageClient'
 
 /**
  * The 'Setup` class provides static setup functions to construct BRC-100 compatible
@@ -46,7 +54,7 @@ export abstract class SetupClient {
     const monitor = new Monitor(monopts)
     monitor.addDefaultTasks()
     const privilegedKeyManager = args.privilegedKeyGetter
-      ? new sdk.PrivilegedKeyManager(args.privilegedKeyGetter)
+      ? new PrivilegedKeyManager(args.privilegedKeyGetter)
       : undefined
     const wallet = new Wallet({
       chain,
@@ -78,7 +86,7 @@ export abstract class SetupClient {
    * @param args.privilegedKeyGetter - Optional. Method that will return the privileged `PrivateKey`, on demand.
    */
   static async createWalletClientNoEnv(args: {
-    chain: sdk.Chain
+    chain: Chain
     rootKeyHex: string
     storageUrl?: string
     privilegedKeyGetter?: () => Promise<PrivateKey>
@@ -90,7 +98,7 @@ export abstract class SetupClient {
     const storage = new WalletStorageManager(keyDeriver.identityKey)
     const services = new Services(chain)
     const privilegedKeyManager = args.privilegedKeyGetter
-      ? new sdk.PrivilegedKeyManager(args.privilegedKeyGetter)
+      ? new PrivilegedKeyManager(args.privilegedKeyGetter)
       : undefined
     const wallet = new Wallet({
       chain,
@@ -146,7 +154,7 @@ export abstract class SetupClient {
   /**
    * @publicbody
    */
-  static getUnlockP2PKH(priv: PrivateKey, satoshis: number): sdk.ScriptTemplateUnlock {
+  static getUnlockP2PKH(priv: PrivateKey, satoshis: number): ScriptTemplateUnlock {
     const p2pkh = new P2PKH()
     const lock = SetupClient.getLockP2PKH(SetupClient.getKeyPair(priv).address)
     // Prepare to pay with SIGHASH_ALL and without ANYONE_CAN_PAY.
@@ -293,7 +301,7 @@ export interface SetupWalletIdb extends SetupWallet {
   rootKey: PrivateKey
   identityKey: string
   keyDeriver: KeyDeriverApi
-  chain: sdk.Chain
+  chain: Chain
   storage: WalletStorageManager
   services: Services
   monitor: Monitor

package/src/SetupWallet.ts

@@ -1,7 +1,10 @@
 import { PrivateKey, KeyDeriver, PublicKey, KeyDeriverApi } from '@bsv/sdk'
-import { WalletStorageManager, Monitor, sdk } from './index.client'
-import { Services } from './services'
 import { Wallet } from './Wallet'
+import { Chain } from './sdk/types'
+import { WalletStorageManager } from './storage/WalletStorageManager'
+import { Services } from './services/Services'
+import { Monitor } from './monitor/Monitor'
+import { WalletStorageProvider } from './sdk/WalletStorage.interfaces'
 
 /**
  * When creating a BRC-100 compatible `Wallet`, many components come into play.
@@ -27,7 +30,7 @@ export interface SetupWallet {
   /**
    * The chain ('main' or 'test') which the wallet accesses.
    */
-  chain: sdk.Chain
+  chain: Chain
   /**
    * The `WalletStorageManager` that manages all the configured storage providers (active and backups)
    * accessed by the wallet.
@@ -70,7 +73,7 @@ export interface KeyPairAddress {
  */
 
 export interface SetupClientWalletArgs {
-  chain: sdk.Chain
+  chain: Chain
   /**
    * The non-privileged private key used to initialize the `KeyDeriver` and determine the `identityKey`.
    */
@@ -83,11 +86,11 @@ export interface SetupClientWalletArgs {
   /**
    * Optional. Active wallet storage. Can be added later.
    */
-  active?: sdk.WalletStorageProvider
+  active?: WalletStorageProvider
   /**
    * Optional. One or more storage providers managed as backup destinations. Can be added later.
    */
-  backups?: sdk.WalletStorageProvider[]
+  backups?: WalletStorageProvider[]
 
   taalApiKey?: string
 }