@bsv/wallet-toolbox 1.6.22 → 1.6.24

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

@@ -0,0 +1,60 @@
+import { Chain } from '../../../sdk'
+import { Chaintracks } from './Chaintracks'
+import { ChaintracksFetch } from './util/ChaintracksFetch'
+import { ChaintracksFetchApi } from './Api/ChaintracksFetchApi'
+import { ChaintracksStorageNoDb } from './Storage/ChaintracksStorageNoDb'
+import { createDefaultNoDbChaintracksOptions } from './createDefaultNoDbChaintracksOptions'
+
+export async function createNoDbChaintracks(
+  chain: Chain,
+  whatsonchainApiKey: string = '',
+  maxPerFile: number = 100000,
+  maxRetained: number = 2,
+  fetch?: ChaintracksFetchApi,
+  cdnUrl: string = 'https://cdn.projectbabbage.com/blockheaders/',
+  liveHeightThreshold: number = 2000,
+  reorgHeightThreshold: number = 400,
+  bulkMigrationChunkSize: number = 500,
+  batchInsertLimit: number = 400,
+  addLiveRecursionLimit: number = 36
+): Promise<{
+  chain: Chain
+  maxPerFile: number
+  fetch: ChaintracksFetchApi
+  storage: ChaintracksStorageNoDb
+  chaintracks: Chaintracks
+  available: Promise<void>
+}> {
+  try {
+    fetch ||= new ChaintracksFetch()
+
+    const co = createDefaultNoDbChaintracksOptions(
+      chain,
+      whatsonchainApiKey,
+      maxPerFile,
+      maxRetained,
+      fetch,
+      cdnUrl,
+      liveHeightThreshold,
+      reorgHeightThreshold,
+      bulkMigrationChunkSize,
+      batchInsertLimit,
+      addLiveRecursionLimit
+    )
+
+    const chaintracks = new Chaintracks(co)
+    const available = chaintracks.makeAvailable()
+
+    return {
+      chain,
+      fetch,
+      maxPerFile,
+      storage: co.storage as ChaintracksStorageNoDb,
+      chaintracks,
+      available
+    }
+  } catch (error) {
+    console.error('Error setting up Chaintracks with NoDb Storage:', error)
+    throw error
+  }
+}

package/src/services/chaintracker/chaintracks/index.all.ts

@@ -5,6 +5,7 @@ export * from './Storage/ChaintracksStorageKnex'
 export * from './Storage/ChaintracksStorageMemory'
 
 export * from './createDefaultKnexChaintracksOptions'
+export * from './createKnexChaintracks'
 
 export * from './ChaintracksService'
 export * from './Ingest/BulkIngestorWhatsOnChainWs'

package/src/services/chaintracker/chaintracks/index.client.ts

@@ -1,37 +1,4 @@
-export { Chain } from '../../../sdk/types'
+export * from './index.mobile'
 
-export * from './Api/ChaintracksApi'
-export * from './Api/ChaintracksFsApi'
-export * from './Api/ChaintracksFetchApi'
-export * from './Api/ChaintracksStorageApi'
-export * from './Api/BulkStorageApi'
-export * from './Api/BulkIngestorApi'
-export * from './Api/LiveIngestorApi'
-export * from './Api/BlockHeaderApi'
-
-export * from './Chaintracks'
-export * from './ChaintracksServiceClient'
-
-export * from './Ingest/BulkIngestorBase'
-export * from './Ingest/LiveIngestorBase'
-
-export * from './Ingest/BulkIngestorCDN'
-export * from './Ingest/BulkIngestorCDNBabbage'
-export * from './Ingest/BulkIngestorWhatsOnChainCdn'
-export * from './Ingest/LiveIngestorWhatsOnChainPoll'
-export * from './Ingest/WhatsOnChainServices'
-
-export * from './Storage/BulkStorageBase'
-export * from './Storage/ChaintracksStorageBase'
-export * from './Storage/ChaintracksStorageNoDb'
-export * from './Storage/ChaintracksStorageIdb'
-
-export * from './createDefaultNoDbChaintracksOptions'
+export * from './createDefaultIdbChaintracksOptions'
 export * from './createIdbChaintracks'
-
-export * from './util/BulkFilesReader'
-export * from './util/HeightRange'
-export * from './util/BulkFileDataManager'
-export * from './util/ChaintracksFetch'
-
-export * as utils from './util/blockHeaderUtilities'

package/src/services/chaintracker/chaintracks/index.mobile.ts

