@bsv/wallet-toolbox 1.1.59 → 1.1.61

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

@@ -27,10 +27,7 @@ import {
 } from '../../../src'
 import { _tu, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
 import { monitorEventLoopDelay } from 'perf_hooks'
-import {
-  validateCreateActionArgs,
-  ValidCreateActionArgs
-} from '../../../src/sdk'
+import { validateCreateActionArgs, ValidCreateActionArgs } from '../../../src/sdk'
 
 describe('localWallet tests', () => {
   jest.setTimeout(99999999)
@@ -39,140 +36,90 @@ describe('localWallet tests', () => {
   if (_tu.noTestEnv('test')) return
   if (_tu.noTestEnv('main')) return
 
-  test('0 create 1 sat delayed', async () => {
+  test('0 monitor runOnce', async () => {
     const setup = await createSetup('test')
-
-    const car = await createOneSatTestOutput(setup, {}, 1)
-
-    //await trackReqByTxid(setup, car.txid!)
-
+    await setup.monitor.runOnce()
     await setup.wallet.destroy()
   })
 
-  test('0a create 1 sat immediate', async () => {
+  test('1 recover 1 sat outputs', async () => {
     const setup = await createSetup('test')
-
-    const car = await createOneSatTestOutput(
-      setup,
-      { acceptDelayedBroadcast: false },
-      1
-    )
-
-    await trackReqByTxid(setup, car.txid!)
-
+    await recoverOneSatTestOutputs(setup)
     await setup.wallet.destroy()
   })
 
-  test('0b create 2 nosend and sendWith', async () => {
+  test('2 create 1 sat delayed', async () => {
     const setup = await createSetup('test')
-
-    const car = await createOneSatTestOutput(setup, { noSend: true }, 2)
-
+    const car = await createOneSatTestOutput(setup, {}, 1)
     //await trackReqByTxid(setup, car.txid!)
-
     await setup.wallet.destroy()
   })
 
-  test('1 recover 1 sat outputs', async () => {
+  test('2a create 1 sat immediate', async () => {
     const setup = await createSetup('test')
-
-    await recoverOneSatTestOutputs(setup)
-
+    const car = await createOneSatTestOutput(setup, { acceptDelayedBroadcast: false }, 1)
+    // await trackReqByTxid(setup, car.txid!)
     await setup.wallet.destroy()
   })
 
-  test('2 monitor runOnce', async () => {
+  test('2b create 2 nosend and sendWith', async () => {
     const setup = await createSetup('test')
-
-    await setup.monitor.runOnce()
-
+    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 localBalance = await setup.wallet.balance()
-
     const log = await setup.storage.setActive(setup.clientStorageIdentityKey!)
     console.log(log)
-
     console.log(`ACTIVE STORAGE: ${setup.storage.getActiveStoreName()}`)
-
     const clientBalance = await setup.wallet.balance()
-
     expect(localBalance.total).toBe(clientBalance.total)
-
     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 { 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 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')
-
     const log = await setup.storage.updateBackups()
     console.log(log)
-
     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')
+  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,
@@ -205,9 +152,7 @@ async function createOneSatTestOutput(
     const args: CreateActionArgs = {
       outputs: [
         {
-          lockingScript: new P2PKH()
-            .lock(PublicKey.fromString(setup.identityKey).toAddress())
-            .toHex(),
+          lockingScript: new P2PKH().lock(PublicKey.fromString(setup.identityKey).toAddress()).toHex(),
           satoshis: 1,
           outputDescription: 'test output',
           customInstructions: JSON.stringify({
@@ -229,10 +174,7 @@ async function createOneSatTestOutput(
     txids.push(car.txid!)
     noSendChange = car.noSendChange
 
-    const req = await EntityProvenTxReq.fromStorageTxid(
-      setup.activeStorage,
-      car.txid!
-    )
+    const req = await EntityProvenTxReq.fromStorageTxid(setup.activeStorage, car.txid!)
     expect(req !== undefined && req.history.notes !== undefined)
     if (req && req.history.notes) {
       if (vargs.isNoSend) {
@@ -265,9 +207,7 @@ async function createOneSatTestOutput(
   return car
 }
 
-async function recoverOneSatTestOutputs(
-  setup: TestWalletNoSetup
-): Promise<void> {
+async function recoverOneSatTestOutputs(setup: TestWalletNoSetup): Promise<void> {
   const outputs = await setup.wallet.listOutputs({
     basket: 'test-output',
     include: 'entire transactions',
@@ -309,10 +249,7 @@ async function recoverOneSatTestOutputs(
   }
 }
 
-async function trackReqByTxid(
-  setup: TestWalletNoSetup,
-  txid: string
-): Promise<void> {
+async function trackReqByTxid(setup: TestWalletNoSetup, txid: string): Promise<void> {
   const req = await EntityProvenTxReq.fromStorageTxid(setup.activeStorage, txid)
 
   expect(req !== undefined && req.history.notes !== undefined)
@@ -356,9 +293,7 @@ export async function confirmSpendableOutputs(
   const users = await storage.findUsers({ partial })
 
   for (const { userId } of users) {
-    const defaultBasket = verifyOne(
-      await storage.findOutputBaskets({ partial: { userId, name: 'default' } })
-    )
+    const defaultBasket = verifyOne(await storage.findOutputBaskets({ partial: { userId, name: 'default' } }))
     const where: Partial<TableOutput> = {
       userId,
       basketId: defaultBasket.basketId,
@@ -375,10 +310,7 @@ export async function confirmSpendableOutputs(
         let ok = false
 
         if (o.lockingScript && o.lockingScript.length > 0) {
-          const r = await services.getUtxoStatus(
-            asString(o.lockingScript),
-            'script'
-          )
+          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)
@@ -386,12 +318,7 @@ export async function confirmSpendableOutputs(
             if (
               tx &&
               tx.txid &&
-              r.details.some(
-                d =>
-                  d.txid === tx.txid &&
-                  d.satoshis === o.satoshis &&
-                  d.index === o.vout
-              )
+              r.details.some(d => d.txid === tx.txid && d.satoshis === o.satoshis && d.index === o.vout)
             ) {
               ok = true
             }

package/test/Wallet/specOps/specOps.man.test.ts

@@ -1,9 +1,5 @@
 import { sdk, verifyOne } from '../../../src'
-import {
-  specOpInvalidChange,
-  specOpSetWalletChangeParams,
-  specOpWalletBalance
-} from '../../../src/sdk'
+import { specOpInvalidChange, specOpSetWalletChangeParams, specOpWalletBalance } from '../../../src/sdk'
 import { _tu, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
 
 describe('specOps tests', () => {
@@ -66,10 +62,7 @@ describe('specOps tests', () => {
     // Restore original values...
     await setup.wallet.listOutputs({
       basket: specOpSetWalletChangeParams,
-      tags: [
-        before.numberOfDesiredUTXOs.toString(),
-        before.minimumDesiredUTXOValue.toString()
-      ]
+      tags: [before.numberOfDesiredUTXOs.toString(), before.minimumDesiredUTXOValue.toString()]
     })
 
     await setup.wallet.destroy()
@@ -78,10 +71,8 @@ describe('specOps 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')
+  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,

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

@@ -19,13 +19,8 @@ describe('janitor tests', () => {
 
     const services = new Services(env.chain)
 
-    const identityKey =
-      '0304985aa632dde471d3bf1ffb030d0af253fe65f5d186bb4cf878ca0fbee54c1c'
-    const { invalidSpendableOutputs: notUtxos } = await confirmSpendableOutputs(
-      storage,
-      services,
-      identityKey
-    )
+    const identityKey = '0304985aa632dde471d3bf1ffb030d0af253fe65f5d186bb4cf878ca0fbee54c1c'
+    const { invalidSpendableOutputs: notUtxos } = await confirmSpendableOutputs(storage, services, identityKey)
     const outputsToUpdate = notUtxos.map(o => ({
       id: o.outputId,
       satoshis: o.satoshis

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

@@ -39,8 +39,7 @@ describe('Wallet sync tests', () => {
   }
 
   const env = _tu.getEnv('test')
-  const identityKeyTone =
-    '03ac2d10bdb0023f4145cc2eba2fcd2ad3070cb2107b0b48170c46a9440e4cc3fe'
+  const identityKeyTone = '03ac2d10bdb0023f4145cc2eba2fcd2ad3070cb2107b0b48170c46a9440e4cc3fe'
   const rootKeyHex = env.devKeys[identityKeyTone]
 
   test('0 sync staging dojo to local MySQL', async () => {
@@ -57,10 +56,7 @@ describe('Wallet sync tests', () => {
     })
 
     const identityKey = writer.identityKey
-    await writer.storage.syncFromReader(
-      identityKey,
-      new StorageSyncReader({ identityKey }, reader)
-    )
+    await writer.storage.syncFromReader(identityKey, new StorageSyncReader({ identityKey }, reader))
 
     await reader.destroy()
     await writer.activeStorage.destroy()
@@ -68,12 +64,9 @@ describe('Wallet sync tests', () => {
   })
 
   test.skip('0a sync production dojo to local MySQL', async () => {
-    console.log(
-      'Importing from production dojo to local MySQL productiondojotone'
-    )
+    console.log('Importing from production dojo to local MySQL productiondojotone')
     // production faucet key
-    const identityKey =
-      '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // process.env.MY_MAIN_IDENTITY || ''
+    const identityKey = '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // process.env.MY_MAIN_IDENTITY || ''
     const rootKeyHex = env.devKeys[identityKey]
     const chain: sdk.Chain = 'main'
     const connection = JSON.parse(process.env.MAIN_DOJO_CONNECTION || '')
@@ -86,10 +79,7 @@ describe('Wallet sync tests', () => {
       dropAll: true
     })
 
-    await writer.storage.syncFromReader(
-      identityKey,
-      new StorageSyncReader({ identityKey }, reader)
-    )
+    await writer.storage.syncFromReader(identityKey, new StorageSyncReader({ identityKey }, reader))
 
     await reader.destroy()
     await writer.activeStorage.destroy()
@@ -97,8 +87,7 @@ describe('Wallet sync tests', () => {
 
   test.skip('0b sweep mysql dojo sync to new sqlite', async () => {
     const chain: sdk.Chain = 'main'
-    const identityKey =
-      '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // prod faucet
+    const identityKey = '030b78da8101cd8929ec355c694c275fbaf4f73d4eaa104873463779cac69a2a01' // prod faucet
     //const identityKeyTone = process.env.MY_MAIN_IDENTITY || ''
     const rootKeyHex = env.devKeys[identityKey]
 
@@ -154,9 +143,7 @@ describe('Wallet sync tests', () => {
 
   test.skip('2 sync pruned MySQL stagingdojotone to SQLite walletLegacyTestData', async () => {
     await waitFor1()
-    console.log(
-      'syncing local MySQL stagingdojotone to local SQLite walletLegacyTestData in tmp folder'
-    )
+    console.log('syncing local MySQL stagingdojotone to local SQLite walletLegacyTestData in tmp folder')
     const reader = await _tu.createMySQLTestWallet({
       databaseName: 'stagingdojotone',
       chain: 'test',
@@ -170,25 +157,18 @@ describe('Wallet sync tests', () => {
     })
 
     const identityKey = writer.identityKey
-    await writer.storage.syncFromReader(
-      identityKey,
-      new StorageSyncReader({ identityKey }, reader.activeStorage)
-    )
+    await writer.storage.syncFromReader(identityKey, new StorageSyncReader({ identityKey }, reader.activeStorage))
 
     await reader.activeStorage.destroy()
     await writer.activeStorage.destroy()
 
-    console.log(
-      'REMEMBER: copy walletLegacyTestData.sqlite from tmp up to data!'
-    )
+    console.log('REMEMBER: copy walletLegacyTestData.sqlite from tmp up to data!')
     done2 = true
   })
 
   test.skip('3 sync pruned MySQL stagingdojotone to MySQL walletLegacyTestData', async () => {
     await waitFor2()
-    console.log(
-      'syncing local MySQL stagingdojotone to local SQLite walletLegacyTestData in tmp folder'
-    )
+    console.log('syncing local MySQL stagingdojotone to local SQLite walletLegacyTestData in tmp folder')
     const reader = await _tu.createMySQLTestWallet({
       databaseName: 'stagingdojotone',
       chain: 'test',
@@ -202,10 +182,7 @@ describe('Wallet sync tests', () => {
     })
 
     const identityKey = writer.identityKey
-    await writer.storage.syncFromReader(
-      identityKey,
-      new StorageSyncReader({ identityKey }, reader.activeStorage)
-    )
+    await writer.storage.syncFromReader(identityKey, new StorageSyncReader({ identityKey }, reader.activeStorage))
 
     await reader.activeStorage.destroy()
     await writer.activeStorage.destroy()

package/test/Wallet/sync/setActive.test.ts

@@ -1,7 +1,19 @@
 import knex from 'knex'
-import { sdk, Setup, StorageKnex } from '../../../src'
-import { _tu, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
-import { Database } from 'sqlite3'
+import { sdk, Setup, StorageKnex, wait } from '../../../src'
+import { _tu, logger, TestWalletNoSetup } from '../../utils/TestUtilsWalletStorage'
+
+let done0 = false
+const waitFor0 = async () => {
+  while (!done0) await wait(100)
+}
+let done1 = false
+const waitFor1 = async () => {
+  while (!done1) await wait(100)
+}
+let done2 = false
+const waitFor2 = async () => {
+  while (!done2) await wait(100)
+}
 
 describe('setActive tests', () => {
   jest.setTimeout(99999999)
@@ -64,24 +76,61 @@ describe('setActive tests', () => {
       expect(s.storage.isAvailable() === true)
       expect(s.storage.isActiveEnabled === !first)
       const log = await s.storage.setActive(active)
-      console.log(log)
+      logger(log)
       expect(s.storage.getActiveStore()).toBe(active)
       expect(s.storage.isActiveEnabled === true)
       first = false
     }
   })
 
-  test('1 setActive on main storage wallet with local backup', async () => {
-    if (Setup.noEnv('main')) return
-    const env = _tu.getEnv('main')
-    const s = await _tu.createTestWalletWithStorageClient({
-      chain: env.chain,
-      rootKeyHex: env.devKeys[env.identityKey]
-    })
-    const cloudStorageIdentityKey = s.storage.getActiveStore()
-    //const filePath = '/Users/tone/Kz/tone42_backup.sqlite' // env.filePath
-    const filePath = env.filePath
-    if (filePath) {
+  test.skip('1 setActive on main storage wallet with local backup', async () => {
+    const chain: sdk.Chain = 'main'
+    if (Setup.noEnv(chain)) return
+    const env = _tu.getEnv(chain)
+    if (!env.filePath) return
+
+    try {
+      const s = await _tu.createTestWallet({
+        chain,
+        rootKeyHex: env.devKeys[env.identityKey],
+        filePath: env.filePath,
+        setActiveClient: true,
+        addLocalBackup: false,
+        useMySQLConnectionForClient: true
+      })
+
+      {
+        const log = await s.storage.setActive(s.clientStorageIdentityKey!)
+        logger(log)
+      }
+      {
+        const log = await s.storage.setActive(s.localStorageIdentityKey!)
+        logger(log)
+      }
+      {
+        const log = await s.storage.setActive(s.clientStorageIdentityKey!)
+        logger(log)
+      }
+      expect(s.storage.isActiveEnabled)
+
+      await s.wallet.destroy()
+    } finally {
+      done1 = true
+    }
+  })
+
+  test.skip('2 setActive between two local backups', async () => {
+    await waitFor1()
+    try {
+      if (Setup.noEnv('main')) return
+      const env = _tu.getEnv('main')
+      const s = await _tu.createKnexTestWallet({
+        knex: _tu.createLocalSQLite(env.filePath!),
+        databaseName: `envFilePath for ${env.identityKey}`,
+        chain: env.chain
+      })
+      const envStorageIdentityKey = s.storage.getActiveStore()
+      const filePath = '/Users/tone/Kz/tone42_backup.sqlite'
       const localStore = (
         await _tu.createKnexTestWallet({
           knex: _tu.createLocalSQLite(filePath),
@@ -91,61 +140,26 @@ describe('setActive tests', () => {
       ).activeStorage
       await s.storage.addWalletStorageProvider(localStore)
       {
-        const log = await s.storage.setActive(cloudStorageIdentityKey)
-        console.log(log)
+        const log = await s.storage.setActive(envStorageIdentityKey)
+        logger(log)
       }
       {
-        const log = await s.storage.setActive(
-          localStore._settings!.storageIdentityKey
-        )
-        console.log(log)
+        const log = await s.storage.setActive(localStore._settings!.storageIdentityKey)
+        logger(log)
       }
       {
-        const log = await s.storage.setActive(cloudStorageIdentityKey)
-        console.log(log)
+        const log = await s.storage.setActive(envStorageIdentityKey)
+        logger(log)
       }
       expect(s.storage.isActiveEnabled)
+      await s.wallet.destroy()
+    } finally {
+      done2 = true
     }
-    await s.wallet.destroy()
-  })
-
-  test('2 setActive between two local backups', async () => {
-    if (Setup.noEnv('main')) return
-    const env = _tu.getEnv('main')
-    const s = await _tu.createKnexTestWallet({
-      knex: _tu.createLocalSQLite(env.filePath!),
-      databaseName: `envFilePath for ${env.identityKey}`,
-      chain: env.chain
-    })
-    const envStorageIdentityKey = s.storage.getActiveStore()
-    const filePath = '/Users/tone/Kz/tone42_backup.sqlite'
-    const localStore = (
-      await _tu.createKnexTestWallet({
-        knex: _tu.createLocalSQLite(filePath),
-        databaseName: `sqlite for ${env.identityKey}`,
-        chain: env.chain
-      })
-    ).activeStorage
-    await s.storage.addWalletStorageProvider(localStore)
-    {
-      const log = await s.storage.setActive(envStorageIdentityKey)
-      console.log(log)
-    }
-    {
-      const log = await s.storage.setActive(
-        localStore._settings!.storageIdentityKey
-      )
-      console.log(log)
-    }
-    {
-      const log = await s.storage.setActive(envStorageIdentityKey)
-      console.log(log)
-    }
-    expect(s.storage.isActiveEnabled)
-    await s.wallet.destroy()
   })
 
-  test('3 compare wallet balances', async () => {
+  test.skip('3 compare wallet balances', async () => {
+    await waitFor2()
     const chain: sdk.Chain = 'test'
     if (Setup.noEnv(chain)) return
 

package/test/checkDB.ts

@@ -17,10 +17,7 @@ const runTest = async () => {
     if (err) {
       console.error('Error running PRAGMA foreign_keys:', err.message)
     } else {
-      console.log(
-        'Foreign key enforcement:',
-        row.foreign_keys === 1 ? 'Enabled' : 'Disabled'
-      )
+      console.log('Foreign key enforcement:', row.foreign_keys === 1 ? 'Enabled' : 'Disabled')
     }
   })
 
@@ -29,10 +26,7 @@ const runTest = async () => {
   for (const table of tables) {
     db.all(`PRAGMA foreign_key_list('${table}');`, (err, rows) => {
       if (err) {
-        console.error(
-          `Error querying foreign key list for table '${table}':`,
-          err.message
-        )
+        console.error(`Error querying foreign key list for table '${table}':`, err.message)
       } else {
         console.log(`Foreign key constraints for table '${table}':`)
         if (rows.length === 0) {

package/test/examples/backup.man.test.ts

@@ -29,10 +29,7 @@ export async function backup(): Promise<void> {
 /**
  * @publicbody
  */
-export async function backupWalletClient(
-  env: SetupEnv,
-  identityKey: string
-): Promise<void> {
+export async function backupWalletClient(env: SetupEnv, identityKey: string): Promise<void> {
   const setup = await Setup.createWalletClient({
     env,
     rootKeyHex: env.devKeys[identityKey]
@@ -44,11 +41,7 @@ export async function backupWalletClient(
 /**
  * @publicbody
  */
-export async function backupToSQLite(
-  setup: SetupWallet,
-  filePath?: string,
-  databaseName?: string
-): Promise<void> {
+export async function backupToSQLite(setup: SetupWallet, filePath?: string, databaseName?: string): Promise<void> {
   const env = Setup.getEnv(setup.chain)
   filePath ||= `backup_${setup.identityKey}.sqlite`
   databaseName ||= `${setup.identityKey} backup`