@bsv/wallet-toolbox 1.2.35 → 1.2.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.2.35",
+  "version": "1.2.36",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -31,7 +31,7 @@
   "homepage": "https://github.com/bitcoin-sv/wallet-toolbox#readme",
   "dependencies": {
     "@bsv/auth-express-middleware": "^1.1.2",
-    "@bsv/payment-express-middleware": "^1.0.5",
+    "@bsv/payment-express-middleware": "^1.0.6",
     "@bsv/sdk": "^1.4.18",
     "express": "^4.21.2",
     "knex": "^3.1.0",

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

@@ -1,4 +1,4 @@
-import { WalletOutput } from '@bsv/sdk'
+import { Beef, WalletOutput } from '@bsv/sdk'
 import { sdk, Services, Setup, StorageKnex, TableUser } from '../../../src'
 import { _tu, TuEnv } from '../../utils/TestUtilsWalletStorage'
 import { specOpInvalidChange, ValidListOutputsArgs, WERR_REVIEW_ACTIONS } from '../../../src/sdk'
@@ -146,7 +146,7 @@ describe('localWallet2 tests', () => {
 
   test('6 review and unfail false doubleSpends', async () => {
     const { env, storage, services } = await createMainReviewSetup()
-    let offset = 900
+    let offset = 1100
     const limit = 100
     let allUnfails: number[] = []
     for (;;) {
@@ -200,6 +200,14 @@ describe('localWallet2 tests', () => {
     }
     await storage.destroy()
   })
+
+  test('8 jackie Beef', async () => { 
+    const setup = await createSetup(chain, options)
+    const beef = Beef.fromBinary(beefJackie)
+    console.log(beef.toLogString())
+    const ok = beef.verify(await setup.services.getChainTracker())
+    await setup.wallet.destroy()
+  })
 })
 
 async function createMainReviewSetup(): Promise<{
@@ -223,3 +231,6 @@ async function createMainReviewSetup(): Promise<{
   await storage.makeAvailable()
   return { env, storage, services }
 }
+
+  const beefJackie = [
+    1, 1, 1, 1, 196, 222, 98, 76, 119, 112, 138, 49, 125, 79, 3, 8, 17, 96, 88, 134, 18, 94, 233, 6, 43, 58, 55, 200, 53, 21, 225, 58, 243, 130, 114, 64, 2, 0, 190, 239, 0, 1, 0, 1, 0, 0, 0, 1, 157, 193, 59, 124, 10, 214, 21, 108, 182, 51, 203, 122, 124, 52, 230, 65, 248, 166, 3, 136, 224, 45, 213, 116, 91, 81, 101, 168, 142, 252, 196, 20, 110, 0, 0, 0, 107, 72, 48, 69, 2, 33, 0, 144, 86, 132, 240, 56, 253, 101, 20, 254, 1, 184, 144, 98, 236, 225, 242, 239, 88, 99, 196, 58, 33, 141, 79, 234, 140, 7, 22, 254, 140, 65, 83, 2, 32, 113, 198, 86, 176, 19, 16, 165, 168, 5, 227, 70, 44, 5, 22, 144, 179, 172, 170, 13, 148, 3, 236, 35, 2, 74, 238, 235, 84, 148, 192, 102, 138, 65, 33, 3, 15, 101, 106, 207, 42, 192, 187, 51, 59, 128, 27, 240, 244, 240, 4, 224, 230, 41, 166, 89, 216, 46, 7, 24, 242, 180, 20, 90, 12, 57, 59, 144, 255, 255, 255, 255, 2, 136, 19, 0, 0, 0, 0, 0, 0, 25, 118, 169, 20, 240, 178, 178, 204, 51, 126, 211, 251, 43, 177, 154, 94, 189, 29, 53, 41, 220, 136, 142, 80, 136, 172, 208, 140, 0, 0, 0, 0, 0, 0, 25, 118, 169, 20, 217, 48, 110, 108, 236, 100, 116, 90, 181, 114, 45, 176, 198, 216, 150, 134, 16, 251, 10, 177, 136, 172, 0, 0, 0, 0]

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

@@ -0,0 +1,183 @@
+import { WalletOutput } from '@bsv/sdk'
+import { sdk, Services, Setup, StorageKnex, TableOutput, TableUser, verifyOne, verifyOneOrNone } from '../../../src'
+import { _tu, TuEnv } from '../../utils/TestUtilsWalletStorage'
+import { specOpInvalidChange, ValidListOutputsArgs, WERR_REVIEW_ACTIONS } from '../../../src/sdk'
+import {
+  burnOneSatTestOutput,
+  createOneSatTestOutput,
+  createSetup,
+  doubleSpendOldChange,
+  LocalWalletTestOptions,
+  recoverOneSatTestOutputs
+} 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
+}
+
+describe('operations1 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 withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
+    const vargs: ValidListOutputsArgs = {
+      basket: specOpInvalidChange,
+      tags: ['release'],
+      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('6 review and unfail false doubleSpends', async () => {
+    const { env, storage, services } = await createMainReviewSetup()
+    let offset = 2200
+    const limit = 100
+    let allUnfails: number[] = []
+    for (; ;) {
+      let log = ''
+      const unfails: number[] = []
+      const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset } })
+      for (const req of reqs) {
+        const gsr = await services.getStatusForTxids([req.txid])
+        if (gsr.results[0].status !== 'unknown') {
+          log += `unfail ${req.provenTxReqId} ${req.txid}\n`
+          unfails.push(req.provenTxReqId)
+        }
+      }
+      console.log(`DoubleSpends OFFSET: ${offset} ${unfails.length} unfails\n${log}`)
+      allUnfails = allUnfails.concat(unfails)
+      if (reqs.length < limit) break
+      offset += reqs.length
+    }
+    for (const id of allUnfails) {
+      await storage.updateProvenTxReq(id, { status: 'unfail' })
+    }
+    await storage.destroy()
+  })
+
+  test('7 review and unfail false invalids', async () => {
+    const { env, storage, services } = await createMainReviewSetup()
+    let offset = 400
+    const limit = 100
+    let allUnfails: number[] = []
+    for (; ;) {
+      let log = ''
+      const unfails: number[] = []
+      const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset } })
+      for (const req of reqs) {
+        if (!req.txid || !req.rawTx) continue
+        const gsr = await services.getStatusForTxids([req.txid])
+        if (gsr.results[0].status !== 'unknown') {
+          log += `unfail ${req.provenTxReqId} ${req.txid}\n`
+          unfails.push(req.provenTxReqId)
+        }
+      }
+      console.log(`Failed OFFSET: ${offset} ${unfails.length} unfails\n${log}`)
+      allUnfails = allUnfails.concat(unfails)
+      if (reqs.length < limit) break
+      offset += reqs.length
+    }
+    for (const id of allUnfails) {
+      await storage.updateProvenTxReq(id, { status: 'unfail' })
+    }
+    await storage.destroy()
+  })
+
+  test.skip('8 re-internalize failed WUI exports', async () => {
+    const { env, storage, services } = await createMainReviewSetup()
+    const user0 = verifyOne(await storage.findUsers({ partial: { userId: 2 } }))
+    const users = await storage.findUsers({ partial: { userId: 141 } }) // 111, 141
+    for (const user of users) {
+      const { userId, identityKey } = user
+      const [outputs] = await storage.knex.raw<TableOutput[][]>(`
+        SELECT f.* FROM outputs as f where f.userId = 2 and not f.customInstructions is null
+        and JSON_EXTRACT(f.customInstructions, '$.payee') = '${identityKey}'
+        and not exists(select * from outputs as r where r.userId = ${userId} and r.txid = f.txid)
+        `)
+      if (outputs.length > 0) 
+        console.log(`userId ${userId} ${identityKey} ${outputs.length} outputs`)
+      for (const output of outputs) {
+        const req = verifyOneOrNone(await storage.findProvenTxReqs({ partial: { txid: output.txid, status: 'completed' } }))
+        const { type, derivationPrefix, derivationSuffix, payee } = JSON.parse(output.customInstructions!)
+        if (req && type === 'BRC29' && derivationPrefix && derivationSuffix) {
+          const beef = await storage.getBeefForTransaction(req.txid, {})
+          // {"type":"BRC29","derivationPrefix":"LDFooHSsXzw=","derivationSuffix":"4f4ixKv+6SY=","payee":"0352caa755d5b6279e15e47e096db908e7c4a73a31775e7e8720bdd4cf2d44873a"}
+          await storage.internalizeAction({ userId, identityKey: user.identityKey }, {
+            tx: beef.toBinaryAtomic(req.txid),
+            outputs: [{
+              outputIndex: 0,
+              protocol: 'wallet payment',
+              paymentRemittance: {
+                derivationPrefix: derivationPrefix,
+                derivationSuffix: derivationSuffix,
+                senderIdentityKey: user0.identityKey,
+              }
+            }],
+            description: 'Internalizing export funds tx into foreign wallet'
+          })
+          console.log('internalize', userId, output.txid)
+        }
+      }
+    }
+      /*
+      */
+    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 }
+  })
+  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 }
+}