@bsv/wallet-toolbox 1.2.2 → 1.2.4

package/package.json

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

package/src/services/Services.ts

@@ -39,7 +39,7 @@ export class Services implements sdk.WalletServices {
 
     //prettier-ignore
     this.getMerklePathServices = new ServiceCollection<sdk.GetMerklePathService>()
-      //.add({ name: 'WhatsOnChain', service: this.whatsonchain.getMerklePath.bind(this.whatsonchain) })
+      .add({ name: 'WhatsOnChain', service: this.whatsonchain.getMerklePath.bind(this.whatsonchain) })
       .add({ name: 'Bitails', service: this.bitails.getMerklePath.bind(this.bitails) })
 
     //prettier-ignore

package/src/storage/StorageProvider.ts

@@ -1,12 +1,10 @@
 import {
-  Transaction as BsvTransaction,
+  Transaction,
   AbortActionResult,
   Beef,
   InternalizeActionArgs,
   InternalizeActionResult,
-  ListActionsArgs,
   ListActionsResult,
-  ListOutputsArgs,
   ListOutputsResult,
   PubKeyHex,
   ListCertificatesResult,
@@ -19,7 +17,6 @@ import {
   asArray,
   asString,
   sdk,
-  TableCertificate,
   TableCertificateX,
   TableMonitorEvent,
   TableOutput,
@@ -248,7 +245,7 @@ export abstract class StorageProvider extends StorageReaderWriter implements sdk
     if (!rawTx || !beef) throw new sdk.WERR_INTERNAL(`req rawTx and beef must be valid.`)
     mergeToBeef.mergeRawTx(asArray(rawTx))
     mergeToBeef.mergeBeef(asArray(beef))
-    const tx = BsvTransaction.fromBinary(asArray(rawTx))
+    const tx = Transaction.fromBinary(asArray(rawTx))
     for (const input of tx.inputs) {
       if (!input.sourceTXID) throw new sdk.WERR_INTERNAL(`req all transaction inputs must have valid sourceTXID`)
       const txid = input.sourceTXID
@@ -441,7 +438,7 @@ export abstract class StorageProvider extends StorageReaderWriter implements sdk
       else {
         beef.mergeRawTx(r.rawTx)
         beef.mergeBeef(r.inputBEEF)
-        const tx = BsvTransaction.fromBinary(r.rawTx)
+        const tx = Transaction.fromBinary(r.rawTx)
         for (const input of tx.inputs) {
           const btx = beef.findTxid(input.sourceTXID!)
           if (!btx) {

package/src/storage/methods/listOutputs.ts

@@ -8,6 +8,7 @@ interface SpecOp {
   name: string
   useBasket?: string
   ignoreLimit?: boolean
+  includeOutputScripts?: boolean
   resultFromTags?: (
     s: StorageKnex,
     auth: sdk.AuthId,
@@ -61,6 +62,7 @@ const basketToSpecOp: Record<string, SpecOp> = {
     name: 'invalidChangeOutputs',
     useBasket: 'default',
     ignoreLimit: true,
+    includeOutputScripts: true,
     tagsToIntercept: ['release'],
     filterOutputs: async (
       s: StorageKnex,
@@ -71,16 +73,24 @@ const basketToSpecOp: Record<string, SpecOp> = {
     ): Promise<TableOutput[]> => {
       const filteredOutputs: TableOutput[] = []
       for (const o of outputs) {
-        let ok = false
+        await s.validateOutputScript(o)
+        let ok: boolean | undefined = false
+        let r: sdk.GetUtxoStatusResult
         if (o.lockingScript && o.lockingScript.length > 0) {
-          const r = await s.getServices().getUtxoStatus(asString(o.lockingScript), 'script')
+          r = await s.getServices().getUtxoStatus(asString(o.lockingScript), 'script')
           if (r.status === 'success' && r.isUtxo && r.details?.length > 0) {
             if (r.details.some(d => d.txid === o.txid && d.satoshis === o.satoshis && d.index === o.vout)) {
               ok = true
+            } else {
+              ok = undefined
             }
+          } else {
+            ok = false
           }
+        } else {
+          ok = undefined
         }
-        if (!ok) {
+        if (ok === false) {
           filteredOutputs.push(o)
         }
       }

package/src/storage/sync/StorageMySQLDojoReader.ts

@@ -198,7 +198,7 @@ export class StorageMySQLDojoReader extends StorageReader implements sdk.WalletS
         reference: forceToBase64(d.referenceNumber),
         isOutgoing: !!d.isOutgoing,
         satoshis: verifyInteger(d.amount),
-        description: verifyTruthy(d.note || ''),
+        description: verifyTruthy(d.note || '12345'),
         provenTxId: verifyOptionalInteger(d.provenTxId),
         version: verifyOptionalInteger(d.version),
         lockTime: verifyOptionalInteger(d.lockTime),

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

@@ -29,51 +29,53 @@ import { _tu, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
 import { monitorEventLoopDelay } from 'perf_hooks'
 import { specOpInvalidChange, validateCreateActionArgs, ValidCreateActionArgs } from '../../../src/sdk'
 
+const chain: sdk.Chain = 'test'
 const setActiveClient = true
-const useMySQLConnectionForClient = true
+const useMySQLConnectionForClient = false
+const useTestIdentityKey = true
+const useIdentityKey2 = false
 
 describe('localWallet tests', () => {
   jest.setTimeout(99999999)
 
   test('00', () => {})
-  if (_tu.noTestEnv('test')) return
-  if (_tu.noTestEnv('main')) return
+  if (_tu.noTestEnv(chain)) return
 
   test('0 monitor runOnce', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     await setup.monitor.runOnce()
     await setup.wallet.destroy()
   })
 
   test('1 recover 1 sat outputs', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     await recoverOneSatTestOutputs(setup)
     await setup.wallet.destroy()
   })
 
   test('2 create 1 sat delayed', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const car = await createOneSatTestOutput(setup, {}, 1)
     //await trackReqByTxid(setup, car.txid!)
     await setup.wallet.destroy()
   })
 
   test('2a create 1 sat immediate', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const car = await createOneSatTestOutput(setup, { acceptDelayedBroadcast: false }, 1)
     // await trackReqByTxid(setup, car.txid!)
     await setup.wallet.destroy()
   })
 
   test('2b create 2 nosend and sendWith', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const car = await createOneSatTestOutput(setup, { noSend: true }, 2)
     //await trackReqByTxid(setup, car.txid!)
     await setup.wallet.destroy()
   })
 
   test('3 return active to cloud client', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const localBalance = await setup.wallet.balance()
     const log = await setup.storage.setActive(setup.clientStorageIdentityKey!)
     console.log(log)
@@ -84,10 +86,9 @@ describe('localWallet tests', () => {
   })
 
   test('4 review change utxos', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const lor = await setup.wallet.listOutputs({
-      basket: specOpInvalidChange,
-      limit: 1000
+      basket: specOpInvalidChange
     })
     if (lor.totalOutputs > 0) {
       debugger
@@ -112,7 +113,7 @@ describe('localWallet tests', () => {
   })
 
   test('5 review synchunk', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const identityKey = setup.identityKey
     const reader = setup.activeStorage
     const readerSettings = reader.getSettings()
@@ -125,7 +126,7 @@ describe('localWallet tests', () => {
   })
 
   test('6 backup', async () => {
-    const setup = await createSetup('test')
+    const setup = await createSetup(chain)
     const log = await setup.storage.updateBackups()
     console.log(log)
     await setup.wallet.destroy()
@@ -134,13 +135,26 @@ describe('localWallet tests', () => {
 
 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')
+  let identityKey: string | undefined
+  let filePath: string | undefined
+  if (useTestIdentityKey) {
+    identityKey = env.testIdentityKey
+    filePath = env.testFilePath
+  } else {
+    if (useIdentityKey2) {
+      identityKey = env.identityKey2
+    } else {
+      identityKey = env.identityKey
+      filePath = env.filePath
+    }
+  }
+  if (!identityKey) throw new sdk.WERR_INVALID_PARAMETER('identityKey', 'valid')
+  if (!filePath) filePath = `./backup-${chain}-${identityKey}.sqlite`
 
   const setup = await _tu.createTestWallet({
     chain,
-    rootKeyHex: env.devKeys[env.testIdentityKey],
-    filePath: env.testFilePath,
+    rootKeyHex: env.devKeys[identityKey],
+    filePath,
     setActiveClient,
     addLocalBackup: false,
     useMySQLConnectionForClient

package/test/Wallet/sync/Wallet.updateWalletLegacyTestData.man.test.ts

@@ -8,8 +8,8 @@ import { StorageMySQLDojoReader } from '../../../src/storage/sync'
 import { _tu, TestSetup1Wallet } from '../../utils/TestUtilsWalletStorage'
 
 import * as dotenv from 'dotenv'
-
 dotenv.config()
+const main_satoshi_shop = process.env.MAIN_SATOSHI_SHOP || ''
 
 /**
  * NOTICE: These tests are designed to chain one after the other.
@@ -64,16 +64,16 @@ describe('Wallet sync tests', () => {
   })
 
   test.skip('0a sync production dojo to local MySQL', async () => {
+    const chain: sdk.Chain = 'main'
+    const env = _tu.getEnv(chain)
     console.log('Importing from production dojo to local MySQL productiondojotone')
-    // production faucet key
-    const identityKey = '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // process.env.MY_MAIN_IDENTITY || ''
+    const identityKey = main_satoshi_shop
     const rootKeyHex = env.devKeys[identityKey]
-    const chain: sdk.Chain = 'main'
     const connection = JSON.parse(process.env.MAIN_DOJO_CONNECTION || '')
     const readerKnex = _tu.createMySQLFromConnection(connection)
     const reader = new StorageMySQLDojoReader({ chain, knex: readerKnex })
     const writer = await _tu.createMySQLTestWallet({
-      databaseName: 'productiondojofaucet',
+      databaseName: 'main_satoshi_shop',
       chain: 'main',
       rootKeyHex,
       dropAll: true
@@ -85,23 +85,23 @@ describe('Wallet sync tests', () => {
     await writer.activeStorage.destroy()
   })
 
-  test.skip('0b sweep mysql dojo sync to new sqlite', async () => {
+  test.skip('0b sweep mysql dojo sync to another wallet', async () => {
     const chain: sdk.Chain = 'main'
-    const identityKey = '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // prod faucet
-    //const identityKeyTone = process.env.MY_MAIN_IDENTITY || ''
+    const env = _tu.getEnv(chain)
+    // const prod_faucet = '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // prod faucet
+    // const identityKeyTone = process.env.MY_MAIN_IDENTITY || ''
+    const identityKey = main_satoshi_shop
     const rootKeyHex = env.devKeys[identityKey]
 
     const sweepFrom = await _tu.createMySQLTestWallet({
-      databaseName: 'productiondojofaucet',
+      databaseName: 'main_satoshi_shop',
       chain,
       rootKeyHex
     })
 
-    const sweepTo = await _tu.createSQLiteTestWallet({
-      filePath: '/Users/tone/Kz/tone42.sqlite',
-      databaseName: 'tone42',
-      chain,
-      rootKeyHex
+    const sweepTo = await _tu.createTestWalletWithStorageClient({
+      rootKeyHex: env.devKeys[env.identityKey],
+      chain
     })
 
     //await sweepTo.activeStorage.updateProvenTxReq(2, { status: 'invalid' })