@bsv/wallet-toolbox 1.5.10 → 1.5.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.5.10",
+  "version": "1.5.12",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@bsv/auth-express-middleware": "^1.2.0",
     "@bsv/payment-express-middleware": "^1.2.1",
-    "@bsv/sdk": "^1.6.12",
+    "@bsv/sdk": "^1.6.16",
     "express": "^4.21.2",
     "idb": "^8.0.2",
     "knex": "^3.1.0",

package/src/Setup.ts

@@ -1,11 +1,13 @@
 import { KeyPairAddress, SetupWallet, SetupWalletClient } from './SetupWallet'
 import {
   BEEF,
+  CachedKeyDeriver,
   CreateActionArgs,
   CreateActionOptions,
   CreateActionOutput,
   CreateActionResult,
   KeyDeriver,
+  KeyDeriverApi,
   LockingScript,
   P2PKH,
   PrivateKey,
@@ -142,7 +144,7 @@ DEV_KEYS = '{
     args.rootKeyHex ||= args.env.devKeys[args.env.identityKey]
     const rootKey = PrivateKey.fromHex(args.rootKeyHex)
     const identityKey = rootKey.toPublicKey().toString()
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
     const storage = new WalletStorageManager(identityKey, args.active, args.backups)
     if (storage.canMakeAvailable()) await storage.makeAvailable()
     const serviceOptions = Services.createDefaultOptions(chain)
@@ -196,7 +198,7 @@ DEV_KEYS = '{
     const chain = args.chain
     const endpointUrl = args.storageUrl || `https://${args.chain !== 'main' ? 'staging-' : ''}storage.babbage.systems`
     const rootKey = PrivateKey.fromHex(args.rootKeyHex)
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
     const storage = new WalletStorageManager(keyDeriver.identityKey)
     const services = new Services(chain)
     const privilegedKeyManager = args.privilegedKeyGetter
@@ -512,7 +514,7 @@ export interface SetupWalletKnex extends SetupWallet {
 
   rootKey: PrivateKey
   identityKey: string
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   chain: sdk.Chain
   storage: WalletStorageManager
   services: Services

package/src/SetupClient.ts

@@ -1,10 +1,12 @@
 import {
   BEEF,
+  CachedKeyDeriver,
   CreateActionArgs,
   CreateActionOptions,
   CreateActionOutput,
   CreateActionResult,
   KeyDeriver,
+  KeyDeriverApi,
   LockingScript,
   P2PKH,
   PrivateKey,
@@ -34,7 +36,7 @@ export abstract class SetupClient {
     const chain = args.chain
     const rootKey = PrivateKey.fromHex(args.rootKeyHex)
     const identityKey = rootKey.toPublicKey().toString()
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
     const storage = new WalletStorageManager(identityKey, args.active, args.backups)
     if (storage.canMakeAvailable()) await storage.makeAvailable()
     const serviceOptions = Services.createDefaultOptions(chain)
@@ -84,7 +86,7 @@ export abstract class SetupClient {
     const chain = args.chain
     const endpointUrl = args.storageUrl || `https://${args.chain !== 'main' ? 'staging-' : ''}storage.babbage.systems`
     const rootKey = PrivateKey.fromHex(args.rootKeyHex)
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
     const storage = new WalletStorageManager(keyDeriver.identityKey)
     const services = new Services(chain)
     const privilegedKeyManager = args.privilegedKeyGetter
@@ -290,7 +292,7 @@ export interface SetupWalletIdb extends SetupWallet {
 
   rootKey: PrivateKey
   identityKey: string
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   chain: sdk.Chain
   storage: WalletStorageManager
   services: Services

package/src/SetupWallet.ts

@@ -1,4 +1,4 @@
-import { PrivateKey, KeyDeriver, PublicKey } from '@bsv/sdk'
+import { PrivateKey, KeyDeriver, PublicKey, KeyDeriverApi } from '@bsv/sdk'
 import { WalletStorageManager, Monitor, sdk } from './index.client'
 import { Services } from './services'
 import { Wallet } from './Wallet'
@@ -23,7 +23,7 @@ export interface SetupWallet {
   /**
    * The `KeyDeriver` component used by the wallet for key derivation and cryptographic functions.
    */
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   /**
    * The chain ('main' or 'test') which the wallet accesses.
    */

package/src/Wallet.ts

@@ -65,7 +65,8 @@ import {
   Certificate,
   LookupResolver,
   AtomicBEEF,
-  BEEF
+  BEEF,
+  KeyDeriverApi
 } from '@bsv/sdk'
 import * as sdk from './sdk'
 import { acquireDirectCertificate } from './signer/methods/acquireDirectCertificate'
@@ -92,7 +93,7 @@ import { ScriptTemplateBRC29 } from './utility/ScriptTemplateBRC29'
 
 export interface WalletArgs {
   chain: sdk.Chain
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   storage: WalletStorageManager
   services?: sdk.WalletServices
   monitor?: Monitor
@@ -107,7 +108,7 @@ function isWalletSigner(args: WalletArgs | WalletSigner): args is WalletSigner {
 
 export class Wallet implements WalletInterface, ProtoWallet {
   chain: sdk.Chain
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   storage: WalletStorageManager
   settingsManager: WalletSettingsManager
   lookupResolver: LookupResolver

package/src/__tests/WalletPermissionsManager.proxying.test.ts

@@ -679,7 +679,7 @@ describe('WalletPermissionsManager - Regression & Integration with Underlying Wa
     const result = await manager.waitForAuthentication({}, 'someone.com')
     expect(result.authenticated).toBe(true)
     expect(underlying.waitForAuthentication).toHaveBeenCalledTimes(1)
-  })
+  }, 30000)
 
   it('should proxy getHeight', async () => {
     const result = await manager.getHeight({}, 'someone.com')

package/src/services/__tests/ARC.timeout.man.test.ts

@@ -17,18 +17,61 @@ describe('ARC tests', () => {
     const requestOptions: HttpClientRequestOptions = {
       method: 'POST',
       headers,
-      data: { rawTx: beef905631 }
+      data: { rawTx: beef905631 },
+      signal: AbortSignal.timeout(100)
     }
 
-    requestOptions['signal'] = AbortSignal.timeout(5000)
+    try {
+      const response = await httpClient.request(url, requestOptions)
+      expect(true).toBe(false) // Should not reach here, expect an error
+    } catch (error: any) {
+      console.log('Error posting to TAAL:', error.message)
+      expect(error.code).toBe('ABORT_ERR')
+    }
 
     try {
+      requestOptions.signal = AbortSignal.timeout(30000) // 30 seconds timeout
       const response = await httpClient.request(url, requestOptions)
       expect(response.status).toBe(200)
+    } catch (error: any) {
+      console.log('Error posting to TAAL:', error.message)
+      expect(true).toBe(false) // Should not reach here, expect an error
+    }
+  })
+
+  test('12 post to GorillaPool for timeout', async () => {
+    const httpClient = defaultHttpClient()
+    const url = `https://arc.gorillapool.io/v1/tx`
+
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+      'XDeployment-ID': 'wallet-toolbox-test11',
+      //Authorization: `Bearer ${envMain.gorillaPoolApiKey}`
+    }
+
+    const requestOptions: HttpClientRequestOptions = {
+      method: 'POST',
+      headers,
+      data: { rawTx: beef905631 },
+      signal: AbortSignal.timeout(100)
+    }
+
+    try {
+      const response = await httpClient.request(url, requestOptions)
+      expect(true).toBe(false) // Should not reach here, expect an error
     } catch (error: any) {
       console.log('Error posting to TAAL:', error.message)
       expect(error.code).toBe('ABORT_ERR')
     }
+
+    try {
+      requestOptions.signal = AbortSignal.timeout(30000) // 30 seconds timeout
+      const response = await httpClient.request(url, requestOptions)
+      expect(response.status).toBe(200)
+    } catch (error: any) {
+      console.log('Error posting to TAAL:', error.message)
+      expect(true).toBe(false) // Should not reach here, expect an error
+    }
   })
 })
 

package/src/services/providers/ARC.ts

@@ -135,7 +135,8 @@ export class ARC {
     const requestOptions: HttpClientRequestOptions = {
       method: 'POST',
       headers: this.requestHeaders(),
-      data: { rawTx }
+      data: { rawTx },
+      signal: AbortSignal.timeout(1000 * 30) // 30 seconds timeout, error.code will be 'ABORT_ERR'
     }
 
     const r: sdk.PostTxResultForTxid = {
@@ -143,8 +144,6 @@ export class ARC {
       status: 'success',
       notes: []
     }
-    // Set a timeout on the request
-    requestOptions['signal'] = AbortSignal.timeout(1000 * 30) // 30 seconds timeout, error.code will be 'ABORT_ERR'
 
     const url = `${this.URL}/v1/tx`
     const nn = () => ({ name: this.name, when: new Date().toISOString() })

package/src/signer/WalletSigner.ts

@@ -1,4 +1,4 @@
-import { KeyDeriver } from '@bsv/sdk'
+import { KeyDeriver, KeyDeriverApi } from '@bsv/sdk'
 import { sdk } from '../index.client'
 import { WalletStorageManager } from '../storage/WalletStorageManager'
 
@@ -6,10 +6,10 @@ export class WalletSigner {
   isWalletSigner: true = true
 
   chain: sdk.Chain
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   storage: WalletStorageManager
 
-  constructor(chain: sdk.Chain, keyDeriver: KeyDeriver, storage: WalletStorageManager) {
+  constructor(chain: sdk.Chain, keyDeriver: KeyDeriverApi, storage: WalletStorageManager) {
     this.chain = chain
     this.keyDeriver = keyDeriver
     this.storage = storage

package/src/utility/ScriptTemplateBRC29.ts

@@ -9,7 +9,8 @@ import {
   LockingScript,
   P2PKH,
   PrivateKey,
-  Script
+  Script,
+  CachedKeyDeriver
 } from '@bsv/sdk'
 
 export const brc29ProtocolID: WalletProtocol = [2, '3241645161d8']
@@ -41,7 +42,7 @@ export class ScriptTemplateBRC29 implements ScriptTemplate {
   getKeyDeriver(privKey: PrivateKey | HexString): KeyDeriverApi {
     if (typeof privKey === 'string') privKey = PrivateKey.fromHex(privKey)
     if (!this.params.keyDeriver || this.params.keyDeriver.rootKey.toHex() !== privKey.toHex())
-      return new KeyDeriver(privKey)
+      return new CachedKeyDeriver(privKey)
     return this.params.keyDeriver
   }
 

package/test/Wallet/live/walletLive.man.test.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import {
   Beef,
+  CachedKeyDeriver,
   CreateActionArgs,
   InternalizeActionArgs,
   KeyDeriver,
@@ -426,7 +427,7 @@ export function createWalletPaymentOutput(args: {
   const t = new ScriptTemplateBRC29({
     derivationPrefix: randomBytesBase64(8),
     derivationSuffix: randomBytesBase64(8),
-    keyDeriver: new KeyDeriver(PrivateKey.fromString(args.fromRootKeyHex))
+    keyDeriver: new CachedKeyDeriver(PrivateKey.fromString(args.fromRootKeyHex))
   })
 
   const lockingScript = t.lock(args.fromRootKeyHex, args.toIdentityKey)

package/test/utils/TestUtilsWalletStorage.ts

@@ -1,10 +1,12 @@
 import {
   Beef,
+  CachedKeyDeriver,
   CreateActionArgs,
   CreateActionOutput,
   CreateActionResult,
   HexString,
   KeyDeriver,
+  KeyDeriverApi,
   P2PKH,
   PrivateKey,
   PublicKey,
@@ -309,7 +311,7 @@ export abstract class TestUtilsWalletStorage {
     args.rootKeyHex ||= '1'.repeat(64)
     const rootKey = PrivateKey.fromHex(args.rootKeyHex)
     const identityKey = rootKey.toPublicKey().toString()
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
     const chain = args.chain
     const storage = new WalletStorageManager(identityKey, args.active, args.backups)
     if (storage.canMakeAvailable()) await storage.makeAvailable()
@@ -807,7 +809,7 @@ export abstract class TestUtilsWalletStorage {
     const rootKeyHex = _tu.legacyRootKeyHex
     const identityKey = '03ac2d10bdb0023f4145cc2eba2fcd2ad3070cb2107b0b48170c46a9440e4cc3fe'
     const rootKey = PrivateKey.fromHex(rootKeyHex)
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
     const activeStorage = new StorageKnex({
       chain,
       knex: walletKnex,
@@ -977,7 +979,7 @@ export abstract class TestUtilsWalletStorage {
     const rootKeyHex = _tu.legacyRootKeyHex
     const identityKey = '03ac2d10bdb0023f4145cc2eba2fcd2ad3070cb2107b0b48170c46a9440e4cc3fe'
     const rootKey = PrivateKey.fromHex(rootKeyHex)
-    const keyDeriver = new KeyDeriver(rootKey)
+    const keyDeriver = new CachedKeyDeriver(rootKey)
 
     const activeStorage = new StorageIdb({
       chain,
@@ -1835,7 +1837,7 @@ export interface TestWalletProvider<T> extends TestWalletOnly {
 
   rootKey: PrivateKey
   identityKey: string
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   chain: sdk.Chain
   storage: WalletStorageManager
   services: Services
@@ -1853,7 +1855,7 @@ export interface TestWallet<T> extends TestWalletOnly {
 
   rootKey: PrivateKey
   identityKey: string
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   chain: sdk.Chain
   storage: WalletStorageManager
   services: Services
@@ -1867,7 +1869,7 @@ export interface TestWallet<T> extends TestWalletOnly {
 export interface TestWalletOnly {
   rootKey: PrivateKey
   identityKey: string
-  keyDeriver: KeyDeriver
+  keyDeriver: KeyDeriverApi
   chain: sdk.Chain
   storage: WalletStorageManager
   services: Services