@bsv/wallet-toolbox 1.3.2 → 1.3.3

package/package.json

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

package/src/CWIStyleWalletManager.ts

@@ -338,12 +338,19 @@ export class OverlayUMPTokenInteractor implements UMPTokenInteractor {
     const inputs: CreateActionInput[] = []
     let inputToken: { beef: number[]; outputIndex: number } | undefined
     if (oldTokenToConsume?.currentOutpoint) {
-      inputs.push({
-        outpoint: oldTokenToConsume.currentOutpoint,
-        unlockingScriptLength: 73, // typical signature length
-        inputDescription: 'Consume old UMP token'
-      })
       inputToken = await this.findByOutpoint(oldTokenToConsume.currentOutpoint)
+      // If there is no token on the overlay, we can't consume it. Just start over with a new token.
+      if (!inputToken) {
+        oldTokenToConsume = undefined
+
+        // Otherwise, add the input
+      } else {
+        inputs.push({
+          outpoint: oldTokenToConsume.currentOutpoint,
+          unlockingScriptLength: 73, // typical signature length
+          inputDescription: 'Consume old UMP token'
+        })
+      }
     }
 
     const outputs = [

package/src/sdk/WalletServices.interfaces.ts

@@ -2,6 +2,8 @@ import { ArcConfig, Beef, Transaction as BsvTransaction, ChainTracker, MerklePat
 import { ChaintracksServiceClient } from '../services/chaintracker'
 import { Chain, ReqHistoryNote } from './types'
 import { WalletError } from './WalletError'
+import { TableOutput } from '../storage/schema/tables/Output'
+
 /**
  * Defines standard interfaces to access functionality implemented by external transaction processing services.
  */
@@ -110,6 +112,15 @@ export interface WalletServices {
    */
   getStatusForTxids(txids: string[], useNext?: boolean): Promise<GetStatusForTxidsResult>
 
+  /**
+   * Calls getUtxoStatus with the hash of the output's lockingScript,
+   * and ensures that the output's outpoint matches an unspent use of that script.
+   *
+   * @param output
+   * @returns true if the output appears to currently be spendable.
+   */
+  isUtxo(output: TableOutput): Promise<boolean>
+
   /**
    * Attempts to determine the UTXO status of a transaction output.
    *

package/src/services/Services.ts

@@ -1,5 +1,5 @@
 import { Transaction as BsvTransaction, Beef, ChainTracker, Utils } from '@bsv/sdk'
-import { asArray, asString, doubleSha256BE, sdk, sha256Hash, wait } from '../index.client'
+import { asArray, asString, doubleSha256BE, sdk, sha256Hash, TableOutput, wait } from '../index.client'
 import { ServiceCollection } from './ServiceCollection'
 import { createDefaultWalletServicesOptions } from './createDefaultWalletServicesOptions'
 import { ChaintracksChainTracker } from './chaintracker'
@@ -143,6 +143,18 @@ export class Services implements sdk.WalletServices {
     return hash
   }
 
+  async isUtxo(output: TableOutput): Promise<boolean> {
+    if (!output.lockingScript) {
+      throw new sdk.WERR_INVALID_PARAMETER(
+        'output.lockingScript',
+        'validated by storage provider validateOutputScript.'
+      )
+    }
+    const hash = this.hashOutputScript(Utils.toHex(output.lockingScript))
+    const or = await this.getUtxoStatus(hash, undefined, `${output.txid}.${output.vout}`)
+    return or.isUtxo === true
+  }
+
   async getUtxoStatus(
     output: string,
     outputFormat?: sdk.GetUtxoStatusOutputFormat,

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

@@ -109,6 +109,8 @@ describe('ProvenTx class method tests', () => {
         results: []
       }),
 
+      isUtxo: async () => (true),
+
       getUtxoStatus: async () => ({
         name: 'mock-service',
         status: 'success',

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

@@ -28,7 +28,7 @@ describe('operations1 tests', () => {
 
   test('0 review and release all production invalid change utxos', async () => {
     const { env, storage } = await createMainReviewSetup()
-    const users = await storage.findUsers({ partial: {} })
+    const users = await storage.findUsers({ partial: { userId: 296 } })
     const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
     const vargs: ValidListOutputsArgs = {
       basket: specOpInvalidChange,
@@ -62,9 +62,9 @@ describe('operations1 tests', () => {
     await storage.destroy()
   })
 
-  test('6 review and unfail false doubleSpends', async () => {
+  test('1 review and unfail false doubleSpends', async () => {
     const { env, storage, services } = await createMainReviewSetup()
-    let offset = 2200
+    let offset = 2400
     const limit = 100
     let allUnfails: number[] = []
     for (;;) {
@@ -89,7 +89,7 @@ describe('operations1 tests', () => {
     await storage.destroy()
   })
 
-  test('7 review and unfail false invalids', async () => {
+  test('2 review and unfail false invalids', async () => {
     const { env, storage, services } = await createMainReviewSetup()
     let offset = 500
     const limit = 100