@bsv/wallet-toolbox 1.3.24 → 1.3.26

package/src/storage/StorageProvider.ts

@@ -40,6 +40,7 @@ import { createAction } from './methods/createAction'
 import { internalizeAction } from './methods/internalizeAction'
 import { StorageReaderWriter, StorageReaderWriterOptions } from './StorageReaderWriter'
 import { EntityProvenTx, EntityProvenTxReq, EntitySyncState, EntityTransaction } from './schema/entities'
+import { ServicesCallHistory } from '../sdk/WalletServices.interfaces'
 
 export abstract class StorageProvider extends StorageReaderWriter implements sdk.WalletStorageProvider {
   isDirty = false
@@ -106,7 +107,7 @@ export abstract class StorageProvider extends StorageReaderWriter implements sdk
   abstract findOutputsAuth(auth: sdk.AuthId, args: sdk.FindOutputsArgs): Promise<TableOutput[]>
   abstract insertCertificateAuth(auth: sdk.AuthId, certificate: TableCertificateX): Promise<number>
 
-  abstract adminStats(adminIdentityKey: string): Promise<StorageAdminStats>
+  abstract adminStats(adminIdentityKey: string): Promise<AdminStatsResult>
 
   override isStorageProvider(): boolean {
     return true
@@ -417,7 +418,7 @@ export abstract class StorageProvider extends StorageReaderWriter implements sdk
     requiredLevels?: number
   ): Promise<Beef> {
     const beef = await this.getValidBeefForTxid(txid, mergeToBeef, trustSelf, knownTxids, trx, requiredLevels)
-    if (!beef) throw new sdk.WERR_INVALID_PARAMETER('txid', `${txid} is not known to storage.`)
+    if (!beef) throw new sdk.WERR_INVALID_PARAMETER('txid', `known to storage. ${txid} is not known.`)
     return beef
   }
 
@@ -773,3 +774,8 @@ export interface StorageAdminStats {
   tagsMonth: number
   tagsTotal: number
 }
+
+export interface AdminStatsResult extends StorageAdminStats {
+  servicesStats?: ServicesCallHistory
+  monitorStats?: ServicesCallHistory
+}

package/src/storage/methods/createAction.ts

@@ -18,8 +18,6 @@ import {
   randomBytesBase64,
   sdk,
   sha256Hash,
-  stampLog,
-  stampLogFormat,
   StorageProvider,
   TableOutput,
   TableOutputBasket,
@@ -552,7 +550,8 @@ async function validateRequiredInputs(
     ...input,
     vin,
     satoshis: -1,
-    lockingScript: new Script()
+    lockingScript: new Script(),
+    output: undefined
   }))
 
   const trustSelf = vargs.options.trustSelf === 'known'