@@ -0,0 +1,37 @@
+export { Chain } from '../../../sdk/types'
+
+export * from './Api/ChaintracksApi'
+export * from './Api/ChaintracksFsApi'
+export * from './Api/ChaintracksFetchApi'
+export * from './Api/ChaintracksStorageApi'
+export * from './Api/BulkStorageApi'
+export * from './Api/BulkIngestorApi'
+export * from './Api/LiveIngestorApi'
+export * from './Api/BlockHeaderApi'
+
+export * from './Chaintracks'
+export * from './ChaintracksServiceClient'
+
+export * from './Ingest/BulkIngestorBase'
+export * from './Ingest/LiveIngestorBase'
+
+export * from './Ingest/BulkIngestorCDN'
+export * from './Ingest/BulkIngestorCDNBabbage'
+export * from './Ingest/BulkIngestorWhatsOnChainCdn'
+export * from './Ingest/LiveIngestorWhatsOnChainPoll'
+export * from './Ingest/WhatsOnChainServices'
+
+export * from './Storage/BulkStorageBase'
+export * from './Storage/ChaintracksStorageBase'
+export * from './Storage/ChaintracksStorageNoDb'
+export * from './Storage/ChaintracksStorageIdb'
+
+export * from './createDefaultNoDbChaintracksOptions'
+export * from './createNoDbChaintracks'
+
+export * from './util/BulkFilesReader'
+export * from './util/HeightRange'
+export * from './util/BulkFileDataManager'
+export * from './util/ChaintracksFetch'
+
+export * as utils from './util/blockHeaderUtilities'

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

