@bsv/wallet-toolbox 1.1.47 → 1.1.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/monitor/tasks/TaskNewHeader.ts

@@ -42,7 +42,7 @@ export class TaskNewHeader extends WalletMonitorTask {
     } else {
       isNew = false
     }
-    if (isNew) TaskCheckForProofs.checkNow = true
+    if (isNew) this.monitor.processNewBlockHeader(this.header)
     return log
   }
 }

package/src/services/providers/__tests/WhatsOnChain.test.ts

@@ -16,6 +16,9 @@ describe('whatsonchain tests', () => {
     apiKey: envMain.taalApiKey
   })
 
+  test('00', () => {})
+  if (_tu.noTestEnv('test')) return
+
   test('0 getRawTx testnet', async () => {
     const rawTx = await wocTest.getRawTx(
       '7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b'
@@ -49,14 +52,16 @@ describe('whatsonchain tests', () => {
       )
       const s = JSON.stringify(r)
       expect(s).toBe(
-        "{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathSuccess\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}],\"merklePath\":{\"blockHeight\":1661398,\"path\":[[{\"offset\":6,\"hash\":\"7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b\",\"txid\":true},{\"offset\":7,\"hash\":\"97dd9d9080394d52338588732d9f84e1debca93f171f674ac3beac1e75495568\"}],[{\"offset\":2,\"hash\":\"81beedcd219d9e03255bde2ee479db34b9fed04d30373ba8bc264a64af2515b9\"}],[{\"offset\":0,\"hash\":\"9965f9aaeea33f6878335e6f7e6bdb544c3a8550c84e2f0daca54e9cd912111c\"}]]},\"header\":{\"version\":536870912,\"previousHash\":\"000000000688340a14b77e49bb0fca5ac7b624f7f79a5517583d1aae61c4e658\",\"merkleRoot\":\"edbc07082ca0a31d5ec89d1f503a9cd41112c0d8f3221a96acfb8a9d16f8e82b\",\"time\":1739624725,\"bits\":486604799,\"nonce\":1437884974,\"height\":1661398,\"hash\":\"00000000d8a73bf9a37272a71886ea92a25376bed1c1916f2b5cfbec4d6f6a25\"}}"
+        '{"name":"WoCTsc","notes":[{"what":"getMerklePathSuccess","name":"WoCTsc","status":200,"statusText":"OK"}],"merklePath":{"blockHeight":1661398,"path":[[{"offset":6,"hash":"7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b","txid":true},{"offset":7,"hash":"97dd9d9080394d52338588732d9f84e1debca93f171f674ac3beac1e75495568"}],[{"offset":2,"hash":"81beedcd219d9e03255bde2ee479db34b9fed04d30373ba8bc264a64af2515b9"}],[{"offset":0,"hash":"9965f9aaeea33f6878335e6f7e6bdb544c3a8550c84e2f0daca54e9cd912111c"}]]},"header":{"version":536870912,"previousHash":"000000000688340a14b77e49bb0fca5ac7b624f7f79a5517583d1aae61c4e658","merkleRoot":"edbc07082ca0a31d5ec89d1f503a9cd41112c0d8f3221a96acfb8a9d16f8e82b","time":1739624725,"bits":486604799,"nonce":1437884974,"height":1661398,"hash":"00000000d8a73bf9a37272a71886ea92a25376bed1c1916f2b5cfbec4d6f6a25"}}'
       )
     }
 
     {
       const r = await wocTest.getMerklePath('1'.repeat(64), services)
       const s = JSON.stringify(r)
-      expect(s).toBe("{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathNoData\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}]}")
+      expect(s).toBe(
+        '{"name":"WoCTsc","notes":[{"what":"getMerklePathNoData","name":"WoCTsc","status":200,"statusText":"OK"}]}'
+      )
     }
   })
 
@@ -69,13 +74,16 @@ describe('whatsonchain tests', () => {
       )
       const s = JSON.stringify(r)
       expect(s).toBe(
-        "{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathSuccess\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}],\"merklePath\":{\"blockHeight\":883637,\"path\":[[{\"offset\":46,\"hash\":\"d9978ffc6676523208f7b33bebf1b176388bbeace2c7ef67ce35c2eababa1805\",\"txid\":true},{\"offset\":47,\"hash\":\"066f6fa6fa988f2e3a9d6fe35fa0d3666c652dac35cabaeebff3738a4e67f68f\"}],[{\"offset\":22,\"hash\":\"232089a6f77c566151bc4701fda394b5cc5bf17073140d46a73c4c3ed0a7b911\"}],[{\"offset\":10,\"hash\":\"c639b3a6ce127f67dbd01c7331a6fca62a4b429830387bd68ac6ac05e162116d\"}],[{\"offset\":4,\"hash\":\"730cec44be97881530947d782bb328d25f1122fdae206296937fffb03e936d48\"}],[{\"offset\":3,\"hash\":\"28b681f8ab8db0fa4d5d20cb1532b95184a155346b0b8447bde580b2406d51e6\"}],[{\"offset\":0,\"hash\":\"c49a18028e230dd1439b26794c08c339506f24a450f067c4facd4e0d5a346490\"}],[{\"offset\":1,\"hash\":\"0ba57d1b1fad6874de3640c01088e3dedad3507e5b3a3102b9a8a8055f3df88b\"}],[{\"offset\":1,\"hash\":\"c830edebe5565c19ba584ec73d49129344d17539f322509b7c314ae641c2fcdb\"}],[{\"offset\":1,\"hash\":\"ff62d5ed2a94eb93a2b7d084b8f15b12083573896b6a58cf871507e3352c75f5\"}]]},\"header\":{\"version\":1040187392,\"previousHash\":\"00000000000000000d9f6889dd6743500adee204ea25d8a57225ecd48b111769\",\"merkleRoot\":\"59c1efd79fae0d9c29dd8da63f8eeec0aadde048f4491c6bfa324fcfd537156d\",\"time\":1739329877,\"bits\":403818359,\"nonce\":596827153,\"height\":883637,\"hash\":\"0000000000000000060ac8d63b78d41f58c9aba0b09f81db7d51fa4905a47263\"}}"      )
+        '{"name":"WoCTsc","notes":[{"what":"getMerklePathSuccess","name":"WoCTsc","status":200,"statusText":"OK"}],"merklePath":{"blockHeight":883637,"path":[[{"offset":46,"hash":"d9978ffc6676523208f7b33bebf1b176388bbeace2c7ef67ce35c2eababa1805","txid":true},{"offset":47,"hash":"066f6fa6fa988f2e3a9d6fe35fa0d3666c652dac35cabaeebff3738a4e67f68f"}],[{"offset":22,"hash":"232089a6f77c566151bc4701fda394b5cc5bf17073140d46a73c4c3ed0a7b911"}],[{"offset":10,"hash":"c639b3a6ce127f67dbd01c7331a6fca62a4b429830387bd68ac6ac05e162116d"}],[{"offset":4,"hash":"730cec44be97881530947d782bb328d25f1122fdae206296937fffb03e936d48"}],[{"offset":3,"hash":"28b681f8ab8db0fa4d5d20cb1532b95184a155346b0b8447bde580b2406d51e6"}],[{"offset":0,"hash":"c49a18028e230dd1439b26794c08c339506f24a450f067c4facd4e0d5a346490"}],[{"offset":1,"hash":"0ba57d1b1fad6874de3640c01088e3dedad3507e5b3a3102b9a8a8055f3df88b"}],[{"offset":1,"hash":"c830edebe5565c19ba584ec73d49129344d17539f322509b7c314ae641c2fcdb"}],[{"offset":1,"hash":"ff62d5ed2a94eb93a2b7d084b8f15b12083573896b6a58cf871507e3352c75f5"}]]},"header":{"version":1040187392,"previousHash":"00000000000000000d9f6889dd6743500adee204ea25d8a57225ecd48b111769","merkleRoot":"59c1efd79fae0d9c29dd8da63f8eeec0aadde048f4491c6bfa324fcfd537156d","time":1739329877,"bits":403818359,"nonce":596827153,"height":883637,"hash":"0000000000000000060ac8d63b78d41f58c9aba0b09f81db7d51fa4905a47263"}}'
+      )
     }
 
     {
       const r = await wocMain.getMerklePath('1'.repeat(64), services)
       const s = JSON.stringify(r)
-      expect(s).toBe("{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathNoData\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}]}")
+      expect(s).toBe(
+        '{"name":"WoCTsc","notes":[{"what":"getMerklePathNoData","name":"WoCTsc","status":200,"statusText":"OK"}]}'
+      )
     }
   })
 

