@bsv/wallet-toolbox 1.5.21 → 1.6.1

package/src/services/Services.ts

@@ -1,37 +1,63 @@
 import { Transaction as BsvTransaction, Beef, ChainTracker, Utils } from '@bsv/sdk'
-import { asArray, asString, doubleSha256BE, sdk, sha256Hash, TableOutput, wait } from '../index.client'
 import { ServiceCollection, ServiceToCall } from './ServiceCollection'
 import { createDefaultWalletServicesOptions } from './createDefaultWalletServicesOptions'
-import { ChaintracksChainTracker } from './chaintracker'
 import { WhatsOnChain } from './providers/WhatsOnChain'
-import { updateChaintracksFiatExchangeRates, updateExchangeratesapi } from './providers/echangeRates'
+import { updateChaintracksFiatExchangeRates, updateExchangeratesapi } from './providers/exchangeRates'
 import { ARC } from './providers/ARC'
 import { Bitails } from './providers/Bitails'
 import { getBeefForTxid } from './providers/getBeefForTxid'
-import { ServicesCallHistory } from '../sdk/WalletServices.interfaces'
-
-export class Services implements sdk.WalletServices {
-  static createDefaultOptions(chain: sdk.Chain): sdk.WalletServicesOptions {
+import {
+  BaseBlockHeader,
+  BlockHeader,
+  FiatExchangeRates,
+  GetMerklePathResult,
+  GetMerklePathService,
+  GetRawTxResult,
+  GetRawTxService,
+  GetScriptHashHistoryResult,
+  GetScriptHashHistoryService,
+  GetStatusForTxidsResult,
+  GetStatusForTxidsService,
+  GetUtxoStatusOutputFormat,
+  GetUtxoStatusResult,
+  GetUtxoStatusService,
+  PostBeefResult,
+  PostBeefService,
+  ServicesCallHistory,
+  UpdateFiatExchangeRateService,
+  WalletServices,
+  WalletServicesOptions
+} from '../sdk/WalletServices.interfaces'
+import { Chain } from '../sdk/types'
+import { WERR_INTERNAL, WERR_INVALID_OPERATION, WERR_INVALID_PARAMETER } from '../sdk/WERR_errors'
+import { ChaintracksChainTracker } from './chaintracker/ChaintracksChainTracker'
+import { WalletError } from '../sdk/WalletError'
+import { doubleSha256BE, sha256Hash, wait } from '../utility/utilityHelpers'
+import { TableOutput } from '../storage/schema/tables/TableOutput'
+import { asArray, asString } from '../utility/utilityHelpers.noBuffer'
+
+export class Services implements WalletServices {
+  static createDefaultOptions(chain: Chain): WalletServicesOptions {
     return createDefaultWalletServicesOptions(chain)
   }
 
-  options: sdk.WalletServicesOptions
+  options: WalletServicesOptions
   whatsonchain: WhatsOnChain
   arcTaal: ARC
   arcGorillaPool?: ARC
   bitails: Bitails
 
-  getMerklePathServices: ServiceCollection<sdk.GetMerklePathService>
-  getRawTxServices: ServiceCollection<sdk.GetRawTxService>
-  postBeefServices: ServiceCollection<sdk.PostBeefService>
-  getUtxoStatusServices: ServiceCollection<sdk.GetUtxoStatusService>
-  getStatusForTxidsServices: ServiceCollection<sdk.GetStatusForTxidsService>
-  getScriptHashHistoryServices: ServiceCollection<sdk.GetScriptHashHistoryService>
-  updateFiatExchangeRateServices: ServiceCollection<sdk.UpdateFiatExchangeRateService>
+  getMerklePathServices: ServiceCollection<GetMerklePathService>
+  getRawTxServices: ServiceCollection<GetRawTxService>
+  postBeefServices: ServiceCollection<PostBeefService>
+  getUtxoStatusServices: ServiceCollection<GetUtxoStatusService>
+  getStatusForTxidsServices: ServiceCollection<GetStatusForTxidsService>
+  getScriptHashHistoryServices: ServiceCollection<GetScriptHashHistoryService>
+  updateFiatExchangeRateServices: ServiceCollection<UpdateFiatExchangeRateService>
 
-  chain: sdk.Chain
+  chain: Chain
 
-  constructor(optionsOrChain: sdk.Chain | sdk.WalletServicesOptions) {
+  constructor(optionsOrChain: Chain | WalletServicesOptions) {
     this.chain = typeof optionsOrChain === 'string' ? optionsOrChain : optionsOrChain.chain
 
     this.options = typeof optionsOrChain === 'string' ? Services.createDefaultOptions(this.chain) : optionsOrChain
@@ -46,15 +72,15 @@ export class Services implements sdk.WalletServices {
     this.bitails = new Bitails(this.chain)
 
     //prettier-ignore
-    this.getMerklePathServices = new ServiceCollection<sdk.GetMerklePathService>('getMerklePath')
+    this.getMerklePathServices = new ServiceCollection<GetMerklePathService>('getMerklePath')
       .add({ name: 'WhatsOnChain', service: this.whatsonchain.getMerklePath.bind(this.whatsonchain) })
       .add({ name: 'Bitails', service: this.bitails.getMerklePath.bind(this.bitails) })
 
     //prettier-ignore
-    this.getRawTxServices = new ServiceCollection<sdk.GetRawTxService>('getRawTx')
+    this.getRawTxServices = new ServiceCollection<GetRawTxService>('getRawTx')
       .add({ name: 'WhatsOnChain', service: this.whatsonchain.getRawTxResult.bind(this.whatsonchain) })
 
-    this.postBeefServices = new ServiceCollection<sdk.PostBeefService>('postBeef')
+    this.postBeefServices = new ServiceCollection<PostBeefService>('postBeef')
     if (this.arcGorillaPool) {
       //prettier-ignore
       this.postBeefServices.add({ name: 'GorillaPoolArcBeef', service: this.arcGorillaPool.postBeef.bind(this.arcGorillaPool) })
@@ -67,19 +93,19 @@ export class Services implements sdk.WalletServices {
       ;
 
     //prettier-ignore
-    this.getUtxoStatusServices = new ServiceCollection<sdk.GetUtxoStatusService>('getUtxoStatus')
+    this.getUtxoStatusServices = new ServiceCollection<GetUtxoStatusService>('getUtxoStatus')
       .add({ name: 'WhatsOnChain', service: this.whatsonchain.getUtxoStatus.bind(this.whatsonchain) })
 
     //prettier-ignore
-    this.getStatusForTxidsServices = new ServiceCollection<sdk.GetStatusForTxidsService>('getStatusForTxids')
+    this.getStatusForTxidsServices = new ServiceCollection<GetStatusForTxidsService>('getStatusForTxids')
       .add({ name: 'WhatsOnChain', service: this.whatsonchain.getStatusForTxids.bind(this.whatsonchain) })
 
     //prettier-ignore
-    this.getScriptHashHistoryServices = new ServiceCollection<sdk.GetScriptHashHistoryService>('getScriptHashHistory')
+    this.getScriptHashHistoryServices = new ServiceCollection<GetScriptHashHistoryService>('getScriptHashHistory')
       .add({ name: 'WhatsOnChain', service: this.whatsonchain.getScriptHashHistory.bind(this.whatsonchain) })
 
     //prettier-ignore
-    this.updateFiatExchangeRateServices = new ServiceCollection<sdk.UpdateFiatExchangeRateService>('updateFiatExchangeRate')
+    this.updateFiatExchangeRateServices = new ServiceCollection<UpdateFiatExchangeRateService>('updateFiatExchangeRate')
       .add({ name: 'ChaintracksService', service: updateChaintracksFiatExchangeRates })
       .add({ name: 'exchangeratesapi', service: updateExchangeratesapi })
   }
@@ -99,7 +125,7 @@ export class Services implements sdk.WalletServices {
 
   async getChainTracker(): Promise<ChainTracker> {
     if (!this.options.chaintracks)
-      throw new sdk.WERR_INVALID_PARAMETER('options.chaintracks', `valid to enable 'getChainTracker' service.`)
+      throw new WERR_INVALID_PARAMETER('options.chaintracks', `valid to enable 'getChainTracker' service.`)
     return new ChaintracksChainTracker(this.chain, this.options.chaintracks)
   }
 
@@ -135,14 +161,14 @@ export class Services implements sdk.WalletServices {
     return this.getUtxoStatusServices.count
   }
 
-  async getStatusForTxids(txids: string[], useNext?: boolean): Promise<sdk.GetStatusForTxidsResult> {
+  async getStatusForTxids(txids: string[], useNext?: boolean): Promise<GetStatusForTxidsResult> {
     const services = this.getStatusForTxidsServices
     if (useNext) services.next()
 
-    let r0: sdk.GetStatusForTxidsResult = {
+    let r0: GetStatusForTxidsResult = {
       name: '<noservices>',
       status: 'error',
-      error: new sdk.WERR_INTERNAL('No services available.'),
+      error: new WERR_INTERNAL('No services available.'),
       results: []
     }
 
@@ -159,7 +185,7 @@ export class Services implements sdk.WalletServices {
           else services.addServiceCallFailure(stc)
         }
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
         services.addServiceCallError(stc, e)
       }
       services.next()
@@ -179,10 +205,7 @@ export class Services implements sdk.WalletServices {
 
   async isUtxo(output: TableOutput): Promise<boolean> {
     if (!output.lockingScript) {
-      throw new sdk.WERR_INVALID_PARAMETER(
-        'output.lockingScript',
-        'validated by storage provider validateOutputScript.'
-      )
+      throw new WERR_INVALID_PARAMETER('output.lockingScript', 'validated by storage provider validateOutputScript.')
     }
     const hash = this.hashOutputScript(Utils.toHex(output.lockingScript))
     const or = await this.getUtxoStatus(hash, undefined, `${output.txid}.${output.vout}`)
@@ -191,17 +214,17 @@ export class Services implements sdk.WalletServices {
 
   async getUtxoStatus(
     output: string,
-    outputFormat?: sdk.GetUtxoStatusOutputFormat,
+    outputFormat?: GetUtxoStatusOutputFormat,
     outpoint?: string,
     useNext?: boolean
-  ): Promise<sdk.GetUtxoStatusResult> {
+  ): Promise<GetUtxoStatusResult> {
     const services = this.getUtxoStatusServices
     if (useNext) services.next()
 
-    let r0: sdk.GetUtxoStatusResult = {
+    let r0: GetUtxoStatusResult = {
       name: '<noservices>',
       status: 'error',
-      error: new sdk.WERR_INTERNAL('No services available.'),
+      error: new WERR_INTERNAL('No services available.'),
       details: []
     }
 
@@ -219,7 +242,7 @@ export class Services implements sdk.WalletServices {
             else services.addServiceCallFailure(stc)
           }
         } catch (eu: unknown) {
-          const e = sdk.WalletError.fromUnknown(eu)
+          const e = WalletError.fromUnknown(eu)
           services.addServiceCallError(stc, e)
         }
         services.next()
@@ -230,14 +253,14 @@ export class Services implements sdk.WalletServices {
     return r0
   }
 
-  async getScriptHashHistory(hash: string, useNext?: boolean): Promise<sdk.GetScriptHashHistoryResult> {
+  async getScriptHashHistory(hash: string, useNext?: boolean): Promise<GetScriptHashHistoryResult> {
     const services = this.getScriptHashHistoryServices
     if (useNext) services.next()
 
-    let r0: sdk.GetScriptHashHistoryResult = {
+    let r0: GetScriptHashHistoryResult = {
       name: '<noservices>',
       status: 'error',
-      error: new sdk.WERR_INTERNAL('No services available.'),
+      error: new WERR_INTERNAL('No services available.'),
       history: []
     }
 
@@ -253,7 +276,7 @@ export class Services implements sdk.WalletServices {
           else services.addServiceCallFailure(stc)
         }
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
         services.addServiceCallError(stc, e)
       }
       services.next()
@@ -269,8 +292,8 @@ export class Services implements sdk.WalletServices {
    * @param chain
    * @returns
    */
-  async postBeef(beef: Beef, txids: string[]): Promise<sdk.PostBeefResult[]> {
-    let rs: sdk.PostBeefResult[] = []
+  async postBeef(beef: Beef, txids: string[]): Promise<PostBeefResult[]> {
+    let rs: PostBeefResult[] = []
     const services = this.postBeefServices
     const stcs = services.allServicesToCall
     switch (this.postBeefMode) {
@@ -300,7 +323,7 @@ export class Services implements sdk.WalletServices {
     }
     return rs
 
-    async function callService(stc: ServiceToCall<sdk.PostBeefService>) {
+    async function callService(stc: ServiceToCall<PostBeefService>) {
       const r = await stc.service(beef, txids)
       if (r.status === 'success') {
         services.addServiceCallSuccess(stc)
@@ -315,11 +338,11 @@ export class Services implements sdk.WalletServices {
     }
   }
 
-  async getRawTx(txid: string, useNext?: boolean): Promise<sdk.GetRawTxResult> {
+  async getRawTx(txid: string, useNext?: boolean): Promise<GetRawTxResult> {
     const services = this.getRawTxServices
     if (useNext) services.next()
 
-    const r0: sdk.GetRawTxResult = { txid }
+    const r0: GetRawTxResult = { txid }
 
     for (let tries = 0; tries < services.count; tries++) {
       const stc = services.serviceToCall
@@ -336,7 +359,7 @@ export class Services implements sdk.WalletServices {
             services.addServiceCallSuccess(stc)
             break
           }
-          r.error = new sdk.WERR_INTERNAL(`computed txid ${hash} doesn't match requested value ${txid}`)
+          r.error = new WERR_INTERNAL(`computed txid ${hash} doesn't match requested value ${txid}`)
           r.rawTx = undefined
         }
 
@@ -348,7 +371,7 @@ export class Services implements sdk.WalletServices {
           // If we have an error and didn't before...
           r0.error = r.error
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
         services.addServiceCallError(stc, e)
       }
       services.next()
@@ -358,23 +381,23 @@ export class Services implements sdk.WalletServices {
 
   async invokeChaintracksWithRetry<R>(method: () => Promise<R>): Promise<R> {
     if (!this.options.chaintracks)
-      throw new sdk.WERR_INVALID_PARAMETER('options.chaintracks', 'valid for this service operation.')
+      throw new WERR_INVALID_PARAMETER('options.chaintracks', 'valid for this service operation.')
     for (let retry = 0; retry < 3; retry++) {
       try {
         const r: R = await method()
         return r
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
         if (e.code != 'ECONNRESET') throw eu
       }
     }
-    throw new sdk.WERR_INVALID_OPERATION('hashToHeader service unavailable')
+    throw new WERR_INVALID_OPERATION('hashToHeader service unavailable')
   }
 
   async getHeaderForHeight(height: number): Promise<number[]> {
     const method = async () => {
       const header = await this.options.chaintracks!.findHeaderForHeight(height)
-      if (!header) throw new sdk.WERR_INVALID_PARAMETER('hash', `valid height '${height}' on mined chain ${this.chain}`)
+      if (!header) throw new WERR_INVALID_PARAMETER('hash', `valid height '${height}' on mined chain ${this.chain}`)
       return toBinaryBaseBlockHeader(header)
     }
     return this.invokeChaintracksWithRetry(method)
@@ -387,21 +410,20 @@ export class Services implements sdk.WalletServices {
     return this.invokeChaintracksWithRetry(method)
   }
 
-  async hashToHeader(hash: string): Promise<sdk.BlockHeader> {
+  async hashToHeader(hash: string): Promise<BlockHeader> {
     const method = async () => {
       const header = await this.options.chaintracks!.findHeaderForBlockHash(hash)
-      if (!header)
-        throw new sdk.WERR_INVALID_PARAMETER('hash', `valid blockhash '${hash}' on mined chain ${this.chain}`)
+      if (!header) throw new WERR_INVALID_PARAMETER('hash', `valid blockhash '${hash}' on mined chain ${this.chain}`)
       return header
     }
     return this.invokeChaintracksWithRetry(method)
   }
 
-  async getMerklePath(txid: string, useNext?: boolean): Promise<sdk.GetMerklePathResult> {
+  async getMerklePath(txid: string, useNext?: boolean): Promise<GetMerklePathResult> {
     const services = this.getMerklePathServices
     if (useNext) services.next()
 
-    const r0: sdk.GetMerklePathResult = { notes: [] }
+    const r0: GetMerklePathResult = { notes: [] }
 
     for (let tries = 0; tries < services.count; tries++) {
       const stc = services.serviceToCall
@@ -427,7 +449,7 @@ export class Services implements sdk.WalletServices {
           r0.error = r.error
         }
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
         services.addServiceCallError(stc, e)
       }
       services.next()
@@ -437,7 +459,7 @@ export class Services implements sdk.WalletServices {
 
   targetCurrencies = ['USD', 'GBP', 'EUR']
 
-  async updateFiatExchangeRates(rates?: sdk.FiatExchangeRates, updateMsecs?: number): Promise<sdk.FiatExchangeRates> {
+  async updateFiatExchangeRates(rates?: FiatExchangeRates, updateMsecs?: number): Promise<FiatExchangeRates> {
     updateMsecs ||= 1000 * 60 * 15
     const freshnessDate = new Date(Date.now() - updateMsecs)
     if (rates) {
@@ -449,7 +471,7 @@ export class Services implements sdk.WalletServices {
     // Make sure we always start with the first service listed (chaintracks aggregator)
     const services = this.updateFiatExchangeRateServices.clone()
 
-    let r0: sdk.FiatExchangeRates | undefined
+    let r0: FiatExchangeRates | undefined
 
     for (let tries = 0; tries < services.count; tries++) {
       const stc = services.serviceToCall
@@ -463,7 +485,7 @@ export class Services implements sdk.WalletServices {
           services.addServiceCallFailure(stc)
         }
       } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
+        const e = WalletError.fromUnknown(eu)
         services.addServiceCallError(stc, e)
       }
       services.next()
@@ -471,7 +493,7 @@ export class Services implements sdk.WalletServices {
 
     if (!r0) {
       console.error('Failed to update fiat exchange rates.')
-      if (!rates) throw new sdk.WERR_INTERNAL()
+      if (!rates) throw new WERR_INTERNAL()
       return rates
     }
 
@@ -498,7 +520,7 @@ export class Services implements sdk.WalletServices {
         }
         nLockTime = tx.lockTime
       } else {
-        throw new sdk.WERR_INTERNAL('Should be either @bsv/sdk Transaction or babbage-bsv Transaction')
+        throw new WERR_INTERNAL('Should be either @bsv/sdk Transaction or babbage-bsv Transaction')
       }
     }
 
@@ -517,7 +539,7 @@ export class Services implements sdk.WalletServices {
   }
 }
 
-export function validateScriptHash(output: string, outputFormat?: sdk.GetUtxoStatusOutputFormat): string {
+export function validateScriptHash(output: string, outputFormat?: GetUtxoStatusOutputFormat): string {
   let b = asArray(output)
   if (!outputFormat) {
     if (b.length === 32) outputFormat = 'hashLE'
@@ -533,7 +555,7 @@ export function validateScriptHash(output: string, outputFormat?: sdk.GetUtxoSta
       b = sha256Hash(b).reverse()
       break
     default:
-      throw new sdk.WERR_INVALID_PARAMETER('outputFormat', `not be ${outputFormat}`)
+      throw new WERR_INVALID_PARAMETER('outputFormat', `not be ${outputFormat}`)
   }
   return asString(b)
 }
@@ -546,7 +568,7 @@ export function validateScriptHash(output: string, outputFormat?: sdk.GetUtxoSta
  * @returns 80 byte array
  * @publicbody
  */
-export function toBinaryBaseBlockHeader(header: sdk.BaseBlockHeader): number[] {
+export function toBinaryBaseBlockHeader(header: BaseBlockHeader): number[] {
   const writer = new Utils.Writer()
   writer.writeUInt32BE(header.version)
   writer.writeReverse(asArray(header.previousHash))

package/src/services/__tests/postBeef.test.ts

@@ -3,7 +3,7 @@ import { Services } from '../../index.client'
 import { _tu, logger } from '../../../test/utils/TestUtilsWalletStorage'
 import { sdk, Setup } from '../../index.all'
 
-describe('postBeef service tests', () => {
+describe.skip('postBeef service tests', () => {
   jest.setTimeout(99999999)
 
   test('0 postBeef mainnet', async () => {

package/src/services/chaintracker/BHServiceClient.ts

@@ -1,8 +1,9 @@
 import { BlockHeadersService, Utils } from '@bsv/sdk'
 import { ChaintracksServiceClient, ChaintracksServiceClientOptions } from './chaintracks/ChaintracksServiceClient'
-import { sdk } from '../../index.client'
-import { BaseBlockHeader, BlockHeader } from './chaintracks'
-import { serializeBlockHeader } from './chaintracks/util/blockHeaderUtilities'
+import { serializeBaseBlockHeader } from './chaintracks/util/blockHeaderUtilities'
+import { HeaderListener, ReorgListener, ChaintracksInfoApi } from './chaintracks/Api/ChaintracksClientApi'
+import { Chain } from '../../sdk/types'
+import { BaseBlockHeader, BlockHeader } from '../../sdk/WalletServices.interfaces'
 
 interface BHSHeader {
   hash: string
@@ -25,18 +26,17 @@ interface BHSHeaderState {
 export class BHServiceClient implements ChaintracksServiceClient {
   bhs: BlockHeadersService
   cache: Record<number, string>
-  chain: sdk.Chain
+  chain: Chain
   serviceUrl: string
   options: ChaintracksServiceClientOptions
   apiKey: string
 
-  constructor(chain: sdk.Chain, url: string, apiKey: string) {
+  constructor(chain: Chain, url: string, apiKey: string) {
     this.bhs = new BlockHeadersService(url, { apiKey })
     this.cache = {}
     this.chain = chain
     this.serviceUrl = url
     this.options = ChaintracksServiceClient.createChaintracksServiceClientOptions()
-    this.options.useAuthrite = true
     this.apiKey = apiKey
   }
 
@@ -106,7 +106,7 @@ export class BHServiceClient implements ChaintracksServiceClient {
         bits: response.difficultyTarget,
         nonce: response.nonce
       }
-      return serializeBlockHeader(header)
+      return serializeBaseBlockHeader(header)
     })
     return headers.reduce((str: string, arr: number[]) => str + Utils.toHex(arr), '')
   }
@@ -181,7 +181,7 @@ export class BHServiceClient implements ChaintracksServiceClient {
     throw new Error('Not implemented')
   }
 
-  async getChain(): Promise<sdk.Chain> {
+  async getChain(): Promise<Chain> {
     return this.chain
   }
 
@@ -193,7 +193,20 @@ export class BHServiceClient implements ChaintracksServiceClient {
     throw new Error('Not implemented')
   }
 
-  async findChainTipHashHex(): Promise<string> {
+  async findChainTipHash(): Promise<string> {
     throw new Error('Not implemented')
   }
+
+  async subscribeHeaders(listener: HeaderListener): Promise<string> {
+    throw new Error('Method not implemented.')
+  }
+  async subscribeReorgs(listener: ReorgListener): Promise<string> {
+    throw new Error('Method not implemented.')
+  }
+  async unsubscribe(subscriptionId: string): Promise<boolean> {
+    throw new Error('Method not implemented.')
+  }
+  async getInfo(): Promise<ChaintracksInfoApi> {
+    throw new Error('Method not implemented.')
+  }
 }

package/src/services/chaintracker/ChaintracksChainTracker.ts

@@ -1,7 +1,10 @@
-import { sdk, wait } from '../../index.client'
 import { ChainTracker } from '@bsv/sdk'
-import { BlockHeader } from './chaintracks'
 import { ChaintracksServiceClient } from './chaintracks/ChaintracksServiceClient'
+import { Chain } from '../../sdk/types'
+import { WalletError } from '../../sdk/WalletError'
+import { wait } from '../../utility/utilityHelpers'
+import { WERR_INTERNAL } from '../../sdk/WERR_errors'
+import { BlockHeader } from '../../sdk/WalletServices.interfaces'
 
 export interface ChaintracksChainTrackerOptions {
   maxRetries?: number
@@ -12,7 +15,7 @@ export class ChaintracksChainTracker implements ChainTracker {
   cache: Record<number, string>
   options: ChaintracksChainTrackerOptions
 
-  constructor(chain?: sdk.Chain, chaintracks?: ChaintracksServiceClient, options?: ChaintracksChainTrackerOptions) {
+  constructor(chain?: Chain, chaintracks?: ChaintracksServiceClient, options?: ChaintracksChainTrackerOptions) {
     chain ||= 'main'
     this.chaintracks =
       chaintracks ??
@@ -35,7 +38,7 @@ export class ChaintracksChainTracker implements ChainTracker {
 
     const retries = this.options.maxRetries || 3
 
-    let error: sdk.WalletError | undefined = undefined
+    let error: WalletError | undefined = undefined
 
     for (let tryCount = 1; tryCount <= retries; tryCount++) {
       try {
@@ -47,7 +50,7 @@ export class ChaintracksChainTracker implements ChainTracker {
 
         break
       } catch (eu: unknown) {
-        error = sdk.WalletError.fromUnknown(eu)
+        error = WalletError.fromUnknown(eu)
         if (tryCount > retries) {
           throw error
         }
@@ -55,7 +58,7 @@ export class ChaintracksChainTracker implements ChainTracker {
       }
     }
 
-    if (!header) throw new sdk.WERR_INTERNAL('no header should have returned false or thrown an error.')
+    if (!header) throw new WERR_INTERNAL('no header should have returned false or thrown an error.')
 
     this.cache[height] = header.merkleRoot
 

package/src/services/chaintracker/__tests/ChaintracksChainTracker.test.ts

@@ -1,10 +1,13 @@
-import { ChaintracksChainTracker } from '..'
+import { ChaintracksChainTracker } from '../index.all'
 import { sdk } from '../../../index.client'
 
+const includeTestChaintracks = false
+
 describe('ChaintracksChaintracker tests', () => {
   jest.setTimeout(99999999)
 
   test(`0 test`, async () => {
+    if (!includeTestChaintracks) return
     await testChaintracksChaintracker('test')
   })
 

package/src/services/chaintracker/__tests/ChaintracksServiceClient.test.ts

@@ -1,32 +1,27 @@
 import { sdk } from '../../../index.client'
-import { ChaintracksServiceClient } from '../chaintracks'
+import { ChaintracksServiceClient } from '../chaintracks/index.client'
+
+const includeTestChaintracks = false
 
 describe('ChaintracksServiceClient tests', () => {
   jest.setTimeout(99999999)
 
-  test('0', async () => {
-    const chains: sdk.Chain[] = ['test', 'main']
-    for (const chain of chains) {
-      const client = new ChaintracksServiceClient(
-        chain,
-        `https://npm-registry.babbage.systems:${chain === 'main' ? 8084 : 8083}`
-      )
-      {
-        // testnet block
-        const r = await client.findHeaderForBlockHash(
-          '0000000049686fe721f70614c89df146e410240f838b8f3ef8e6471c6dfdd153'
-        )
-        if (chain === 'main') expect(r).toBe(undefined)
-        else expect(r?.height).toBe(1651723)
-      }
-      {
-        // mainnet block
-        const r = await client.findHeaderForBlockHash(
-          '00000000000000000b010edee7422c59ec9131742e35f3e0d5837d710b961406'
-        )
-        if (chain === 'main') expect(r?.height).toBe(877595)
-        else expect(r).toBe(undefined)
-      }
-    }
+  test('0 mainNet findHeaderForHeight', async () => {
+    const client = makeClient('main')
+    const r = await client.findHeaderForHeight(877595)
+    expect(r?.hash).toBe('00000000000000000b010edee7422c59ec9131742e35f3e0d5837d710b961406')
+    expect(await client.findHeaderForHeight(999999999)).toBe(undefined)
+  })
+
+  test('1 testNet findHeaderForHeight', async () => {
+    if (!includeTestChaintracks) return
+    const client = makeClient('test')
+    const r = await client.findHeaderForHeight(1651723)
+    expect(r?.hash).toBe('0000000049686fe721f70614c89df146e410240f838b8f3ef8e6471c6dfdd153')
+    expect(await client.findHeaderForHeight(999999999)).toBe(undefined)
   })
 })
+
+function makeClient(chain: sdk.Chain) {
+  return new ChaintracksServiceClient(chain, `https://npm-registry.babbage.systems:${chain === 'main' ? 8084 : 8083}`)
+}

package/src/services/chaintracker/chaintracks/Api/BlockHeaderApi.ts

@@ -1,49 +1,6 @@
-/**
- * These are fields of 80 byte serialized header in order whose double sha256 hash is a block's hash value
- * and the next block's previousHash value.
- *
- * All block hash values and merkleRoot values are 32 byte hex string values with the byte order reversed from the serialized byte order.
- */
-export interface BaseBlockHeader {
-  /**
-   * Block header version value. Serialized length is 4 bytes.
-   */
-  version: number
-  /**
-   * Hash of previous block's block header. Serialized length is 32 bytes.
-   */
-  previousHash: string
-  /**
-   * Root hash of the merkle tree of all transactions in this block. Serialized length is 32 bytes.
-   */
-  merkleRoot: string
-  /**
-   * Block header time value. Serialized length is 4 bytes.
-   */
-  time: number
-  /**
-   * Block header bits value. Serialized length is 4 bytes.
-   */
-  bits: number
-  /**
-   * Block header nonce value. Serialized length is 4 bytes.
-   */
-  nonce: number
-}
+import { BaseBlockHeader, BlockHeader } from '../../../../sdk/WalletServices.interfaces'
 
-/**
- * A `BaseBlockHeader` extended with its computed hash and height in its chain.
- */
-export interface BlockHeader extends BaseBlockHeader {
-  /**
-   * Height of the header, starting from zero.
-   */
-  height: number
-  /**
-   * The double sha256 hash of the serialized `BaseBlockHeader` fields.
-   */
-  hash: string
-}
+export { BaseBlockHeader, BlockHeader } from '../../../../sdk/WalletServices.interfaces'
 
 /**
  * The "live" portion of the block chain is recent history that can conceivably be subject to reorganizations.