@@ -274,16 +274,16 @@ export const validBulkHeaderFiles: BulkHeaderFileInfo[] = [
     validated: true
   },
   {
-    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders',
+    chain: 'test',
+    count: 95262,
+    fileHash: 'BvNO9eeMwCaN1Xsx8PQLMJ+YiqF9FrNe+9WnnEo9B44=',
     fileName: 'testNet_16.headers',
     firstHeight: 1600000,
-    prevHash: '00000000000005504bfd1a3ce4688c30c86740390102b6cd464a2fb5e0e3fed1',
-    count: 89594,
-    lastHash: '0000000035ba2558f604ff73909944235b8094f07c0efa9c91f59b62b4920516',
-    fileHash: 'jw+ItRm5zjngLuuClRZONclYWCC66wPovV3XPF585KU=',
-    lastChainWork: '00000000000000000000000000000000000000000000015814b79f747a43902a',
+    lastChainWork: '00000000000000000000000000000000000000000000015814b84c3f9834ef93',
+    lastHash: '000000000ca922c841cb7fedd8f012ebc27b17991c9b00a8fb7ca4b1b2b648d3',
     prevChainWork: '000000000000000000000000000000000000000000000156c3b84396da4e60b9',
-    chain: 'test',
+    prevHash: '00000000000005504bfd1a3ce4688c30c86740390102b6cd464a2fb5e0e3fed1',
+    sourceUrl: 'https://cdn.projectbabbage.com/blockheaders',
     validated: true
   },
   {
@@ -418,12 +418,12 @@ export const validBulkHeaderFiles: BulkHeaderFileInfo[] = [
   },
   {
     chain: 'main',
-    count: 10376,
-    fileHash: '0CXeFvl+RHRb9kRKp6032vKCVnbs2K9A3Aa4cxg7iJU=',
+    count: 15512,
+    fileHash: 'sbLY7ZiEWkdvgAbZlWxYJfd/CLxeYPtuwHrc4WZ0aL4=',
     fileName: 'mainNet_9.headers',
     firstHeight: 900000,
-    lastChainWork: '000000000000000000000000000000000000000001683907cdf89f89a1258f08',
-    lastHash: '00000000000000000413b1b30aa83898de436af0906bb178904900069ec26337',
+    lastChainWork: '00000000000000000000000000000000000000000168d586f9048fd69f17e1ca',
+    lastHash: '000000000000000004c5e39626c72e67d669135a7c004ee86f7191e3ed01cdee',
     prevChainWork: '000000000000000000000000000000000000000001664db1f2d50327928007e0',
     prevHash: '00000000000000000e7dcc27c06ee353bd37260b2e7e664314c204f0324a5087',
     sourceUrl: 'https://cdn.projectbabbage.com/blockheaders',

package/src/services/chaintracker/index.mobile.ts

@@ -0,0 +1,4 @@
+export * from './chaintracks/index.mobile'
+
+export * from './ChaintracksChainTracker'
+export * from './BHServiceClient'

package/src/storage/methods/createAction.ts

@@ -27,7 +27,12 @@ import {
   StorageGetBeefOptions,
   StorageProvidedBy
 } from '../../sdk/WalletStorage.interfaces'
-import { ValidCreateActionArgs, ValidCreateActionInput, ValidCreateActionOutput, validateSatoshis } from '../../sdk/validationHelpers'
+import {
+  ValidCreateActionArgs,
+  ValidCreateActionInput,
+  ValidCreateActionOutput,
+  validateSatoshis
+} from '../../sdk/validationHelpers'
 import { WERR_INTERNAL, WERR_INVALID_PARAMETER } from '../../sdk/WERR_errors'
 import {
   randomBytesBase64,

package/src/storage/schema/KnexMigrations.ts

@@ -73,6 +73,19 @@ export class KnexMigrations implements MigrationSource<string> {
       }
     }
 
+    migrations['2025-09-06-001 add proven txs blockHash index'] = {
+      async up(knex) {
+        await knex.schema.alterTable('proven_txs', table => {
+          table.index('blockHash')
+        })
+      },
+      async down(knex) {
+        await knex.schema.alterTable('proven_txs', table => {
+          table.dropIndex('blockHash')
+        })
+      }
+    }
+
     migrations['2025-05-13-001 add monitor events event index'] = {
       async up(knex) {
         await knex.schema.alterTable('monitor_events', table => {

package/syncVersions.js

@@ -0,0 +1,71 @@
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+/**
+ * Synchronizes version numbers from root package.json to mobile and client package.json files
+ * and updates package-lock.json files by running npm install
+ */
+function syncVersions() {
+  try {
+    // Read the root package.json
+    const rootPackagePath = path.join(__dirname, 'package.json');
+    const rootPackage = JSON.parse(fs.readFileSync(rootPackagePath, 'utf8'));
+    const version = rootPackage.version;
+
+    console.log(`Root package version: ${version}`);
+
+    // Directories to update
+    const directoriesToUpdate = [
+      { packagePath: './mobile/package.json', dir: './mobile' },
+      { packagePath: './client/package.json', dir: './client' }
+    ];
+
+    // Update each package.json file and run npm install
+    directoriesToUpdate.forEach(({ packagePath, dir }) => {
+      const fullPath = path.join(__dirname, packagePath);
+      const fullDirPath = path.join(__dirname, dir);
+      
+      if (fs.existsSync(fullPath)) {
+        const packageData = JSON.parse(fs.readFileSync(fullPath, 'utf8'));
+        const oldVersion = packageData.version;
+        
+        packageData.version = version;
+        fs.writeFileSync(fullPath, JSON.stringify(packageData, null, 2) + '\n');
+        
+        console.log(`Updated ${packagePath}: ${oldVersion} → ${version}`);
+        
+        // Run npm install to update package-lock.json
+        if (fs.existsSync(fullDirPath)) {
+          console.log(`Running npm install in ${dir}...`);
+          try {
+            execSync('npm install', { 
+              cwd: fullDirPath, 
+              stdio: 'inherit',
+              timeout: 60000 // 60 second timeout
+            });
+            console.log(`✓ npm install completed in ${dir}`);
+          } catch (installError) {
+            console.error(`✗ npm install failed in ${dir}:`, installError.message);
+          }
+        } else {
+          console.warn(`Warning: Directory ${dir} not found`);
+        }
+      } else {
+        console.warn(`Warning: ${packagePath} not found`);
+      }
+    });
+
+    console.log('Version synchronization completed successfully!');
+  } catch (error) {
+    console.error('Error synchronizing versions:', error.message);
+    process.exit(1);
+  }
+}
+
+// Run the function if this script is executed directly
+if (require.main === module) {
+  syncVersions();
+}
+
+module.exports = syncVersions;

package/test/monitor/Monitor.test.ts

@@ -1,13 +1,18 @@
 import { Beef, MerklePath } from '@bsv/sdk'
-import { asArray, EntityProvenTxReq, sdk, verifyOne, verifyTruthy, wait } from '../../src/index.client'
 import { TaskCheckForProofs } from '../../src/monitor/tasks/TaskCheckForProofs'
 import { TaskClock } from '../../src/monitor/tasks/TaskClock'
 import { TaskNewHeader } from '../../src/monitor/tasks/TaskNewHeader'
 import { TaskPurge } from '../../src/monitor/tasks/TaskPurge'
 import { TaskSendWaiting } from '../../src/monitor/tasks/TaskSendWaiting'
 import { _tu, TestSetup1Wallet, TestWallet } from '../utils/TestUtilsWalletStorage'
-import exp from 'constants'
 import { TaskReviewStatus } from '../../src/monitor/tasks/TaskReviewStatus'
+import { WERR_INTERNAL } from '../../src/sdk/WERR_errors'
+import { Monitor } from '../../src/monitor/Monitor'
+import { verifyOne, verifyTruthy, wait } from '../../src/utility/utilityHelpers'
+import { EntityProvenTxReq } from '../../src/storage/schema/entities/EntityProvenTxReq'
+import { GetMerklePathResult } from '../../src/sdk/WalletServices.interfaces'
+import { ProvenTransactionStatus } from '../../src/sdk/types'
+import { ReviewActionResult } from '../../src/sdk/WalletStorage.interfaces'
 
 describe('Monitor tests', () => {
   jest.setTimeout(99999999)
@@ -37,7 +42,7 @@ describe('Monitor tests', () => {
 
     // This test takes a bit over a minute to run... un-skip it to work on it.
     for (const { chain, wallet, services, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       {
         // The clock attempts to update nextMinute to msecs for each minute.
@@ -47,10 +52,10 @@ describe('Monitor tests', () => {
         monitor._tasks.push(task)
         const msecsFirst = task.nextMinute
         const startTasksPromise = monitor.startTasks()
-        await wait(monitor.oneMinute * 1.1)
+        await wait(Monitor.oneMinute * 1.1)
         const msecsNext = task.nextMinute
         monitor.stopTasks()
-        const elapsed = (msecsNext - msecsFirst) / monitor.oneMinute
+        const elapsed = (msecsNext - msecsFirst) / Monitor.oneMinute
         expect(elapsed === 1 || elapsed === 2).toBe(true)
         await startTasksPromise
       }
@@ -62,7 +67,7 @@ describe('Monitor tests', () => {
 
     // This test takes 10+ seconds to run... un-skip it to work on it.
     for (const { chain, wallet, services, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       {
         // The new header task polls chaintracks for latest header and if new sets flag to check for proofs.
@@ -71,7 +76,7 @@ describe('Monitor tests', () => {
         monitor._tasks.push(task)
         expect(TaskCheckForProofs.checkNow).toBe(false)
         const startTasksPromise = monitor.startTasks()
-        await wait(monitor.oneSecond * 10)
+        await wait(Monitor.oneSecond * 10)
         expect(task.header).toBeTruthy()
         expect(TaskCheckForProofs.checkNow).toBe(true)
         monitor.stopTasks()
@@ -91,7 +96,7 @@ describe('Monitor tests', () => {
         */
 
     for (const { chain, wallet, services, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       {
         const task = new TaskPurge(monitor, {
@@ -141,7 +146,7 @@ describe('Monitor tests', () => {
     })
 
     for (const { activeStorage: storage, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       monitor.lastNewHeader = {
         height: 999999999,
@@ -203,7 +208,7 @@ describe('Monitor tests', () => {
     })
 
     for (const { activeStorage: storage, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       {
         const attempts: number[] = []
@@ -238,7 +243,7 @@ describe('Monitor tests', () => {
     }
   })
 
-  const mockGetMerklePathResults: sdk.GetMerklePathResult[] = [
+  const mockGetMerklePathResults: GetMerklePathResult[] = [
     {
       name: 'WoCTsc',
       merklePath: new MerklePath(1652142, [
@@ -411,7 +416,7 @@ describe('Monitor tests', () => {
     })
 
     for (const { activeStorage: storage, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       {
         const task = new TaskSendWaiting(monitor, 1, 1)
@@ -512,7 +517,7 @@ describe('Monitor tests', () => {
     })
 
     for (const { activeStorage: storage, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       monitor.lastNewHeader = {
         height: 999999999,
@@ -525,7 +530,7 @@ describe('Monitor tests', () => {
         nonce: 0
       }
 
-      monitor.onTransactionProven = async (txStatus: sdk.ProvenTransactionStatus) => {
+      monitor.onTransactionProven = async (txStatus: ProvenTransactionStatus) => {
         expect(txStatus.txid).toBeTruthy()
         expect(txStatus.blockHash).toBeTruthy()
         expect(txStatus.blockHeight).toBeTruthy()
@@ -581,14 +586,14 @@ describe('Monitor tests', () => {
     })
 
     for (const { activeStorage: storage, monitor } of ctxs) {
-      if (!monitor) throw new sdk.WERR_INTERNAL('test requires setup with monitor')
+      if (!monitor) throw new WERR_INTERNAL('test requires setup with monitor')
 
       for (const txid of expectedTxids) {
         const req = verifyTruthy(await EntityProvenTxReq.fromStorageTxid(storage, txid))
         expect(req.status).toBe('unsent')
       }
 
-      monitor.onTransactionBroadcasted = async (broadcastResult: sdk.ReviewActionResult) => {
+      monitor.onTransactionBroadcasted = async (broadcastResult: ReviewActionResult) => {
         expect(broadcastResult.status).toBe('success')
         expect(expectedTxids).toContain(broadcastResult.txid)
         updatesReceived++