@bsv/wallet-toolbox 1.3.28 → 1.3.30

package/src/storage/StorageKnex.ts

@@ -492,19 +492,44 @@ export class StorageKnex extends StorageProvider implements sdk.WalletStoragePro
     if (args.orderDescending) {
       let sortColumn = ''
       switch (table) {
-        case 'certificates': sortColumn = 'certificateId'; break
-        case 'commissions': sortColumn = 'commissionId'; break
-        case 'output_baskets': sortColumn = 'basketId'; break
-        case 'outputs': sortColumn = 'outputId'; break
-        case 'output_tags': sortColumn = 'outputTagId'; break
-        case 'proven_tx_reqs': sortColumn = 'provenTxReqId'; break
-        case 'proven_txs': sortColumn = 'provenTxId'; break
-        case 'sync_states': sortColumn = 'syncStateId'; break
-        case 'transactions': sortColumn = 'transactionId'; break
-        case 'tx_labels': sortColumn = 'txLabelId'; break
-        case 'users': sortColumn = 'userId'; break
-        case 'monitor_events': sortColumn = 'id'; break
-        default: break;
+        case 'certificates':
+          sortColumn = 'certificateId'
+          break
+        case 'commissions':
+          sortColumn = 'commissionId'
+          break
+        case 'output_baskets':
+          sortColumn = 'basketId'
+          break
+        case 'outputs':
+          sortColumn = 'outputId'
+          break
+        case 'output_tags':
+          sortColumn = 'outputTagId'
+          break
+        case 'proven_tx_reqs':
+          sortColumn = 'provenTxReqId'
+          break
+        case 'proven_txs':
+          sortColumn = 'provenTxId'
+          break
+        case 'sync_states':
+          sortColumn = 'syncStateId'
+          break
+        case 'transactions':
+          sortColumn = 'transactionId'
+          break
+        case 'tx_labels':
+          sortColumn = 'txLabelId'
+          break
+        case 'users':
+          sortColumn = 'userId'
+          break
+        case 'monitor_events':
+          sortColumn = 'id'
+          break
+        default:
+          break
       }
       if (sortColumn !== '') {
         q.orderBy(sortColumn, 'desc')
@@ -1156,7 +1181,13 @@ export class StorageKnex extends StorageProvider implements sdk.WalletStoragePro
   async adminStats(adminIdentityKey: string): Promise<AdminStatsResult> {
     if (this.dbtype !== 'MySQL') throw new sdk.WERR_NOT_IMPLEMENTED('adminStats, only MySQL is supported')
 
-    const monitorEvent = verifyOneOrNone(await this.findMonitorEvents({ partial: { event: 'MonitorCallHistory'}, orderDescending: true, paged: { limit: 1 } }))
+    const monitorEvent = verifyOneOrNone(
+      await this.findMonitorEvents({
+        partial: { event: 'MonitorCallHistory' },
+        orderDescending: true,
+        paged: { limit: 1 }
+      })
+    )
     const monitorStats: ServicesCallHistory | undefined = monitorEvent ? JSON.parse(monitorEvent.details!) : undefined
     const servicesStats = this.getServices().getServicesCallHistory(true)
     await this.insertMonitorEvent({

package/src/storage/StorageProvider.ts

@@ -778,4 +778,4 @@ export interface StorageAdminStats {
 export interface AdminStatsResult extends StorageAdminStats {
   servicesStats?: ServicesCallHistory
   monitorStats?: ServicesCallHistory
-}
+}

package/src/storage/methods/createAction.ts

@@ -603,7 +603,10 @@ async function validateRequiredInputs(
     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.')
+        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))

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: { } })
+    const users = await storage.findUsers({ partial: {} })
     const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
     const vargs: ValidListOutputsArgs = {
       basket: specOpInvalidChange,
@@ -55,8 +55,11 @@ describe('operations.man tests', () => {
     for (;;) {
       let log = ''
       const unfails: number[] = []
-      debugger;
-      const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset }, orderDescending: true })
+      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') {
@@ -83,7 +86,11 @@ describe('operations.man tests', () => {
     for (;;) {
       let log = ''
       const unfails: number[] = []
-      const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset }, orderDescending: true })
+      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])
@@ -127,8 +134,16 @@ describe('operations.man tests', () => {
           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;
+            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,
@@ -242,12 +257,17 @@ describe('operations.man tests', () => {
 
   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 txs = await storage.findTransactions({
+      partial: { userId },
+      status: ['completed', 'unproven', 'failed'],
+      orderDescending: true,
+      paged: { limit: 50 }
+    })
     const allTxids = txs.map(tx => tx.txid!)
-    debugger;
+    debugger
     const reqs = await storage.findProvenTxReqs({ partial: {}, txids: allTxids })
     const beef = new Beef()
     for (const req of reqs) {
@@ -273,5 +293,4 @@ describe('operations.man tests', () => {
     }
     await storage.destroy()
   })
-
 })

package/test/wallet/action/createAction2.test.ts

@@ -188,6 +188,7 @@ describe('createAction2 nosend transactions', () => {
         labels: ['spending transaction test'],
         description: 'Explicit check on returned change',
         options: {
+          knownTxids: [fundingResult.txid!],
           noSend: true,
           randomizeOutputs: false,
           noSendChange: []