package/src/storage/StorageKnex.ts

@@ -112,6 +112,7 @@ export class StorageKnex
     trx?: sdk.TrxToken
   ): Promise<number[] | undefined> {
     if (!txid) return undefined
+    if (!this.isAvailable()) await this.makeAvailable()
 
     let rawTx: number[] | undefined = undefined
     if (Number.isInteger(offset) && Number.isInteger(length)) {
@@ -160,7 +161,8 @@ export class StorageKnex
       q = q.limit(args.paged.limit)
       q = q.offset(args.paged.offset || 0)
     }
-    if (args.since) q = q.where('updated_at', '>=', args.since)
+    if (args.since)
+      q = q.where('updated_at', '>=', this.validateDateForWhere(args.since))
     return q
   }
   override async getProvenTxsForUser(
@@ -189,7 +191,8 @@ export class StorageKnex
       q = q.limit(args.paged.limit)
       q = q.offset(args.paged.offset || 0)
     }
-    if (args.since) q = q.where('updated_at', '>=', args.since)
+    if (args.since)
+      q = q.where('updated_at', '>=', this.validateDateForWhere(args.since))
     return q
   }
   override async getProvenTxReqsForUser(

package/src/storage/methods/processAction.ts

@@ -30,6 +30,7 @@ import {
   verifyOneOrNone,
   verifyTruthy
 } from '../../index.client'
+import { ProvenTxReqNonTerminalStatus } from '../../sdk'
 
 export async function processAction(
   storage: StorageProvider,
@@ -169,6 +170,19 @@ async function shareReqsWithWorld(
     const d = prtn.details.find(d => d.txid === ar.txid)
     if (d) {
       ar.postBeef = d.pbrft
+      if (d.pbrft.status === 'error' && ar.getReq.req) {
+        // If the immediate (un-delayed) broadcast attempt APPEARS to fail,
+        // fall back to delayed sending and tracking to make sure transaction
+        // gets tracked if it is valid and floating around the network...
+        const req = await EntityProvenTxReq.fromStorageId(
+          storage,
+          ar.getReq.req.provenTxReqId
+        )
+        if (req.status === 'unprocessed') {
+          req.status = 'unsent'
+          await req.updateStorageDynamicProperties(storage)
+        }
+      }
     }
   }
 

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

@@ -1,172 +1,73 @@
 import {
   Beef,
   CreateActionArgs,
+  CreateActionOptions,
+  CreateActionResult,
   P2PKH,
   PrivateKey,
   PublicKey,
   Script,
   SignActionArgs
 } from '@bsv/sdk'
-import { EntityProvenTxReq, sdk, Setup } from '../../../src'
-import { _tu } from '../../utils/TestUtilsWalletStorage'
+import {
+  asString,
+  EntityProvenTxReq,
+  EntitySyncState,
+  Monitor,
+  sdk,
+  Services,
+  Setup,
+  StorageKnex,
+  TableOutput,
+  TableUser,
+  verifyId,
+  verifyOne,
+  wait
+} from '../../../src'
+import { _tu, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
+import { monitorEventLoopDelay } from 'perf_hooks'
 
 describe('localWallet tests', () => {
   jest.setTimeout(99999999)
 
-  test('0 create 1 sat delayed output monitor runOnce', async () => {
-    const chain: sdk.Chain = 'test'
-    if (_tu.noTestEnv(chain)) return
-    const env = _tu.getEnv(chain)
-    if (!env.testIdentityKey)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testIdentityKey', 'valid')
-    if (!env.testFilePath)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testFilePath', 'valid')
-
-    const setup = await _tu.createTestWallet({
-      chain,
-      rootKeyHex: env.devKeys[env.testIdentityKey],
-      filePath: env.testFilePath,
-      setActiveClient: false,
-      addLocalBackup: false
-    })
+  test('00', () => {})
+  if (_tu.noTestEnv('test')) return
+  if (_tu.noTestEnv('main')) return
 
-    console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)
+  test('0 create 1 sat delayed', async () => {
+    const setup = await createSetup('test')
 
-    const createHowMany = 10
-    for (let i = 0; i < createHowMany; i++) {
-      const args: CreateActionArgs = {
-        outputs: [
-          {
-            lockingScript: new P2PKH()
-              .lock(PublicKey.fromString(setup.identityKey).toAddress())
-              .toHex(),
-            satoshis: 1,
-            outputDescription: 'test output',
-            customInstructions: JSON.stringify({
-              type: 'P2PKH',
-              key: 'identity'
-            }),
-            basket: 'test-output'
-          }
-        ],
-        description: 'create test output'
-      }
-      const car = await setup.wallet.createAction(args)
-      expect(car.txid)
-
-      const req = await EntityProvenTxReq.fromStorageTxid(
-        setup.activeStorage,
-        car.txid!
-      )
-      expect(req !== undefined && req.history.notes !== undefined)
-      if (req && req.history.notes) {
-        expect(req.status === 'unsent')
-        expect(req.history.notes.length === 1)
-        const n = req.history.notes[0]
-        expect(n.what === 'status' && n.status_now === 'unsent')
-      }
+    const car = await createOneSatTestOutput(setup, {}, 1)
 
-      let runOnce = false
-      if (runOnce) {
-        await setup.monitor.runOnce()
-
-        const req = await EntityProvenTxReq.fromStorageTxid(
-          setup.activeStorage,
-          car.txid!
-        )
-        expect(req !== undefined && req.history.notes !== undefined)
-        if (req && req.history.notes) {
-          expect(req.status === 'unmined')
-          expect(req.history.notes.length === 1)
-          const n = req.history.notes[0]
-          expect(n.what === 'status' && n.status_now === 'unsent')
-        }
-      }
-    }
+    await trackReqByTxid(setup, car.txid!)
 
     await setup.wallet.destroy()
   })
 
-  test('1 recover 1 sat outputs', async () => {
-    const chain: sdk.Chain = 'test'
-    if (_tu.noTestEnv(chain)) return
-    const env = _tu.getEnv(chain)
-    if (!env.testIdentityKey)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testIdentityKey', 'valid')
-    if (!env.testFilePath)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testFilePath', 'valid')
-
-    const setup = await _tu.createTestWallet({
-      chain,
-      rootKeyHex: env.devKeys[env.testIdentityKey],
-      filePath: env.testFilePath,
-      setActiveClient: false,
-      addLocalBackup: false
-    })
+  test('0a create 1 sat immediate', async () => {
+    const setup = await createSetup('test')
 
-    console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)
+    const car = await createOneSatTestOutput(
+      setup,
+      { acceptDelayedBroadcast: false },
+      1
+    )
 
-    const outputs = await setup.wallet.listOutputs({
-      basket: 'test-output',
-      include: 'entire transactions',
-      limit: 1000
-    })
-
-    if (outputs.outputs.length > 8) {
-      const args: CreateActionArgs = {
-        inputBEEF: outputs.BEEF!,
-        inputs: [],
-        description: 'recover test output'
-      }
-      const p2pkh = new P2PKH()
-      for (const o of outputs.outputs) {
-        args.inputs!.push({
-          unlockingScriptLength: 108,
-          outpoint: o.outpoint,
-          inputDescription: 'recovered test output'
-        })
-      }
-      const car = await setup.wallet.createAction(args)
-      expect(car.signableTransaction)
-
-      const st = car.signableTransaction!
-      const beef = Beef.fromBinary(st.tx)
-      const tx = beef.findAtomicTransaction(beef.txs.slice(-1)[0].txid)!
-      const signArgs: SignActionArgs = {
-        reference: st.reference,
-        spends: {} //  0: { unlockingScript } },
-      }
-      for (let i = 0; i < outputs.outputs.length; i++) {
-        const o = outputs.outputs[i]
-        const unlock = p2pkh.unlock(setup.keyDeriver.rootKey, 'all', false)
-        const unlockingScript = (await unlock.sign(tx, i)).toHex()
-        signArgs.spends[i] = { unlockingScript }
-      }
-      const sar = await setup.wallet.signAction(signArgs)
-      expect(sar.txid)
-    }
+    await trackReqByTxid(setup, car.txid!)
 
     await setup.wallet.destroy()
   })
 
-  test('2 monitor runOnce', async () => {
-    const chain: sdk.Chain = 'test'
-    if (_tu.noTestEnv(chain)) return
-    const env = _tu.getEnv(chain)
-    if (!env.testIdentityKey)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testIdentityKey', 'valid')
-    if (!env.testFilePath)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testFilePath', 'valid')
-
-    const setup = await _tu.createTestWallet({
-      chain,
-      rootKeyHex: env.devKeys[env.testIdentityKey],
-      filePath: env.testFilePath,
-      setActiveClient: false,
-      addLocalBackup: false
-    })
+  test('1 recover 1 sat outputs', async () => {
+    const setup = await createSetup('test')
 
-    console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)
+    await recoverOneSatTestOutputs(setup)
+
+    await setup.wallet.destroy()
+  })
+
+  test('2 monitor runOnce', async () => {
+    const setup = await createSetup('test')
 
     await setup.monitor.runOnce()
 
@@ -174,23 +75,7 @@ describe('localWallet tests', () => {
   })
 
   test('3 return active to cloud client', async () => {
-    const chain: sdk.Chain = 'test'
-    if (_tu.noTestEnv(chain)) return
-    const env = _tu.getEnv(chain)
-    if (!env.testIdentityKey)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testIdentityKey', 'valid')
-    if (!env.testFilePath)
-      throw new sdk.WERR_INVALID_PARAMETER('env.testFilePath', 'valid')
-
-    const setup = await _tu.createTestWallet({
-      chain,
-      rootKeyHex: env.devKeys[env.testIdentityKey],
-      filePath: env.testFilePath,
-      setActiveClient: false,
-      addLocalBackup: false
-    })
-
-    console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)
+    const setup = await createSetup('test')
 
     const localBalance = await setup.wallet.balance()
 
@@ -205,4 +90,272 @@ describe('localWallet tests', () => {
 
     await setup.wallet.destroy()
   })
+
+  test('4 review change utxos', async () => {
+    const setup = await createSetup('test')
+
+    const storage = setup.activeStorage
+    const services = setup.services
+
+    const { invalidSpendableOutputs: notUtxos } = await confirmSpendableOutputs(
+      storage,
+      services
+    )
+    const outputsToUpdate = notUtxos.map(o => ({
+      id: o.outputId,
+      satoshis: o.satoshis
+    }))
+
+    const total: number = outputsToUpdate.reduce((t, o) => t + o.satoshis, 0)
+
+    debugger
+    // *** About set spendable = false for outputs ***/
+    for (const o of outputsToUpdate) {
+      await storage.updateOutput(o.id, { spendable: false })
+    }
+
+    await setup.wallet.destroy()
+  })
+
+  test('5 review synchunk', async () => {
+    const setup = await createSetup('test')
+
+    const identityKey = setup.identityKey
+    const reader = setup.activeStorage
+    const readerSettings = reader.getSettings()
+    const writer = setup.storage._backups![0].storage
+    const writerSettings = writer.getSettings()
+
+    const ss = await EntitySyncState.fromStorage(
+      writer,
+      identityKey,
+      readerSettings
+    )
+
+    const args = ss.makeRequestSyncChunkArgs(
+      identityKey,
+      writerSettings.storageIdentityKey
+    )
+
+    const chunk = await reader.getSyncChunk(args)
+
+    await setup.wallet.destroy()
+  })
+
+  test('6 backup', async () => {
+    const setup = await createSetup('test')
+
+    await setup.storage.updateBackups()
+
+    await setup.wallet.destroy()
+  })
 })
+
+async function createSetup(chain: sdk.Chain): Promise<TestWalletNoSetup> {
+  const env = _tu.getEnv(chain)
+  if (!env.testIdentityKey)
+    throw new sdk.WERR_INVALID_PARAMETER('env.testIdentityKey', 'valid')
+  if (!env.testFilePath)
+    throw new sdk.WERR_INVALID_PARAMETER('env.testFilePath', 'valid')
+
+  const setup = await _tu.createTestWallet({
+    chain,
+    rootKeyHex: env.devKeys[env.testIdentityKey],
+    filePath: env.testFilePath,
+    setActiveClient: false,
+    addLocalBackup: false
+  })
+
+  console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)
+
+  return setup
+}
+
+async function createOneSatTestOutput(
+  setup: TestWalletNoSetup,
+  options: CreateActionOptions = {},
+  howMany: number = 1
+): Promise<CreateActionResult> {
+  let car: CreateActionResult = {}
+
+  for (let i = 0; i < howMany; i++) {
+    const args: CreateActionArgs = {
+      outputs: [
+        {
+          lockingScript: new P2PKH()
+            .lock(PublicKey.fromString(setup.identityKey).toAddress())
+            .toHex(),
+          satoshis: 1,
+          outputDescription: 'test output',
+          customInstructions: JSON.stringify({
+            type: 'P2PKH',
+            key: 'identity'
+          }),
+          basket: 'test-output'
+        }
+      ],
+      description: 'create test output',
+      options: {
+        ...options
+      }
+    }
+    car = await setup.wallet.createAction(args)
+    expect(car.txid)
+
+    const req = await EntityProvenTxReq.fromStorageTxid(
+      setup.activeStorage,
+      car.txid!
+    )
+    expect(req !== undefined && req.history.notes !== undefined)
+    if (req && req.history.notes) {
+      expect(req.status === 'unsent')
+      expect(req.history.notes.length === 1)
+      const n = req.history.notes[0]
+      expect(n.what === 'status' && n.status_now === 'unsent')
+    }
+  }
+  return car
+}
+
+async function recoverOneSatTestOutputs(
+  setup: TestWalletNoSetup
+): Promise<void> {
+  const outputs = await setup.wallet.listOutputs({
+    basket: 'test-output',
+    include: 'entire transactions',
+    limit: 1000
+  })
+
+  if (outputs.outputs.length > 8) {
+    const args: CreateActionArgs = {
+      inputBEEF: outputs.BEEF!,
+      inputs: [],
+      description: 'recover test output'
+    }
+    const p2pkh = new P2PKH()
+    for (const o of outputs.outputs) {
+      args.inputs!.push({
+        unlockingScriptLength: 108,
+        outpoint: o.outpoint,
+        inputDescription: 'recovered test output'
+      })
+    }
+    const car = await setup.wallet.createAction(args)
+    expect(car.signableTransaction)
+
+    const st = car.signableTransaction!
+    const beef = Beef.fromBinary(st.tx)
+    const tx = beef.findAtomicTransaction(beef.txs.slice(-1)[0].txid)!
+    const signArgs: SignActionArgs = {
+      reference: st.reference,
+      spends: {} //  0: { unlockingScript } },
+    }
+    for (let i = 0; i < outputs.outputs.length; i++) {
+      const o = outputs.outputs[i]
+      const unlock = p2pkh.unlock(setup.keyDeriver.rootKey, 'all', false)
+      const unlockingScript = (await unlock.sign(tx, i)).toHex()
+      signArgs.spends[i] = { unlockingScript }
+    }
+    const sar = await setup.wallet.signAction(signArgs)
+    expect(sar.txid)
+  }
+}
+
+async function trackReqByTxid(
+  setup: TestWalletNoSetup,
+  txid: string
+): Promise<void> {
+  const req = await EntityProvenTxReq.fromStorageTxid(setup.activeStorage, txid)
+
+  expect(req !== undefined && req.history.notes !== undefined)
+  if (!req || !req.history.notes) throw new sdk.WERR_INTERNAL()
+
+  let newBlocks = 0
+  let lastHeight: number | undefined
+  for (; req.status !== 'completed'; ) {
+    let height = setup.monitor.lastNewHeader?.height
+    if (req.status === 'unsent') {
+      // send it...
+    }
+    if (req.status === 'sending') {
+      // send it...
+    }
+    if (req.status === 'unmined') {
+      if (height && lastHeight) {
+        if (height === lastHeight) {
+          await wait(1000 * 60)
+        } else {
+          newBlocks++
+          expect(newBlocks < 5)
+        }
+      }
+    }
+
+    await setup.monitor.runOnce()
+    await req.refreshFromStorage(setup.activeStorage)
+    lastHeight = height
+  }
+}
+
+export async function confirmSpendableOutputs(
+  storage: StorageKnex,
+  services: Services,
+  identityKey?: string
+): Promise<{ invalidSpendableOutputs: TableOutput[] }> {
+  const invalidSpendableOutputs: TableOutput[] = []
+  const partial: Partial<TableUser> = {}
+  if (identityKey) partial.identityKey = identityKey
+  const users = await storage.findUsers({ partial })
+
+  for (const { userId } of users) {
+    const defaultBasket = verifyOne(
+      await storage.findOutputBaskets({ partial: { userId, name: 'default' } })
+    )
+    const where: Partial<TableOutput> = {
+      userId,
+      basketId: defaultBasket.basketId,
+      spendable: true
+    }
+
+    const outputs = await storage.findOutputs({ partial: where })
+
+    for (let i = outputs.length - 1; i >= 0; i--) {
+      const o = outputs[i]
+      const oid = verifyId(o.outputId)
+
+      if (o.spendable) {
+        let ok = false
+
+        if (o.lockingScript && o.lockingScript.length > 0) {
+          const r = await services.getUtxoStatus(
+            asString(o.lockingScript),
+            'script'
+          )
+
+          if (r.status === 'success' && r.isUtxo && r.details?.length > 0) {
+            const tx = await storage.findTransactionById(o.transactionId)
+
+            if (
+              tx &&
+              tx.txid &&
+              r.details.some(
+                d =>
+                  d.txid === tx.txid &&
+                  d.satoshis === o.satoshis &&
+                  d.index === o.vout
+              )
+            ) {
+              ok = true
+            }
+          }
+        }
+
+        if (!ok) {
+          invalidSpendableOutputs.push(o)
+        }
+      }
+    }
+  }
+
+  return { invalidSpendableOutputs }
+}

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

@@ -0,0 +1,44 @@
+import { Services, StorageKnex } from '../../../src'
+import { _tu } from '../../utils/TestUtilsWalletStorage'
+import { confirmSpendableOutputs } from '../local/localWallet.man.test'
+
+describe('janitor tests', () => {
+  jest.setTimeout(99999999)
+
+  test('0 review utxos by identity key', async () => {
+    const env = _tu.getEnv('main')
+    if (!env.cloudMySQLConnection) return
+
+    const connection = JSON.parse(env.cloudMySQLConnection)
+    const storage = new StorageKnex({
+      ...StorageKnex.defaultOptions(),
+      knex: _tu.createMySQLFromConnection(connection),
+      chain: env.chain
+    })
+    await storage.makeAvailable()
+
+    const services = new Services(env.chain)
+
+    const identityKey =
+      '03894bda9b11626c0280ec28f0d0193e9bd34446679ed1b32e5621e94e0e807073'
+    const { invalidSpendableOutputs: notUtxos } = await confirmSpendableOutputs(
+      storage,
+      services,
+      identityKey
+    )
+    const outputsToUpdate = notUtxos.map(o => ({
+      id: o.outputId,
+      satoshis: o.satoshis
+    }))
+
+    const total: number = outputsToUpdate.reduce((t, o) => t + o.satoshis, 0)
+
+    debugger
+    // *** About set spendable = false for outputs ***/
+    for (const o of outputsToUpdate) {
+      await storage.updateOutput(o.id, { spendable: false })
+    }
+
+    await storage.destroy()
+  })
+})