@bsv/wallet-toolbox 1.3.23 → 1.3.25

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

@@ -6,7 +6,7 @@ import { createOneSatTestOutput, createSetup, LocalWalletTestOptions } from '../
 const chain: sdk.Chain = 'test'
 
 const options: LocalWalletTestOptions = {
-  setActiveClient: true,
+  setActiveClient: false,
   useMySQLConnectionForClient: true,
   useTestIdentityKey: true,
   useIdentityKey2: false
@@ -26,6 +26,18 @@ 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.services.getRawTx('0000e416dfaf14c04899ccad2bf76a67c1d5598fece25cf4dcb7a076012b7d8d')
+    await setup.services.getRawTx('0000ced61e2491be55061ce6577e0c59b909922ba92d5cc1cd754b10d721ab0e')
+    await setup.monitor.runOnce()
+    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 +70,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,37 +1,17 @@
-import { Transaction, WalletOutput } from '@bsv/sdk'
-import {
-  sdk,
-  Services,
-  Setup,
-  StorageKnex,
-  TableOutput,
-  TableTransaction,
-  TableUser,
-  verifyOne,
-  verifyOneOrNone
-} from '../../../src'
-import { _tu, TuEnv } from '../../utils/TestUtilsWalletStorage'
+import { Beef, MerklePath, WalletOutput } from '@bsv/sdk'
+import { sdk, TableOutput, TableUser, verifyOne, verifyOneOrNone } from '../../../src'
+import { _tu, logger } from '../../utils/TestUtilsWalletStorage'
 import { specOpInvalidChange, ValidListOutputsArgs } from '../../../src/sdk'
 import { LocalWalletTestOptions } from '../../utils/localWalletMethods'
-
-import * as dotenv from 'dotenv'
-dotenv.config()
-
-const chain: sdk.Chain = 'main'
-
-const options: LocalWalletTestOptions = {
-  setActiveClient: true,
-  useMySQLConnectionForClient: true,
-  useTestIdentityKey: false,
-  useIdentityKey2: false
-}
+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 createMainReviewSetup()
-    const users = await storage.findUsers({ partial: {} })
+    const { env, storage } = await _tu.createMainReviewSetup()
+    const users = await storage.findUsers({ partial: { } })
     const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
     const vargs: ValidListOutputsArgs = {
       basket: specOpInvalidChange,
@@ -67,51 +47,16 @@ describe('operations.man tests', () => {
     await storage.destroy()
   })
 
-  test.skip('0a review all spendable outputs for userId', async () => {
-    const { env, storage } = await createMainReviewSetup()
-    const users = await storage.findUsers({ partial: {} })
-    const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
-    const vargs: ValidListOutputsArgs = {
-      basket: specOpInvalidChange,
-      tags: ['release', 'all'],
-      tagQueryMode: 'all',
-      includeLockingScripts: false,
-      includeTransactions: false,
-      includeCustomInstructions: false,
-      includeTags: false,
-      includeLabels: false,
-      limit: 0,
-      offset: 0,
-      seekPermission: false,
-      knownTxids: []
-    }
-    let log = ''
-    for (const user of users) {
-      const { userId } = user
-      const auth = { userId, identityKey: '' }
-      let r = await storage.listOutputs(auth, vargs)
-      if (r.totalOutputs > 0) {
-        const total: number = r.outputs.reduce((s, o) => (s += o.satoshis), 0)
-        log += `userId ${userId}: ${r.totalOutputs} unspendable utxos, total ${total}, ${user.identityKey}\n`
-        for (const o of r.outputs) {
-          log += `  ${o.outpoint} ${o.satoshis}\n`
-        }
-        withInvalid[userId] = { user, outputs: r.outputs, total }
-      }
-    }
-    console.log(log || 'Found zero invalid change outputs.')
-    await storage.destroy()
-  })
-
   test('1 review and unfail false doubleSpends', async () => {
-    const { env, storage, services } = await createMainReviewSetup()
-    let offset = 2400
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+    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') {
@@ -131,14 +76,14 @@ describe('operations.man tests', () => {
   })
 
   test('2 review and unfail false invalids', async () => {
-    const { env, storage, services } = await createMainReviewSetup()
-    let offset = 700
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+    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])
@@ -158,9 +103,56 @@ describe('operations.man tests', () => {
     await storage.destroy()
   })
 
-  test.skip('8 re-internalize failed WUI exports', async () => {
-    const { env, storage, services } = await createMainReviewSetup()
+  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
     const user0 = verifyOne(await storage.findUsers({ partial: { userId: 2 } }))
+    // To these users
     const users = await storage.findUsers({ partial: { userId: 141 } }) // 111, 141
     for (const user of users) {
       const { userId, identityKey } = user
@@ -204,19 +196,21 @@ describe('operations.man tests', () => {
      */
     await storage.destroy()
   })
-  test('9 review recent transaction change use', async () => {
-    const { env, storage, services } = await createMainReviewSetup()
+
+  test.skip('11 review recent transaction change use for specific userId', async () => {
+    const userId = 311
+    const { env, storage, services } = await _tu.createMainReviewSetup()
     const countTxs = await storage.countTransactions({
-      partial: { userId: 311 },
+      partial: { userId },
       status: ['completed', 'unproven', 'failed']
     })
     const txs = await storage.findTransactions({
-      partial: { userId: 311 },
+      partial: { userId },
       status: ['unproven', 'completed', 'failed'],
       paged: { limit: 100, offset: Math.max(0, countTxs - 100) }
     })
     for (const tx of txs) {
-      const ls = await toLogString(tx, storage)
+      const ls = await Format.toLogStringTableTransaction(tx, storage)
       console.log(ls)
     }
     const countReqs = await storage.countProvenTxReqs({ partial: {}, status: ['completed', 'unmined'] })
@@ -227,56 +221,57 @@ describe('operations.man tests', () => {
     })
     await storage.destroy()
   })
-})
 
-async function createMainReviewSetup(): Promise<{
-  env: TuEnv
-  storage: StorageKnex
-  services: Services
-}> {
-  const env = _tu.getEnv('main')
-  const knex = Setup.createMySQLKnex(process.env.MAIN_CLOUD_MYSQL_CONNECTION!)
-  const storage = new StorageKnex({
-    chain: env.chain,
-    knex: knex,
-    commissionSatoshis: 0,
-    commissionPubKeyHex: undefined,
-    feeModel: { model: 'sat/kb', value: 1 }
+  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()
   })
-  const servicesOptions = Services.createDefaultOptions(env.chain)
-  if (env.whatsonchainApiKey) servicesOptions.whatsOnChainApiKey = env.whatsonchainApiKey
-  const services = new Services(servicesOptions)
-  storage.setServices(services)
-  await storage.makeAvailable()
-  return { env, storage, services }
-}
 
-async function toLogString(tx: TableTransaction, storage: StorageKnex): Promise<string> {
-  const rawTx = await storage.getRawTxOfKnownValidTransaction(tx.txid)
-  const btx = Transaction.fromBinary(rawTx!)
-  let log = `tx ${tx.txid} ${tx.status} s:${tx.satoshis} uid:${tx.userId} tid:${tx.transactionId}\n`
-  for (let i = 0; i < Math.max(btx.inputs.length, btx.outputs.length); i++) {
-    let ilog: string = ''
-    let olog: string = ''
-    if (i < btx.inputs.length) {
-      const input = btx.inputs[i]
-      ilog = `${logTxid(input.sourceTXID!)}.${input.sourceOutputIndex}`
+  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!)
     }
-    if (i < btx.outputs.length) {
-      const output = btx.outputs[i]
-      olog = `${ar('' + output.satoshis, 9)} ${output.lockingScript.toHex().length / 2}`
+
+    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)
+            }
+          }
+        }
+      }
     }
-    log += `${ar('' + i, 5)} ${al(ilog, 20)} ${olog}\n`
-  }
-  return log
+    await storage.destroy()
+  })
 
-  function logTxid(txid: string): string {
-    return `${txid.slice(0, 6)}..${txid.slice(-6)}`
-  }
-  function al(v: string | number, w: number): string {
-    return v.toString().padEnd(w)
-  }
-  function ar(v: string | number, w: number): string {
-    return v.toString().padStart(w)
-  }
-}
+})