@bsv/wallet-toolbox 1.6.3 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/monitor/Monitor.ts

@@ -16,12 +16,12 @@ import { TaskSendWaiting } from './tasks/TaskSendWaiting'
 import { TaskCheckNoSends } from './tasks/TaskCheckNoSends'
 import { TaskUnFail } from './tasks/TaskUnFail'
 import { Chain, ProvenTransactionStatus } from '../sdk/types'
-import { ChaintracksServiceClient } from '../services/chaintracker/chaintracks/ChaintracksServiceClient'
 import { ReviewActionResult } from '../sdk/WalletStorage.interfaces'
 import { WERR_BAD_REQUEST, WERR_INVALID_PARAMETER } from '../sdk/WERR_errors'
 import { WalletError } from '../sdk/WalletError'
 import { BlockHeader } from '../sdk/WalletServices.interfaces'
 import { Services } from '../services/Services'
+import { ChaintracksClientApi } from '../services/chaintracker/chaintracks/Api/ChaintracksClientApi'
 
 export type MonitorStorage = WalletStorageManager
 
@@ -32,7 +32,7 @@ export interface MonitorOptions {
 
   storage: MonitorStorage
 
-  chaintracks: ChaintracksServiceClient
+  chaintracks: ChaintracksClientApi
 
   /**
    * How many msecs to wait after each getMerkleProof service request.
@@ -80,7 +80,7 @@ export class Monitor {
   services: Services
   chain: Chain
   storage: MonitorStorage
-  chaintracks: ChaintracksServiceClient
+  chaintracks: ChaintracksClientApi
   onTransactionBroadcasted?: (broadcastResult: ReviewActionResult) => Promise<void>
   onTransactionProven?: (txStatus: ProvenTransactionStatus) => Promise<void>
 

package/src/sdk/WalletServices.interfaces.ts

@@ -3,6 +3,7 @@ import { Chain, ReqHistoryNote } from './types'
 import { WalletError } from './WalletError'
 import { TableOutput } from '../storage/schema/tables/TableOutput'
 import { ChaintracksServiceClient } from '../services/chaintracker/chaintracks/ChaintracksServiceClient'
+import { ChaintracksClientApi } from '../services/chaintracker/chaintracks/Api/ChaintracksClientApi'
 /**
  * Defines standard interfaces to access functionality implemented by external transaction processing services.
  */
@@ -192,21 +193,107 @@ export interface FiatExchangeRates {
 }
 
 export interface WalletServicesOptions {
+  /**
+   * 'main' or 'test': which BSV chain to use
+   */
   chain: Chain
+  /**
+   * As of 2025-08-31 the `taalApiKey` is unused for default configured services.
+   * See `arcConfig` instead.
+   */
   taalApiKey?: string
+  /**
+   * Api key for use accessing Bitails API at
+   * mainnet: `https://api.bitails.io/`
+   * testnet: `https://test-api.bitails.io/`
+   */
   bitailsApiKey?: string
+  /**
+   * Api key for use accessing WhatsOnChain API at
+   * mainnet: `https://api.whatsonchain.com/v1/bsv/main`
+   * testnet: `https://api.whatsonchain.com/v1/bsv/test`
+   */
   whatsOnChainApiKey?: string
+  /**
+   * The initial approximate BSV/USD exchange rate.
+   */
   bsvExchangeRate: BsvExchangeRate
+  /**
+   * Update interval for BSV/USD exchange rate.
+   * Default is 15 minutes.
+   */
   bsvUpdateMsecs: number
+  /**
+   * The initial approximate fiat exchange rates with USD as base.
+   */
   fiatExchangeRates: FiatExchangeRates
+  /**
+   * Update interval for Fiat exchange rates.
+   * Default is 24 hours.
+   */
   fiatUpdateMsecs: number
+  /**
+   * MAPI callbacks are deprecated at this time.
+   */
   disableMapiCallback?: boolean
+  /**
+   * API key for use accessing fiat exchange rates API at
+   * `http://api.exchangeratesapi.io/v1/latest?access_key=${key}`
+   *
+   * Obtain your own api key here:
+   * https://manage.exchangeratesapi.io/signup/free
+   */
   exchangeratesapiKey?: string
+  /**
+   * Due to the default use of a free exchangeratesapiKey with low usage limits,
+   * the `ChaintracksService` can act as a request rate multiplier.
+   *
+   * By default the following endpoint is used:
+   * `https://mainnet-chaintracks.babbage.systems/getFiatExchangeRates`
+   */
   chaintracksFiatExchangeRatesUrl?: string
-  chaintracks?: ChaintracksServiceClient
+  /**
+   * Optional Chaintracks client API instance.
+   * Default is a new instance of ChaintracksServiceClient configured to use:
+   * mainnet: `https://mainnet-chaintracks.babbage.systems`
+   * testnet: `https://testnet-chaintracks.babbage.systems`
+   */
+  chaintracks?: ChaintracksClientApi
+  /**
+   * TAAL ARC service provider endpoit to use
+   * Default is:
+   * mainnet: `https://arc.taal.com`
+   * testnet: `https://arc-test.taal.com`
+   */
   arcUrl: string
+  /**
+   * TAAL ARC service configuration options.
+   *
+   * apiKey Default value is undefined.
+   *
+   * deploymentId Default value: `wallet-toolbox-${randomBytesHex(16)}`.
+   *
+   * callbackUrl Default is undefined.
+   * callbackToken Default is undefined.
+   */
   arcConfig: ArcConfig
+  /**
+   * GorillaPool ARC service provider endpoit to use
+   * Default is:
+   * mainnet: `https://arc.gorillapool.io`
+   * testnet: undefined
+   */
   arcGorillaPoolUrl?: string
+  /**
+   * GorillaPool ARC service configuration options.
+   *
+   * apiKey Default is undefined.
+   *
+   * deploymentId Default value: `wallet-toolbox-${randomBytesHex(16)}`.
+   *
+   * callbackUrl Default is undefined.
+   * callbackToken Default is undefined.
+   */
   arcGorillaPoolConfig?: ArcConfig
 }
 

package/src/services/Services.ts

@@ -69,7 +69,7 @@ export class Services implements WalletServices {
       this.arcGorillaPool = new ARC(this.options.arcGorillaPoolUrl, this.options.arcGorillaPoolConfig, 'arcGorillaPool')
     }
 
-    this.bitails = new Bitails(this.chain)
+    this.bitails = new Bitails(this.chain, { apiKey: this.options.bitailsApiKey })
 
     //prettier-ignore
     this.getMerklePathServices = new ServiceCollection<GetMerklePathService>('getMerklePath')

package/src/services/chaintracker/ChaintracksChainTracker.ts

@@ -5,17 +5,18 @@ import { WalletError } from '../../sdk/WalletError'
 import { wait } from '../../utility/utilityHelpers'
 import { WERR_INTERNAL } from '../../sdk/WERR_errors'
 import { BlockHeader } from '../../sdk/WalletServices.interfaces'
+import { ChaintracksClientApi } from './chaintracks/Api/ChaintracksClientApi'
 
 export interface ChaintracksChainTrackerOptions {
   maxRetries?: number
 }
 
 export class ChaintracksChainTracker implements ChainTracker {
-  chaintracks: ChaintracksServiceClient
+  chaintracks: ChaintracksClientApi
   cache: Record<number, string>
   options: ChaintracksChainTrackerOptions
 
-  constructor(chain?: Chain, chaintracks?: ChaintracksServiceClient, options?: ChaintracksChainTrackerOptions) {
+  constructor(chain?: Chain, chaintracks?: ChaintracksClientApi, options?: ChaintracksChainTrackerOptions) {
     chain ||= 'main'
     this.chaintracks =
       chaintracks ??

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

@@ -16,12 +16,6 @@ export interface BulkIngestorBaseOptions {
    * available bulk block header resources.
    */
   jsonResource: string | undefined
-
-  /**
-   * If true, and the bulk ingestor supports it, bypass the live database
-   * up to `liveHeightThreshold` of available headers remaining.
-   */
-  bypassLiveEnabled: boolean
 }
 
 export interface BulkIngestorApi {
@@ -76,7 +70,7 @@ export interface BulkIngestorApi {
    * Components requiring asynchronous setup can override base class implementation.
    * @param storage
    */
-  setStorage(storage: ChaintracksStorageApi): Promise<void>
+  setStorage(storage: ChaintracksStorageApi, log: (...args: any[]) => void): Promise<void>
 
   storage(): ChaintracksStorageApi
 }

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

@@ -88,5 +88,5 @@ export interface BulkStorageApi {
    * Components requiring asynchronous setup can override base class implementation.
    * @param storage
    */
-  setStorage(storage: ChaintracksStorageApi): Promise<void>
+  setStorage(storage: ChaintracksStorageApi, log: (...args: any[]) => void): Promise<void>
 }

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

@@ -17,9 +17,9 @@ export interface ChaintracksOptions {
    */
   addLiveRecursionLimit: number
   /**
-   * Event logging level
+   * Optional logging method
    */
-  logging: undefined | 'all'
+  logging?: (...args: any[]) => void
   /**
    * If true, this chaintracks instance will only service read requests for existing data.
    * Shared storage only requires one readonly false instance to manage and update storage.

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

@@ -1,5 +1,5 @@
 import { HeightRange } from '../util/HeightRange'
-import { BlockHeader, LiveBlockHeader } from './BlockHeaderApi'
+import { BaseBlockHeader, BlockHeader, LiveBlockHeader } from './BlockHeaderApi'
 import { Chain } from '../../../../sdk/types'
 import { BulkHeaderFileInfo } from '../util/BulkHeaderFile'
 import { BulkFileDataManager } from '../util/BulkFileDataManager'
@@ -52,6 +52,8 @@ export interface ChaintracksStorageBaseOptions {
 }
 
 export interface ChaintracksStorageQueryApi {
+  log: (...args: any[]) => void
+
   /**
    * Returns the active chain tip header
    * Throws an error if there is no tip.
@@ -108,16 +110,40 @@ export interface ChaintracksStorageQueryApi {
   isMerkleRootActive(merkleRoot: string): Promise<boolean>
 
   /**
-   * Adds headers in 80 byte serialized format to a buffer.
-   * Only adds active headers.
-   * Buffer length divided by 80 is the actual number returned.
+   * Returns serialized headers as a Uint8Array.
+   * Only adds bulk and active live headers.
    *
-   * This function supports the ChaintracksClientApi
+   * @param height is the minimum header height to return, must be >= zero.
+   * @param count height + count - 1 is the maximum header height to return.
+   * @returns serialized headers as a Uint8Array.
+   */
+  getHeadersUint8Array(height: number, count: number): Promise<Uint8Array>
+
+  /**
+   * Returns an array of deserialized headers.
+   * Only adds bulk and active live headers.
    *
-   * @param height of first header, must be >= zero.
-   * @param count of headers, maximum
+   * @param height is the minimum header height to return, must be >= zero.
+   * @param count height + count - 1 is the maximum header height to return.
+   * @returns array of deserialized headers
    */
-  getHeaders(height: number, count: number): Promise<number[]>
+  getHeaders(height: number, count: number): Promise<BaseBlockHeader[]>
+
+  /**
+   * Returns active `LiveBlockHeaders` with height in the given range.
+   *
+   * @param range
+   * @returns array of active `LiveBlockHeaders`
+   */
+  getLiveHeaders(range: HeightRange): Promise<LiveBlockHeader[]>
+
+  /**
+   * Returns serialized bulk headers in the given range.
+   *
+   * @param range
+   * @returns serialized headers as a Uint8Array.
+   */
+  getBulkHeaders(range: HeightRange): Promise<Uint8Array>
 
   /**
    * Returns block header for a given block height on active chain.
@@ -161,7 +187,7 @@ export interface ChaintracksStorageQueryApi {
   /**
    * @returns The current minimum and maximum height active LiveBlockHeaders in the "live" database.
    */
-  findLiveHeightRange(): Promise<{ minHeight: number; maxHeight: number }>
+  findLiveHeightRange(): Promise<HeightRange>
 
   /**
    * @returns The maximum headerId value used by existing records or -1 if there are none.
@@ -257,6 +283,8 @@ export interface ChaintracksStorageBulkFileApi {
 }
 
 export interface ChaintracksStorageIngestApi {
+  log: (...args: any[]) => void
+
   /**
    * Attempts to insert a block header into the chain.
    *
@@ -340,14 +368,11 @@ export interface ChaintracksStorageIngestApi {
    * Release all resources. Makes the instance unusable.
    */
   destroy(): Promise<void>
-
-  /**
-   * @returns min, max height range in live database or empty (0, -1)
-   */
-  getLiveHeightRange(): Promise<HeightRange>
 }
 
 export interface ChaintracksStorageApi extends ChaintracksStorageQueryApi, ChaintracksStorageIngestApi {
+  log: (...args: any[]) => void
+
   bulkManager: BulkFileDataManager
 
   /**

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

@@ -15,7 +15,7 @@ export interface LiveIngestorApi {
    * Components requiring asynchronous setup can override base class implementation.
    * @param storage
    */
-  setStorage(storage: ChaintracksStorageApi): Promise<void>
+  setStorage(storage: ChaintracksStorageApi, log: (...args: any[]) => void): Promise<void>
 
   storage(): ChaintracksStorageApi
 

package/src/services/chaintracker/chaintracks/Chaintracks.ts

@@ -23,7 +23,7 @@ export class Chaintracks implements ChaintracksManagementApi {
       bulkIngestors: [],
       liveIngestors: [],
       addLiveRecursionLimit: 36,
-      logging: 'all',
+      logging: (...args) => console.log(new Date().toISOString(), ...args),
       readonly: false
     }
   }
@@ -71,7 +71,9 @@ export class Chaintracks implements ChaintracksManagementApi {
 
     this.addLiveRecursionLimit = options.addLiveRecursionLimit
 
-    if (options.logging === 'all') this.log = (...args) => console.log(new Date().toISOString(), ...args)
+    if (options.logging) this.log = options.logging
+    this.storage.log = this.log
+
     this.log(`New ChaintracksBase Instance Constructed ${options.chain}Net`)
   }
 
@@ -94,7 +96,7 @@ export class Chaintracks implements ChaintracksManagementApi {
         const presentHeight = await bulk.getPresentHeight()
         if (presentHeight) presentHeights.push(presentHeight)
       } catch (uerr: unknown) {
-        console.log(uerr)
+        console.error(uerr)
       }
     }
     const presentHeight = presentHeights.length ? Math.max(...presentHeights) : undefined
@@ -157,8 +159,8 @@ export class Chaintracks implements ChaintracksManagementApi {
       if (this.available) return
       // Make sure database schema exists and is updated...
       await this.storage.migrateLatest()
-      for (const bulkIn of this.bulkIngestors) await bulkIn.setStorage(this.storage)
-      for (const liveIn of this.liveIngestors) await liveIn.setStorage(this.storage)
+      for (const bulkIn of this.bulkIngestors) await bulkIn.setStorage(this.storage, this.log)
+      for (const liveIn of this.liveIngestors) await liveIn.setStorage(this.storage, this.log)
 
       // Start all live ingestors to push new headers onto liveHeaders... each long running.
       for (const liveIngestor of this.liveIngestors) this.promises.push(liveIngestor.startListening(this.liveHeaders))
@@ -221,7 +223,7 @@ export class Chaintracks implements ChaintracksManagementApi {
     return this.lock.withReadLock(async () => this.findHeaderForBlockHashNoLock(hash))
   }
 
-  async findHeaderForBlockHashNoLock(hash: string): Promise<BlockHeader | undefined> {
+  private async findHeaderForBlockHashNoLock(hash: string): Promise<BlockHeader | undefined> {
     return (await this.storage.findLiveHeaderForBlockHash(hash)) || undefined
   }
 
@@ -238,7 +240,7 @@ export class Chaintracks implements ChaintracksManagementApi {
   }
 
   private async getInfoNoLock(): Promise<ChaintracksInfoApi> {
-    const liveRange = await this.storage.getLiveHeightRange()
+    const liveRange = await this.storage.findLiveHeightRange()
     const info: ChaintracksInfoApi = {
       chain: this.chain,
       heightBulk: liveRange.minHeight - 1,
@@ -253,7 +255,7 @@ export class Chaintracks implements ChaintracksManagementApi {
 
   async getHeaders(height: number, count: number): Promise<string> {
     await this.makeAvailable()
-    return this.lock.withReadLock(async () => asString(await this.storage.getHeaders(height, count)))
+    return this.lock.withReadLock(async () => asString(await this.storage.getHeadersUint8Array(height, count)))
   }
 
   async findChainTipHeader(): Promise<BlockHeader> {
@@ -339,7 +341,7 @@ export class Chaintracks implements ChaintracksManagementApi {
             break
           }
         } catch (uerr: unknown) {
-          console.log(uerr)
+          console.error(uerr)
         }
       }
       if (bulkDone) break
@@ -472,6 +474,7 @@ export class Chaintracks implements ChaintracksManagementApi {
           // Process a "live" block header...
           let recursions = this.addLiveRecursionLimit
           for (; !needSyncCheck && !this.stopMainThread; ) {
+            //console.log(`Processing liveHeader: height: ${header.height} hash: ${header.hash} ${new Date().toISOString()}`)
             const ihr = await this.addLiveHeader(header)
             if (this.invalidInsertHeaderResult(ihr)) {
               this.log(`Ignoring liveHeader ${header.height} ${header.hash} due to invalid insert result.`)
@@ -550,11 +553,13 @@ export class Chaintracks implements ChaintracksManagementApi {
                 liveHeaderDupes = 0
               }
               const updated = await this.storage.getAvailableHeightRanges()
-              this.log(`${count} live headers added: bulk ${updated.bulk}, live ${updated.live}`)
+              this.log(`After adding ${count} live headers
+   After live: bulk ${updated.bulk}, live ${updated.live}
+`)
               count = 0
             }
             if (!this.subscriberCallbacksEnabled) {
-              const live = await this.storage.getLiveHeightRange()
+              const live = await this.storage.findLiveHeightRange()
               if (!live.isEmpty) {
                 this.subscriberCallbacksEnabled = true
                 this.log(`listening at height of ${live.maxHeight}`)

package/src/services/chaintracker/chaintracks/Ingest/BulkIngestorBase.ts

@@ -17,27 +17,26 @@ export abstract class BulkIngestorBase implements BulkIngestorApi {
   static createBulkIngestorBaseOptions(chain: Chain) {
     const options: BulkIngestorBaseOptions = {
       chain,
-      jsonResource: `${chain}NetBlockHeaders.json`,
-      bypassLiveEnabled: true
+      jsonResource: `${chain}NetBlockHeaders.json`
     }
     return options
   }
 
   chain: Chain
   jsonFilename: string
-  bypassLiveEnabled: boolean
+  log: (...args: any[]) => void = () => {}
 
   constructor(options: BulkIngestorBaseOptions) {
     if (!options.jsonResource) throw new Error('The jsonFilename options property is required.')
     this.chain = options.chain
     this.jsonFilename = options.jsonResource
-    this.bypassLiveEnabled = options.bypassLiveEnabled
   }
 
   private storageEngine: ChaintracksStorageBase | undefined
 
-  async setStorage(storage: ChaintracksStorageBase): Promise<void> {
+  async setStorage(storage: ChaintracksStorageBase, log: (...args: any[]) => void): Promise<void> {
     this.storageEngine = storage
+    this.log = log
   }
 
   async shutdown(): Promise<void> {}

package/src/services/chaintracker/chaintracks/Ingest/BulkIngestorCDN.ts

@@ -167,7 +167,7 @@ export class BulkIngestorCDN extends BulkIngestorBase {
     for (const u of r.updated) {
       log += `  updated: ${u.fileName}, fileId=${u.fileId}\n`
     }
-    console.log(log)
+    this.log(log)
 
     return priorLiveHeaders
   }

package/src/services/chaintracker/chaintracks/Ingest/BulkIngestorWhatsOnChainCdn.ts

@@ -1,5 +1,4 @@
 import { Chain } from '../../../../sdk'
-import { logger } from '../../../../utility/utilityHelpers'
 import { BlockHeader } from '../Api/BlockHeaderApi'
 import { BulkIngestorBaseOptions } from '../Api/BulkIngestorApi'
 import { ChaintracksFetchApi } from '../Api/ChaintracksFetchApi'
@@ -78,7 +77,7 @@ export class BulkIngestorWhatsOnChainCdn extends BulkIngestorBase {
 
   override async getPresentHeight(): Promise<number | undefined> {
     const presentHeight = await this.woc.getChainTipHeight()
-    logger(`presentHeight=${presentHeight}`)
+    this.log(`presentHeight=${presentHeight}`)
     return presentHeight
   }
 
@@ -104,7 +103,7 @@ export class BulkIngestorWhatsOnChainCdn extends BulkIngestorBase {
         }
       }
     } catch (e) {
-      logger(`Errors during WhatsOnChain ingestion:\n${e}`)
+      this.log(`Errors during WhatsOnChain ingestion:\n${e}`)
     }
 
     const liveHeaders = await this.storage().addBulkHeaders(oldHeaders, bulkRange, priorLiveHeaders)

package/src/services/chaintracker/chaintracks/Ingest/BulkIngestorWhatsOnChainWs.ts

@@ -62,6 +62,7 @@ export class BulkIngestorWhatsOnChainWs extends BulkIngestorBase {
       error,
       this.stopOldListenersToken,
       this.chain,
+      this.log,
       this.idleWait
     )
 

package/src/services/chaintracker/chaintracks/Ingest/LiveIngestorBase.ts

@@ -23,6 +23,7 @@ export abstract class LiveIngestorBase implements LiveIngestorApi {
   }
 
   chain: Chain
+  log: (...args: any[]) => void = () => {}
 
   constructor(options: LiveIngestorBaseOptions) {
     this.chain = options.chain
@@ -40,8 +41,9 @@ export abstract class LiveIngestorBase implements LiveIngestorApi {
    * Allocate resources.
    * @param storage coordinating storage engine.
    */
-  async setStorage(storage: ChaintracksStorageApi): Promise<void> {
+  async setStorage(storage: ChaintracksStorageApi, log: (...args: any[]) => void): Promise<void> {
     this.storageEngine = storage
+    this.log = log
   }
 
   /**

package/src/services/chaintracker/chaintracks/Ingest/LiveIngestorWhatsOnChainPoll.ts

@@ -91,7 +91,7 @@ export class LiveIngestorWhatsOnChainPoll extends LiveIngestorBase {
         await wait(1000)
       }
     }
-    console.log(`LiveIngestorWhatsOnChainPoll stopped`)
+    this.log(`LiveIngestorWhatsOnChainPoll stopped`)
   }
 
   stopListening(): void {

package/src/services/chaintracker/chaintracks/Ingest/LiveIngestorWhatsOnChainWs.ts

@@ -40,11 +40,18 @@ export class LiveIngestorWhatsOnChainWs extends LiveIngestorBase {
     }
 
     for (;;) {
-      const ok = await WocHeadersLiveListener(enqueue, error, this.stopNewListenersToken, this.chain, this.idleWait)
+      const ok = await WocHeadersLiveListener(
+        enqueue,
+        error,
+        this.stopNewListenersToken,
+        this.chain,
+        this.log,
+        this.idleWait
+      )
 
       if (!ok || errors.length > 0) {
-        console.log(`WhatsOnChain live ingestor ok=${ok} error count=${errors.length}`)
-        for (const e of errors) console.log(`WhatsOnChain error code=${e.code} count=${e.count} message=${e.message}`)
+        this.log(`WhatsOnChain live ingestor ok=${ok} error count=${errors.length}`)
+        for (const e of errors) this.log(`WhatsOnChain error code=${e.code} count=${e.count} message=${e.message}`)
       }
 
       if (ok) break

package/src/services/chaintracker/chaintracks/Ingest/WhatsOnChainIngestorWs.ts

@@ -4,8 +4,6 @@ import { wait } from '../../../../utility/utilityHelpers'
 import { Chain } from '../../../../sdk/types'
 import { BlockHeader } from '../../../../sdk/WalletServices.interfaces'
 
-const logger = console.log.bind(console)
-
 export type StopListenerToken = { stop: (() => void) | undefined }
 
 async function getWhatsOnChainTipHeight(chain: Chain = 'main', apiKey?: string): Promise<number> {
@@ -31,7 +29,8 @@ export async function WocHeadersBulkListener(
   enqueue: (header: BlockHeader) => void,
   error: (code: number, message: string) => boolean,
   stop: StopListenerToken,
-  chain: Chain = 'main',
+  chain: Chain,
+  logger: (...args: any[]) => void = () => {},
   idleWait = 5000
 ): Promise<boolean> {
   //logger(`WocHeadersBulkListener from ${fromHeight} to ${toHeight} on ${chain} chain`)
@@ -243,6 +242,7 @@ export async function WocHeadersBulkListener_test(): Promise<void> {
           },
           stop,
           chain,
+          console.log.bind(console),
           5000
         ))
       ) {
@@ -267,7 +267,8 @@ export async function WocHeadersLiveListener(
   enqueue: (header: BlockHeader) => void,
   error: (code: number, message: string) => boolean,
   stop: StopListenerToken,
-  chain: Chain = 'main',
+  chain: Chain,
+  logger: (...args: any[]) => void,
   idleWait = 100000
 ): Promise<boolean> {
   let count = 0
@@ -425,6 +426,7 @@ export async function WocHeadersLiveListener_test(): Promise<void> {
         },
         stop,
         chain,
+        console.log.bind(console),
         100000
       ))
     ) {

package/src/services/chaintracker/chaintracks/Ingest/__tests/BulkIngestorCDNBabbage.test.ts

@@ -44,7 +44,7 @@ async function testUpdateLocalCache(chain: Chain, test: string) {
   const knexOptions = ChaintracksStorageKnex.createStorageKnexOptions(chain, makeKnex(localSqlite))
   const storage = new ChaintracksStorageKnex(knexOptions)
   const before = await storage.getAvailableHeightRanges()
-  await cdn.setStorage(storage)
+  await cdn.setStorage(storage, console.log)
 
   const range = new HeightRange(0, 9900000)
   const liveHeaders = await cdn.fetchHeaders(before, range, range, [])

package/src/services/chaintracker/chaintracks/Ingest/__tests/WhatsOnChainServices.test.ts

@@ -73,7 +73,7 @@ describe('WhatsOnChainServices tests', () => {
       errorsNew.push({ code, message })
       return true
     }
-    const okNew = await WocHeadersLiveListener(eh, errh, stopNewListenersToken, chain)
+    const okNew = await WocHeadersLiveListener(eh, errh, stopNewListenersToken, chain, console.log.bind(console))
     if (errorsNew.length > 0) console.log(JSON.stringify(errorsNew))
     expect(errorsNew.length).toBe(0)
     expect(okNew).toBe(true)

package/src/services/chaintracker/chaintracks/Storage/BulkStorageBase.ts

@@ -27,6 +27,7 @@ export abstract class BulkStorageBase implements BulkStorageApi {
 
   chain: Chain
   fs: ChaintracksFsApi
+  log: (...args: any[]) => void = () => {}
 
   constructor(options: BulkStorageBaseOptions) {
     this.chain = options.chain
@@ -50,7 +51,7 @@ export abstract class BulkStorageBase implements BulkStorageApi {
     return new HeightRange(0, await this.getMaxHeight())
   }
 
-  async setStorage(storage: ChaintracksStorageBase): Promise<void> {}
+  async setStorage(storage: ChaintracksStorageBase, log: (...args: any[]) => void): Promise<void> {}
 
   async exportBulkHeaders(rootFolder: string, jsonFilename: string, maxPerFile: number): Promise<void> {
     const info: BulkHeaderFilesInfo = {