@bsv/wallet-toolbox 1.2.10 → 1.2.11

package/package.json

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

package/src/services/providers/Bitails.ts

@@ -128,9 +128,14 @@ export class Bitails {
             rt.notes!.push({ ...nne(), what: 'postRawsMissingResult', txid })
           } else if (btr.error) {
             // code: -25, message: 'missing-inputs'
-            rt.status = 'error'
+            // code: -27, message: 'already-in-mempool'
             const { code, message } = btr.error
-            rt.notes!.push({ ...nne(), what: 'postRawsError', txid, code, message })
+            if (code === -27) {
+              rt.notes!.push({ ...nne(), what: 'postRawsSuccessAlreadyInMempool' })
+            } else {
+              rt.status = 'error'
+              rt.notes!.push({ ...nne(), what: 'postRawsError', txid, code, message })
+            }
           } else {
             rt.notes!.push({ ...nn(), what: 'postRawsSuccess' })
           }

package/src/services/providers/WhatsOnChain.ts

@@ -167,6 +167,9 @@ export class WhatsOnChain extends SdkWhatsOnChain {
         if (response.ok) {
           const txid = response.data
           r.notes!.push({ ...nn(), what: 'postRawTxSuccess' })
+        }
+        if (response.statusText === 'unexpected response code 500: Transaction already in the mempool') {
+          r.notes!.push({ ...nne(), what: 'postRawTxSuccessAlreadyInMempool' })
         } else {
           r.status = 'error'
           const n: ReqHistoryNote = {

package/src/storage/__test/getBeefForTransaction.test.ts

@@ -82,9 +82,6 @@ class ProtoStorage extends StorageProvider {
   }
 
   async getBeefForTxid(txid: string): Promise<Beef> {
-    const s = this._services!
-    const rr = await s.getRawTx(txid)
-    console.log(rr.name)
     const beef = this.getBeefForTransaction(txid, this.gbo)
     return beef
   }

package/src/storage/remoting/StorageClient.ts

@@ -110,12 +110,6 @@ export class StorageClient implements sdk.WalletStorageProvider {
     }
   }
 
-  //////////////////////////////////////////////////////////////////////////////
-  // In a real environment, you might do lazy or real "makeAvailable" logic
-  // For demonstration, we assume that the remote store might return its "settings"
-  // and we store them locally in `this.settings`.
-  //////////////////////////////////////////////////////////////////////////////
-
   /**
    * @returns true once storage `TableSettings` have been retreived from remote storage.
    */

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

@@ -5,28 +5,11 @@ import {
   CreateActionResult,
   OutpointString,
   P2PKH,
-  PrivateKey,
   PublicKey,
-  Script,
   SignActionArgs
 } from '@bsv/sdk'
-import {
-  asString,
-  EntityProvenTxReq,
-  EntitySyncState,
-  Monitor,
-  sdk,
-  Services,
-  Setup,
-  StorageKnex,
-  TableOutput,
-  TableUser,
-  verifyId,
-  verifyOne,
-  wait
-} from '../../../src'
+import { EntityProvenTxReq, EntitySyncState, sdk, wait } from '../../../src'
 import { _tu, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
-import { monitorEventLoopDelay } from 'perf_hooks'
 import { specOpInvalidChange, validateCreateActionArgs, ValidCreateActionArgs } from '../../../src/sdk'
 
 const chain: sdk.Chain = 'test'
@@ -38,11 +21,13 @@ const useIdentityKey2 = false
 describe('localWallet tests', () => {
   jest.setTimeout(99999999)
 
-  test('00', () => {})
-  if (_tu.noTestEnv(chain)) return
+  //  test('00', () => {})
+  //  if (_tu.noTestEnv(chain)) return
 
   test('0 monitor runOnce', async () => {
     const setup = await createSetup(chain)
+    const key = await setup.wallet.getPublicKey({ identityKey: true })
+    expect(key.publicKey.toString()).toBe(setup.identityKey)
     await setup.monitor.runOnce()
     await setup.wallet.destroy()
   })
@@ -97,18 +82,6 @@ describe('localWallet tests', () => {
         tags: ['release']
       })
     }
-    /*
-    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()
   })
 
@@ -311,56 +284,3 @@ async function trackReqByTxid(setup: TestWalletNoSetup, txid: string): Promise<v
     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

@@ -1,6 +1,5 @@
 import { Services, StorageKnex } from '../../../src'
 import { _tu } from '../../utils/TestUtilsWalletStorage'
-import { confirmSpendableOutputs } from '../local/localWallet.man.test'
 
 describe('janitor tests', () => {
   jest.setTimeout(99999999)
@@ -19,6 +18,7 @@ describe('janitor tests', () => {
 
     const services = new Services(env.chain)
 
+    /*
     const identityKey = '0304985aa632dde471d3bf1ffb030d0af253fe65f5d186bb4cf878ca0fbee54c1c'
     const { invalidSpendableOutputs: notUtxos } = await confirmSpendableOutputs(storage, services, identityKey)
     const outputsToUpdate = notUtxos.map(o => ({
@@ -29,10 +29,11 @@ describe('janitor tests', () => {
     const total: number = outputsToUpdate.reduce((t, o) => t + o.satoshis, 0)
 
     debugger
-    // *** About set spendable = false for outputs ***/
+    // *** About set spendable = false for outputs ***
     for (const o of outputsToUpdate) {
       await storage.updateOutput(o.id, { spendable: false })
     }
+    */
 
     await storage.destroy()
   })