@@ -603,6 +602,9 @@ async function validateRequiredInputs(
     const { txid, vout } = input.outpoint
     const output = verifyOneOrNone(await storage.findOutputs({ partial: { userId, txid, vout } }))
     if (output) {
+      if (output.change) {
+        throw new sdk.WERR_INVALID_PARAMETER(`inputs[${input.vin}]`, 'an unmanaged input. Change outputs are managed by your wallet.')
+      }
       input.output = output
       if (!Array.isArray(output.lockingScript) || !Number.isInteger(output.satoshis))
         throw new sdk.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'output with valid lockingScript and satoshis')

package/src/storage/methods/internalizeAction.ts

@@ -347,7 +347,7 @@ class InternalizeActionContext {
     // make sure storage pursues getting a proof for it.
     const newReq = EntityProvenTxReq.fromTxid(this.txid, this.tx.toBinary(), this.args.tx)
     // this status is only relevant if the transaction is new to storage.
-    newReq.status = 'unprocessed'
+    newReq.status = 'unsent'
     // this history and notify will be merged into an existing req if it exists.
     newReq.addHistoryNote({ what: 'internalizeAction', userId: this.userId })
     newReq.addNotifyTransactionId(transactionId)
@@ -357,6 +357,7 @@ class InternalizeActionContext {
       // This storage doesn't know about this txid yet.
 
       // TODO Can we immediately prove this txid?
+      // TODO Do full validation on the transaction?
 
       // Attempt to broadcast it to the network, throwing an error if it fails.
 

package/src/storage/schema/KnexMigrations.ts

@@ -70,6 +70,19 @@ export class KnexMigrations implements MigrationSource<string> {
       }
     }
 
+    migrations['2025-05-13-001 add monitor events event index'] = {
+      async up(knex) {
+        await knex.schema.alterTable('monitor_events', table => {
+          table.index('event')
+        })
+      },
+      async down(knex) {
+        await knex.schema.alterTable('monitor_events', table => {
+          table.dropIndex('event')
+        })
+      }
+    }
+
     migrations['2025-03-03-001 descriptions to 2000'] = {
       async up(knex) {
         await knex.schema.alterTable('transactions', table => {

package/src/storage/schema/entities/__tests/ProvenTxTests.test.ts

@@ -136,7 +136,18 @@ describe('ProvenTx class method tests', () => {
       }),
       nLockTimeIsFinal: async () => true,
 
-      getBeefForTxid: async () => new bsv.Beef()
+      getBeefForTxid: async () => new bsv.Beef(),
+
+      getServicesCallHistory: () => ({
+        version: 1,
+        getMerklePath: { serviceName: '', historyByProvider: {} },
+        getRawTx: { serviceName: '', historyByProvider: {} },
+        postBeef: { serviceName: '', historyByProvider: {} },
+        getStatusForTxids: { serviceName: '', historyByProvider: {} },
+        getUtxoStatus: { serviceName: '', historyByProvider: {} },
+        getScriptHashHistory: { serviceName: '', historyByProvider: {} },
+        updateFiatExchangeRates: { serviceName: '', historyByProvider: {} }
+      })
     }
 
     // Call the method under test

package/test/Wallet/local/localWallet.man.test.ts

@@ -1,12 +1,12 @@
 import { EntitySyncState, sdk } from '../../../src'
-import { _tu } from '../../utils/TestUtilsWalletStorage'
+import { _tu, logger } from '../../utils/TestUtilsWalletStorage'
 import { specOpInvalidChange } from '../../../src/sdk'
 import { createOneSatTestOutput, createSetup, LocalWalletTestOptions } from '../../utils/localWalletMethods'
 
 const chain: sdk.Chain = 'test'
 
 const options: LocalWalletTestOptions = {
-  setActiveClient: true,
+  setActiveClient: false,
   useMySQLConnectionForClient: true,
   useTestIdentityKey: true,
   useIdentityKey2: false
@@ -26,6 +26,19 @@ describe('localWallet tests', () => {
     await setup.wallet.destroy()
   })
 
+  test('0a monitor runOnce call history', async () => {
+    const setup = await createSetup(chain, options)
+    const key = await setup.wallet.getPublicKey({ identityKey: true })
+    expect(key.publicKey.toString()).toBe(setup.identityKey)
+    await setup.services.getRawTx('6dd8e416dfaf14c04899ccad2bf76a67c1d5598fece25cf4dcb7a076012b7d8d')
+    await setup.services.getRawTx('ac9cced61e2491be55061ce6577e0c59b909922ba92d5cc1cd754b10d721ab0e')
+    await setup.monitor.runOnce()
+    await setup.services.getRawTx('0000e416dfaf14c04899ccad2bf76a67c1d5598fece25cf4dcb7a076012b7d8d')
+    await setup.services.getRawTx('0000ced61e2491be55061ce6577e0c59b909922ba92d5cc1cd754b10d721ab0e')
+    logger(await setup.monitor.runTask('ServiceCallHistory'))
+    await setup.wallet.destroy()
+  })
+
   test('2 create 1 sat delayed', async () => {
     const setup = await createSetup(chain, options)
     const car = await createOneSatTestOutput(setup, {}, 1)
@@ -58,21 +71,6 @@ describe('localWallet tests', () => {
     await setup.wallet.destroy()
   })
 
-  test('4 review change utxos', async () => {
-    const setup = await createSetup(chain, options)
-    const lor = await setup.wallet.listOutputs({
-      basket: specOpInvalidChange
-    })
-    if (lor.totalOutputs > 0) {
-      debugger
-      const lor = await setup.wallet.listOutputs({
-        basket: specOpInvalidChange,
-        tags: ['release']
-      })
-    }
-    await setup.wallet.destroy()
-  })
-
   test('5 review synchunk', async () => {
     const setup = await createSetup(chain, options)
     const identityKey = setup.identityKey

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

@@ -1,16 +1,17 @@
-import { WalletOutput } from '@bsv/sdk'
+import { Beef, MerklePath, WalletOutput } from '@bsv/sdk'
 import { sdk, TableOutput, TableUser, verifyOne, verifyOneOrNone } from '../../../src'
-import { _tu } from '../../utils/TestUtilsWalletStorage'
+import { _tu, logger } from '../../utils/TestUtilsWalletStorage'
 import { specOpInvalidChange, ValidListOutputsArgs } from '../../../src/sdk'
 import { LocalWalletTestOptions } from '../../utils/localWalletMethods'
 import { Format } from '../../../src/utility/Format'
+import { asString } from '../../../src/utility/utilityHelpers.noBuffer'
 
 describe('operations.man tests', () => {
   jest.setTimeout(99999999)
 
   test('0 review and release all production invalid change utxos', async () => {
     const { env, storage } = await _tu.createMainReviewSetup()
-    const users = await storage.findUsers({ partial: {} })
+    const users = await storage.findUsers({ partial: { } })
     const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
     const vargs: ValidListOutputsArgs = {
       basket: specOpInvalidChange,
@@ -48,13 +49,14 @@ describe('operations.man tests', () => {
 
   test('1 review and unfail false doubleSpends', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
-    let offset = 2700
+    let offset = 0
     const limit = 100
     let allUnfails: number[] = []
     for (;;) {
       let log = ''
       const unfails: number[] = []
-      const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset } })
+      debugger;
+      const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset }, orderDescending: true })
       for (const req of reqs) {
         const gsr = await services.getStatusForTxids([req.txid])
         if (gsr.results[0].status !== 'unknown') {
@@ -75,13 +77,13 @@ describe('operations.man tests', () => {
 
   test('2 review and unfail false invalids', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
-    let offset = 800
+    let offset = 0
     const limit = 100
     let allUnfails: number[] = []
     for (;;) {
       let log = ''
       const unfails: number[] = []
-      const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset } })
+      const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset }, orderDescending: true })
       for (const req of reqs) {
         if (!req.txid || !req.rawTx) continue
         const gsr = await services.getStatusForTxids([req.txid])
@@ -101,6 +103,51 @@ describe('operations.man tests', () => {
     await storage.destroy()
   })
 
+  test.skip('3 review proven_txs', async () => {
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+    let offset = 0
+    const limit = 100
+    let allUnfails: number[] = []
+    //for (const provenTxId of  [3064, 3065, 11268, 11269, 11270, 11271] ) {
+    for (let height = 895000; height < 895026; height++) {
+      let log = ''
+      const unfails: number[] = []
+      const txs = await storage.findProvenTxs({ partial: { height }, paged: { limit, offset } })
+      for (const tx of txs) {
+        const gmpr = await services.getMerklePath(tx.txid)
+        if (gmpr && gmpr.header && gmpr.merklePath) {
+          const mp = gmpr.merklePath
+          const h = gmpr.header
+          const mr = mp.computeRoot(tx.txid)
+          const index = mp.path[0].find(leaf => leaf.hash === tx.txid)?.offset!
+
+          const mp2 = MerklePath.fromBinary(tx.merklePath)
+          const mr2 = mp2.computeRoot()
+
+          if (h.height !== mp.blockHeight || h.merkleRoot !== mr) {
+            console.log(`Merkle root mismatch for ${tx.txid} ${h.merkleRoot} != ${mr}`)
+          } else {
+            if (tx.merkleRoot !== mr || tx.height !== mp.blockHeight || tx.blockHash !== h.hash || tx.index !== index || mp2.blockHeight !== tx.height || mr2 !== tx.merkleRoot || asString(tx.merklePath) !== asString(mp.toBinary())) {
+              debugger;
+              await storage.updateProvenTx(tx.provenTxId, {
+                merklePath: mp.toBinary(),
+                merkleRoot: mr,
+                height: mp.blockHeight,
+                blockHash: h.hash,
+                index
+              })
+              log += `updated ${tx.provenTxId}\n`
+            }
+          }
+        }
+      }
+      //console.log(`${offset} ${log}`)
+      //if (txs.length < limit) break
+      //offset += txs.length
+    }
+    await storage.destroy()
+  })
+
   test.skip('10 re-internalize failed WUI exports', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
     // From this user
@@ -174,4 +221,57 @@ describe('operations.man tests', () => {
     })
     await storage.destroy()
   })
+
+  test.skip('12 check storage merged BEEF', async () => {
+    const userId = 127
+    const txid = 'efba8b92a22c3308f432b292b5ec7efb3869ecd50c62cb3ddfb83871bc7be194'
+    const vout = 1
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+
+    const ptx = verifyOne(await storage.findProvenTxs({ partial: { txid } }))
+
+    const mp = MerklePath.fromBinary(ptx.merklePath)
+    expect(mp.blockHeight).toBe(ptx.height)
+
+    const txids = ['24b19a5179c1f146e825643df4c6dc2ba21674828c20fc2948e105cb1ca91eae']
+
+    const r = await storage.getReqsAndBeefToShareWithWorld(txids, [])
+
+    await storage.destroy()
+  })
+
+  test('13 review use of outputs in all following transactions', async () => {
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+    
+    const txids = ['2df7b5059112a42fc40adb54ee36244cee0dd216c35ad6c4b6ef4631c14a0e83'] //, '9fb38fc87c6ff39f5c7321a4c689db535c024498ed20031434485c981dd7a182', '3fb6b02e1d001dded1daee3f59dcd684489b96a35a9dfb5082b4119a31689966', '72ea8d84a4c54dbca292f4a79a5ff08cb9917fc3127c1dcff0628aeba8b40823', '0564a515566bc43c1396becf12bbf2d82d821ae7b6e0ef404eedfa090d4877c2', '3b93e4327a50a7f4a421af9fbdec0206b3b7ba5252bc5a0142d0d64aa34c2e73', 'd4b0c3d820696afad43b43e095f3b8c3df52385bb4aeddff0212e0a472dd8e4e']
+    const userId = 111
+    const txs = await storage.findTransactions({ partial: { userId }, status: ['completed', 'unproven', 'failed'], orderDescending: true, paged: { limit: 50 } })
+    const allTxids = txs.map(tx => tx.txid!)
+    debugger;
+    const reqs = await storage.findProvenTxReqs({ partial: {}, txids: allTxids })
+    const beef = new Beef()
+    for (const req of reqs) {
+      beef.mergeRawTx(req.rawTx!)
+    }
+
+    for (const txid of txids) {
+      const o = await storage.findOutputs({ partial: { txid, userId } })
+      const tx = await storage.findTransactions({ partial: { txid, userId } })
+      if (o && tx) {
+        const ltx = await Format.toLogStringTableTransaction(tx[0], storage)
+        logger(ltx)
+        for (const btx of beef.txs) {
+          const tx = btx.tx!
+          for (const i of tx.inputs) {
+            if (i.sourceTXID === txid && i.sourceOutputIndex === 0) {
+              const sltx = Format.toLogStringBeefTxid(beef, btx.txid)
+              logger(sltx)
+            }
+          }
+        }
+      }
+    }
+    await storage.destroy()
+  })
+
 })

package/test/storage/KnexMigrations.test.ts

@@ -9,7 +9,7 @@ describe('KnexMigrations tests', () => {
   const env = _tu.getEnvFlags('test')
 
   beforeAll(async () => {
-    const localSQLiteFile = await _tu.newTmpFile('migratetest.sqlite', false, false, true)
+    const localSQLiteFile = await _tu.newTmpFile('migratetest.sqlite', true, false, true)
     const knexSQLite = _tu.createLocalSQLite(localSQLiteFile)
     knexs.push(knexSQLite)