@bsv/wallet-toolbox 1.6.4 → 1.6.6

package/src/services/chaintracker/chaintracks/util/BulkFileDataManager.ts

@@ -47,6 +47,8 @@ export class BulkFileDataManager {
     }
   }
 
+  private log: (...args: any[]) => void = () => {}
+
   private bfds: BulkFileData[] = []
   private fileHashToIndex: Record<string, number> = {}
   private lock: SingleWriterMultiReaderLock = new SingleWriterMultiReaderLock()
@@ -109,17 +111,26 @@ export class BulkFileDataManager {
     log += `  url: ${url}\n`
     log += `  bulk range before: ${rangeBefore}\n`
     log += `  bulk range after:  ${rangeAfter}\n`
-    console.log(log)
+    this.log(log)
   }
 
-  async setStorage(storage: ChaintracksStorageBulkFileApi): Promise<void> {
-    return this.lock.withWriteLock(async () => this.setStorageNoLock(storage))
+  async setStorage(storage: ChaintracksStorageBulkFileApi, log: (...args: any[]) => void): Promise<void> {
+    return this.lock.withWriteLock(async () => this.setStorageNoLock(storage, log))
   }
 
-  private async setStorageNoLock(storage: ChaintracksStorageBulkFileApi): Promise<void> {
+  private async setStorageNoLock(storage: ChaintracksStorageBulkFileApi, log: (...args: any[]) => void): Promise<void> {
     this.storage = storage
+    this.log = log
     // Sync bfds with storage. Two scenarios supported:
-    const sfs = await this.storage.getBulkFiles()
+    let sfs = await this.storage.getBulkFiles()
+    const lastCdnBfd = this.bfds.filter(f => isBdfCdn(f)).slice(-1)[0]
+    const lastCdnSfs = sfs.filter(f => isBdfCdn(f)).slice(-1)[0]
+    if (lastCdnBfd && lastCdnSfs && lastCdnBfd.firstHeight + lastCdnBfd.count > lastCdnSfs.firstHeight + lastCdnSfs.count) {
+      // Storage has fewer cdn headers than bfds, clear them and try again.
+      for (const s of sfs.reverse())
+        await this.storage.deleteBulkFile(s.fileId!);
+      sfs = []
+    }
     if (sfs.length === 0) {
       // 1. Storage has no files: Update storage to reflect bfds.
       for (const bfd of this.bfds) {
@@ -141,11 +152,9 @@ export class BulkFileDataManager {
     this.fileHashToIndex = {}
 
     if (this.fromKnownSourceUrl) {
-      const files = selectBulkHeaderFiles(
-        validBulkHeaderFiles.filter(f => f.sourceUrl === this.fromKnownSourceUrl),
-        this.chain,
-        this.maxPerFile
-      )
+      const vbhfs = validBulkHeaderFiles
+      const filtered = vbhfs.filter(f => f.sourceUrl === this.fromKnownSourceUrl)
+      const files = selectBulkHeaderFiles(filtered, this.chain, this.maxPerFile)
       for (const file of files) {
         this.add({ ...file, fileHash: file.fileHash!, mru: Date.now() })
       }
@@ -187,7 +196,7 @@ export class BulkFileDataManager {
         }
       }
     }
-    console.log(`BulkFileDataManager.merge:\n${this.toLogString(r)}\n`)
+    this.log(`BulkFileDataManager.merge:\n${this.toLogString(r)}\n`)
     return r
   }
 

package/src/services/chaintracker/chaintracks/util/BulkFilesReader.ts

@@ -325,7 +325,7 @@ export class BulkFilesReaderStorage extends BulkFilesReader {
 
   static async fromStorage(
     storage: ChaintracksStorageBase,
-    fetch: ChaintracksFetchApi,
+    fetch?: ChaintracksFetchApi,
     range?: HeightRange,
     maxBufferSize?: number
   ): Promise<BulkFilesReaderStorage> {

package/src/services/chaintracker/chaintracks/util/BulkHeaderFile.ts

@@ -189,7 +189,7 @@ export class BulkHeaderFileStorage extends BulkHeaderFile {
   constructor(
     info: BulkHeaderFileInfo,
     public storage: ChaintracksStorageBase,
-    public fetch: ChaintracksFetchApi
+    public fetch?: ChaintracksFetchApi
   ) {
     super(info)
   }
@@ -200,8 +200,8 @@ export class BulkHeaderFileStorage extends BulkHeaderFile {
 
   override async ensureData(): Promise<Uint8Array> {
     if (this.data) return this.data
-    if (!this.sourceUrl) {
-      throw new WERR_INVALID_PARAMETER('sourceUrl', 'defined. Or data must be defined.')
+    if (!this.sourceUrl || !this.fetch) {
+      throw new WERR_INVALID_PARAMETER('sourceUrl and fetch', 'defined. Or data must be defined.')
     }
     const url = this.fetch.pathJoin(this.sourceUrl!, this.fileName)
     this.data = await this.fetch.download(url)

package/src/services/chaintracker/chaintracks/util/HeightRange.ts

@@ -62,7 +62,10 @@ export class HeightRange implements HeightRangeApi {
    * @returns
    */
   intersect(range: HeightRange) {
-    return new HeightRange(Math.max(this.minHeight, range.minHeight), Math.min(this.maxHeight, range.maxHeight))
+    //if (this.isEmpty || range.isEmpty) return HeightRange.empty
+    //if (this.maxHeight < range.minHeight || this.minHeight > range.maxHeight) return HeightRange.empty
+    const r = new HeightRange(Math.max(this.minHeight, range.minHeight), Math.min(this.maxHeight, range.maxHeight))
+    return r
   }
 
   /**

package/src/services/chaintracker/chaintracks/util/validBulkHeaderFilesByFileHash.ts

@@ -242,16 +242,16 @@ export const validBulkHeaderFiles: BulkHeaderFileInfo[] = [
     validated: true
   },
   {
-    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders',
-    fileName: 'testNet_16.headers',
+    sourceUrl: "https://cdn.projectbabbage.com/blockheaders",
+    fileName: "testNet_16.headers",
     firstHeight: 1600000,
-    prevHash: '00000000000005504bfd1a3ce4688c30c86740390102b6cd464a2fb5e0e3fed1',
-    count: 77821,
-    lastHash: '0000000065ef364929e71688b29320c5835fabd8a1c0b6d42b6726cb4afcc798',
-    fileHash: 'AK1FlgOaPVFOeG2x+Tp7htOt15UaSpHXZjgx3F263x8=',
-    lastChainWork: '00000000000000000000000000000000000000000000015814b641eb5d72e2ef',
-    prevChainWork: '000000000000000000000000000000000000000000000156c3b84396da4e60b9',
-    chain: 'test',
+    prevHash: "00000000000005504bfd1a3ce4688c30c86740390102b6cd464a2fb5e0e3fed1",
+    count: 89594,
+    lastHash: "0000000035ba2558f604ff73909944235b8094f07c0efa9c91f59b62b4920516",
+    fileHash: "jw+ItRm5zjngLuuClRZONclYWCC66wPovV3XPF585KU=",
+    lastChainWork: "00000000000000000000000000000000000000000000015814b79f747a43902a",
+    prevChainWork: "000000000000000000000000000000000000000000000156c3b84396da4e60b9",
+    chain: "test",
     validated: true
   },
   {
@@ -368,7 +368,8 @@ export const validBulkHeaderFiles: BulkHeaderFileInfo[] = [
     lastHash: '00000000000000000e7dcc27c06ee353bd37260b2e7e664314c204f0324a5087',
     prevChainWork: '000000000000000000000000000000000000000001483b2995af390c20b58320',
     prevHash: '00000000000000000b6ae23bbe9f549844c20943d8c20b8ceedbae8aa1dde8e0',
-    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders'
+    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders',
+    validated: true
   },
   {
     chain: 'main',
@@ -380,6 +381,20 @@ export const validBulkHeaderFiles: BulkHeaderFileInfo[] = [
     lastHash: '00000000000000000c119d65afcc66b640e98b839414c7e66d22b428ecb24a43',
     prevChainWork: '000000000000000000000000000000000000000001664db1f2d50327928007e0',
     prevHash: '00000000000000000e7dcc27c06ee353bd37260b2e7e664314c204f0324a5087',
-    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders'
+    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders',
+    validated: true
+  },
+  {
+    chain: "main",
+    count: 10376,
+    fileHash: "0CXeFvl+RHRb9kRKp6032vKCVnbs2K9A3Aa4cxg7iJU=",
+    fileName: "mainNet_9.headers",
+    firstHeight: 900000,
+    lastChainWork: "000000000000000000000000000000000000000001683907cdf89f89a1258f08",
+    lastHash: "00000000000000000413b1b30aa83898de436af0906bb178904900069ec26337",
+    prevChainWork: "000000000000000000000000000000000000000001664db1f2d50327928007e0",
+    prevHash: "00000000000000000e7dcc27c06ee353bd37260b2e7e664314c204f0324a5087",
+    sourceUrl: "https://cdn.projectbabbage.com/blockheaders",
+    validated: true
   }
 ]

package/src/services/createDefaultWalletServicesOptions.ts

@@ -1,60 +1,67 @@
 import { Chain } from '../sdk/types'
 import { WalletServicesOptions } from '../sdk/WalletServices.interfaces'
 import { randomBytesHex } from '../utility/utilityHelpers'
+import { ChaintracksClientApi } from './chaintracker/chaintracks/Api/ChaintracksClientApi'
 import { ChaintracksServiceClient } from './chaintracker/chaintracks/ChaintracksServiceClient'
 
 export function createDefaultWalletServicesOptions(
   chain: Chain,
   arcCallbackUrl?: string,
   arcCallbackToken?: string,
-  arcApiKey?: string
+  taalArcApiKey?: string,
+  gorillaPoolArcApiKey?: string,
+  bitailsApiKey?: string,
+  deploymentId?: string,
+  chaintracks?: ChaintracksClientApi
 ): WalletServicesOptions {
-  const deploymentId = `wallet-toolbox-${randomBytesHex(16)}`
-  const taalApiKey =
-    arcApiKey || chain === 'main'
-      ? 'mainnet_9596de07e92300c6287e4393594ae39c' // no plan
-      : 'testnet_0e6cf72133b43ea2d7861da2a38684e3' // personal "starter" key
+  deploymentId ||= `wallet-toolbox-${randomBytesHex(16)}`
 
   //const chaintracksUrl = `https://npm-registry.babbage.systems:${chain === 'main' ? 8084 : 8083}`
   const chaintracksUrl = `https://${chain}net-chaintracks.babbage.systems`
+  // The mainnet endpoint is always used since these are fiat exchange rates,
+  // independent of the chain being used.
+  const chaintracksFiatExchangeRatesUrl = `https://mainnet-chaintracks.babbage.systems/getFiatExchangeRates`
+
+  chaintracks ||= new ChaintracksServiceClient(chain, chaintracksUrl)
 
   const o: WalletServicesOptions = {
     chain,
-    taalApiKey,
+    taalApiKey: undefined,
     bsvExchangeRate: {
-      timestamp: new Date('2023-12-13'),
+      timestamp: new Date('2025-08-31'),
       base: 'USD',
-      rate: 47.52
+      rate: 26.17
     },
     bsvUpdateMsecs: 1000 * 60 * 15, // 15 minutes
     fiatExchangeRates: {
-      timestamp: new Date('2023-12-13'),
+      timestamp: new Date('2025-08-31'),
       base: 'USD',
       rates: {
         USD: 1,
-        GBP: 0.8,
-        EUR: 0.93
+        GBP: 0.7528,
+        EUR: 0.8558
       }
     },
     fiatUpdateMsecs: 1000 * 60 * 60 * 24, // 24 hours
-    disableMapiCallback: true, // Rely on WalletMonitor by default.
+    disableMapiCallback: true, // MAPI callback's are deprecated. Rely on WalletMonitor by default.
     exchangeratesapiKey: 'bd539d2ff492bcb5619d5f27726a766f',
-    chaintracksFiatExchangeRatesUrl: `${chaintracksUrl}/getFiatExchangeRates`,
-    chaintracks: new ChaintracksServiceClient(chain, chaintracksUrl),
+    chaintracksFiatExchangeRatesUrl,
+    chaintracks,
     arcUrl: arcDefaultUrl(chain),
     arcConfig: {
-      apiKey: arcApiKey ?? undefined,
+      apiKey: taalArcApiKey ?? undefined,
       deploymentId,
       callbackUrl: arcCallbackUrl ?? undefined,
       callbackToken: arcCallbackToken ?? undefined
     },
     arcGorillaPoolUrl: arcGorillaPoolUrl(chain),
     arcGorillaPoolConfig: {
-      apiKey: arcApiKey ?? undefined,
+      apiKey: gorillaPoolArcApiKey ?? undefined,
       deploymentId,
       callbackUrl: arcCallbackUrl ?? undefined,
       callbackToken: arcCallbackToken ?? undefined
-    }
+    },
+    bitailsApiKey
   }
   return o
 }

package/src/services/providers/__tests/exchangeRates.test.ts

@@ -0,0 +1,18 @@
+import { _tu } from '../../../../test/utils/TestUtilsWalletStorage'
+import { WalletServicesOptions } from '../../../sdk/WalletServices.interfaces'
+import { createDefaultWalletServicesOptions } from '../../createDefaultWalletServicesOptions'
+import { updateExchangeratesapi } from '../exchangeRates'
+
+describe('exchangeRates tests', () => {
+  jest.setTimeout(99999999)
+
+  test('0', async () => {
+    if (_tu.noEnv('main')) return
+    const o = createDefaultWalletServicesOptions('main')
+    // The default api key for this service is severely use limited,
+    // do not run this test aggressively. Without substituting your own key.
+    // o.exchangeratesapiKey = 'YOUR_API_KEY'
+    const r = await updateExchangeratesapi(['EUR', 'GBP', 'USD'], o)
+    expect(r).toBeDefined()
+  })
+})

package/src/storage/remoting/StorageServer.ts

@@ -61,6 +61,11 @@ export class StorageServer {
       }
     })
 
+    this.app.get(`/robots.txt`, (req: Request, res: Response) => {
+      res.type('text/plain')
+      res.send(`User-agent: *\nDisallow: /`)
+    })
+    
     const options: AuthMiddlewareOptions = {
       wallet: this.wallet as WalletInterface
     }

package/test/Wallet/support/operations.man.test.ts

@@ -11,7 +11,7 @@ describe('operations.man tests', () => {
 
   test('0 review and release all production invalid change utxos', async () => {
     const { env, storage } = await _tu.createMainReviewSetup()
-    const users = await storage.findUsers({ partial: { userId: 696 } })
+    const users = await storage.findUsers({ partial: {} })
     const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
     const vargs: ValidListOutputsArgs = {
       basket: specOpInvalidChange,