@bsv/wallet-toolbox 1.3.24 → 1.3.25

package/src/services/createDefaultWalletServicesOptions.ts

@@ -2,10 +2,15 @@ import { randomBytesHex, sdk } from '../index.client'
 import { ChaintracksServiceClient } from './chaintracker'
 
 export function createDefaultWalletServicesOptions(chain: sdk.Chain): sdk.WalletServicesOptions {
+  const deploymentId = `wallet-toolbox-${randomBytesHex(16)}`
   const taalApiKey =
     chain === 'main'
       ? 'mainnet_9596de07e92300c6287e4393594ae39c' // no plan
       : 'testnet_0e6cf72133b43ea2d7861da2a38684e3' // personal "starter" key
+  const gorillaPoolApiKey =
+    chain === 'main'
+      ? ''
+      : ''
 
   const o: sdk.WalletServicesOptions = {
     chain,
@@ -36,7 +41,12 @@ export function createDefaultWalletServicesOptions(chain: sdk.Chain): sdk.Wallet
     arcUrl: arcDefaultUrl(chain),
     arcConfig: {
       apiKey: taalApiKey,
-      deploymentId: `wallet-toolbox-${randomBytesHex(16)}`
+      deploymentId
+    },
+    arcGorillaPoolUrl: arcGorillaPoolUrl(chain),
+    arcGorillaPoolConfig: {
+      apiKey: gorillaPoolApiKey,
+      deploymentId
     }
   }
   return o
@@ -46,3 +56,8 @@ export function arcDefaultUrl(chain: sdk.Chain): string {
   const url = chain === 'main' ? 'https://arc.taal.com' : 'https://arc-test.taal.com'
   return url
 }
+
+export function arcGorillaPoolUrl(chain: sdk.Chain): string | undefined {
+  const url = chain === 'main' ? 'https://arc.gorillapool.io' : undefined
+  return url
+}

package/src/services/providers/ARC.ts

@@ -36,6 +36,7 @@ function defaultDeploymentId(): string {
  * Represents an ARC transaction broadcaster.
  */
 export class ARC {
+  readonly name: string
   readonly URL: string
   readonly apiKey: string | undefined
   readonly deploymentId: string
@@ -50,16 +51,17 @@ export class ARC {
    * @param {string} URL - The URL endpoint for the ARC API.
    * @param {ArcConfig} config - Configuration options for the ARC broadcaster.
    */
-  constructor(URL: string, config?: ArcConfig)
+  constructor(URL: string, config?: ArcConfig, name?: string)
   /**
    * Constructs an instance of the ARC broadcaster.
    *
    * @param {string} URL - The URL endpoint for the ARC API.
    * @param {string} apiKey - The API key used for authorization with the ARC API.
    */
-  constructor(URL: string, apiKey?: string)
+  constructor(URL: string, apiKey?: string, name?: string)
 
-  constructor(URL: string, config?: string | ArcConfig) {
+  constructor(URL: string, config?: string | ArcConfig, name?: string) {
+    this.name = name ?? 'ARC'
     this.URL = URL
     if (typeof config === 'string') {
       this.apiKey = config
@@ -143,7 +145,7 @@ export class ARC {
     }
 
     const url = `${this.URL}/v1/tx`
-    const nn = () => ({ name: 'ARCv1tx', when: new Date().toISOString() })
+    const nn = () => ({ name: this.name, when: new Date().toISOString() })
     const nne = () => ({ ...nn(), rawTx, txids: txids.join(','), url })
 
     try {
@@ -241,13 +243,13 @@ export class ARC {
    */
   async postBeef(beef: Beef, txids: string[]): Promise<sdk.PostBeefResult> {
     const r: sdk.PostBeefResult = {
-      name: 'ARC',
+      name: this.name,
       status: 'success',
       txidResults: [],
       notes: []
     }
 
-    const nn = () => ({ name: 'ARCpostBeef', when: new Date().toISOString() })
+    const nn = () => ({ name: this.name, when: new Date().toISOString() })
 
     if (beef.version === BEEF_V2 && beef.txs.every(btx => !btx.isTxidOnly)) {
       beef.version = BEEF_V1

package/src/signer/methods/internalizeAction.ts

@@ -89,25 +89,15 @@ export async function internalizeAction(
     // TODO: Add support for known txids...
 
     const txValid = await ab.verify(await wallet.getServices().getChainTracker(), false)
-    if (!txValid || !ab.atomicTxid) throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
+    if (!txValid || !ab.atomicTxid) {
+      console.log(`internalizeAction beef is invalid: ${ab.toLogString()}`)
+      throw new sdk.WERR_INVALID_PARAMETER('tx', 'valid AtomicBEEF')
+    }
     const txid = ab.atomicTxid
     const btx = ab.findTxid(txid)
     if (!btx) throw new sdk.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF with newest txid of ${txid}`)
     const tx = btx.tx!
 
-    /*
-    for (const i of tx.inputs) {
-      if (!i.sourceTXID)
-        throw new sdk.WERR_INTERNAL('beef Transactions must have sourceTXIDs')
-      if (!i.sourceTransaction) {
-        const btx = ab.findTxid(i.sourceTXID)
-        if (!btx)
-          throw new sdk.WERR_INVALID_PARAMETER('tx', `valid AtomicBEEF and contain input transaction with txid ${i.sourceTXID}`);
-        i.sourceTransaction = btx.tx
-      }
-    }
-    */
-
     return { ab, tx, txid }
   }
 }

package/src/storage/StorageKnex.ts

@@ -488,6 +488,27 @@ export class StorageKnex extends StorageProvider implements sdk.WalletStoragePro
     let q = this.toDb(args.trx)<T>(table)
     if (args.partial && Object.keys(args.partial).length > 0) q.where(args.partial)
     if (args.since) q.where('updated_at', '>=', this.validateDateForWhere(args.since))
+    if (args.orderDescending) {
+      let sortColumn = ''
+      switch (table) {
+        case 'certificates': sortColumn = 'certificateId'; break
+        case 'commissions': sortColumn = 'commissionId'; break
+        case 'output_baskets': sortColumn = 'basketId'; break
+        case 'outputs': sortColumn = 'outputId'; break
+        case 'output_tags': sortColumn = 'outputTagId'; break
+        case 'proven_tx_reqs': sortColumn = 'provenTxReqId'; break
+        case 'proven_txs': sortColumn = 'provenTxId'; break
+        case 'sync_states': sortColumn = 'syncStateId'; break
+        case 'transactions': sortColumn = 'transactionId'; break
+        case 'tx_labels': sortColumn = 'txLabelId'; break
+        case 'users': sortColumn = 'userId'; break
+        case 'monitor_events': sortColumn = 'id'; break
+        default: break;
+      }
+      if (sortColumn !== '') {
+        q.orderBy(sortColumn, 'desc')
+      }
+    }
     if (args.paged) {
       q.limit(args.paged.limit)
       q.offset(args.paged.offset || 0)
@@ -554,7 +575,10 @@ export class StorageKnex extends StorageProvider implements sdk.WalletStoragePro
       )
     const q = this.setupQuery('proven_tx_reqs', args)
     if (args.status && args.status.length > 0) q.whereIn('status', args.status)
-    if (args.txids && args.txids.length > 0) q.whereIn('txid', args.txids)
+    if (args.txids) {
+      const txids = args.txids.filter(txid => txid !== undefined)
+      if (txids.length > 0) q.whereIn('txid', txids)
+    }
     return q
   }
   findProvenTxsQuery(args: sdk.FindProvenTxsArgs): Knex.QueryBuilder {

package/src/storage/StorageProvider.ts

@@ -417,7 +417,7 @@ export abstract class StorageProvider extends StorageReaderWriter implements sdk
     requiredLevels?: number
   ): Promise<Beef> {
     const beef = await this.getValidBeefForTxid(txid, mergeToBeef, trustSelf, knownTxids, trx, requiredLevels)
-    if (!beef) throw new sdk.WERR_INVALID_PARAMETER('txid', `${txid} is not known to storage.`)
+    if (!beef) throw new sdk.WERR_INVALID_PARAMETER('txid', `known to storage. ${txid} is not known.`)
     return beef
   }
 

package/src/storage/methods/createAction.ts

@@ -18,8 +18,6 @@ import {
   randomBytesBase64,
   sdk,
   sha256Hash,
-  stampLog,
-  stampLogFormat,
   StorageProvider,
   TableOutput,
   TableOutputBasket,
@@ -552,7 +550,8 @@ async function validateRequiredInputs(
     ...input,
     vin,
     satoshis: -1,
-    lockingScript: new Script()
+    lockingScript: new Script(),
+    output: undefined
   }))
 
   const trustSelf = vargs.options.trustSelf === 'known'
@@ -603,6 +602,9 @@ async function validateRequiredInputs(
     const { txid, vout } = input.outpoint
     const output = verifyOneOrNone(await storage.findOutputs({ partial: { userId, txid, vout } }))
     if (output) {
+      if (output.change) {
+        throw new sdk.WERR_INVALID_PARAMETER(`inputs[${input.vin}]`, 'an unmanaged input. Change outputs are managed by your wallet.')
+      }
       input.output = output
       if (!Array.isArray(output.lockingScript) || !Number.isInteger(output.satoshis))
         throw new sdk.WERR_INVALID_PARAMETER(`${txid}.${vout}`, 'output with valid lockingScript and satoshis')

package/src/storage/methods/internalizeAction.ts

@@ -347,7 +347,7 @@ class InternalizeActionContext {
     // make sure storage pursues getting a proof for it.
     const newReq = EntityProvenTxReq.fromTxid(this.txid, this.tx.toBinary(), this.args.tx)
     // this status is only relevant if the transaction is new to storage.
-    newReq.status = 'unprocessed'
+    newReq.status = 'unsent'
     // this history and notify will be merged into an existing req if it exists.
     newReq.addHistoryNote({ what: 'internalizeAction', userId: this.userId })
     newReq.addNotifyTransactionId(transactionId)
@@ -357,6 +357,7 @@ class InternalizeActionContext {
       // This storage doesn't know about this txid yet.
 
       // TODO Can we immediately prove this txid?
+      // TODO Do full validation on the transaction?
 
       // Attempt to broadcast it to the network, throwing an error if it fails.
 

package/src/storage/schema/KnexMigrations.ts

@@ -70,6 +70,19 @@ export class KnexMigrations implements MigrationSource<string> {
       }
     }
 
+    migrations['2025-05-13-001 add monitor events event index'] = {
+      async up(knex) {
+        await knex.schema.alterTable('monitor_events', table => {
+          table.index('event')
+        })
+      },
+      async down(knex) {
+        await knex.schema.alterTable('monitor_events', table => {
+          table.dropIndex('event')
+        })
+      }
+    }
+
     migrations['2025-03-03-001 descriptions to 2000'] = {
       async up(knex) {
         await knex.schema.alterTable('transactions', table => {

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

@@ -6,7 +6,7 @@ import { createOneSatTestOutput, createSetup, LocalWalletTestOptions } from '../
 const chain: sdk.Chain = 'test'
 
 const options: LocalWalletTestOptions = {
-  setActiveClient: true,
+  setActiveClient: false,
   useMySQLConnectionForClient: true,
   useTestIdentityKey: true,
   useIdentityKey2: false
@@ -26,6 +26,18 @@ describe('localWallet tests', () => {
     await setup.wallet.destroy()
   })
 
+  test('0a monitor runOnce call history', async () => {
+    const setup = await createSetup(chain, options)
+    const key = await setup.wallet.getPublicKey({ identityKey: true })
+    expect(key.publicKey.toString()).toBe(setup.identityKey)
+    await setup.services.getRawTx('6dd8e416dfaf14c04899ccad2bf76a67c1d5598fece25cf4dcb7a076012b7d8d')
+    await setup.services.getRawTx('ac9cced61e2491be55061ce6577e0c59b909922ba92d5cc1cd754b10d721ab0e')
+    await setup.services.getRawTx('0000e416dfaf14c04899ccad2bf76a67c1d5598fece25cf4dcb7a076012b7d8d')
+    await setup.services.getRawTx('0000ced61e2491be55061ce6577e0c59b909922ba92d5cc1cd754b10d721ab0e')
+    await setup.monitor.runOnce()
+    await setup.wallet.destroy()
+  })
+
   test('2 create 1 sat delayed', async () => {
     const setup = await createSetup(chain, options)
     const car = await createOneSatTestOutput(setup, {}, 1)
@@ -58,21 +70,6 @@ describe('localWallet tests', () => {
     await setup.wallet.destroy()
   })
 
-  test('4 review change utxos', async () => {
-    const setup = await createSetup(chain, options)
-    const lor = await setup.wallet.listOutputs({
-      basket: specOpInvalidChange
-    })
-    if (lor.totalOutputs > 0) {
-      debugger
-      const lor = await setup.wallet.listOutputs({
-        basket: specOpInvalidChange,
-        tags: ['release']
-      })
-    }
-    await setup.wallet.destroy()
-  })
-
   test('5 review synchunk', async () => {
     const setup = await createSetup(chain, options)
     const identityKey = setup.identityKey

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

@@ -1,16 +1,17 @@
-import { WalletOutput } from '@bsv/sdk'
+import { Beef, MerklePath, WalletOutput } from '@bsv/sdk'
 import { sdk, TableOutput, TableUser, verifyOne, verifyOneOrNone } from '../../../src'
-import { _tu } from '../../utils/TestUtilsWalletStorage'
+import { _tu, logger } from '../../utils/TestUtilsWalletStorage'
 import { specOpInvalidChange, ValidListOutputsArgs } from '../../../src/sdk'
 import { LocalWalletTestOptions } from '../../utils/localWalletMethods'
 import { Format } from '../../../src/utility/Format'
+import { asString } from '../../../src/utility/utilityHelpers.noBuffer'
 
 describe('operations.man tests', () => {
   jest.setTimeout(99999999)
 
   test('0 review and release all production invalid change utxos', async () => {
     const { env, storage } = await _tu.createMainReviewSetup()
-    const users = await storage.findUsers({ partial: {} })
+    const users = await storage.findUsers({ partial: { } })
     const withInvalid: Record<number, { user: TableUser; outputs: WalletOutput[]; total: number }> = {}
     const vargs: ValidListOutputsArgs = {
       basket: specOpInvalidChange,
@@ -48,13 +49,14 @@ describe('operations.man tests', () => {
 
   test('1 review and unfail false doubleSpends', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
-    let offset = 2700
+    let offset = 0
     const limit = 100
     let allUnfails: number[] = []
     for (;;) {
       let log = ''
       const unfails: number[] = []
-      const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset } })
+      debugger;
+      const reqs = await storage.findProvenTxReqs({ partial: { status: 'doubleSpend' }, paged: { limit, offset }, orderDescending: true })
       for (const req of reqs) {
         const gsr = await services.getStatusForTxids([req.txid])
         if (gsr.results[0].status !== 'unknown') {
@@ -75,13 +77,13 @@ describe('operations.man tests', () => {
 
   test('2 review and unfail false invalids', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
-    let offset = 800
+    let offset = 0
     const limit = 100
     let allUnfails: number[] = []
     for (;;) {
       let log = ''
       const unfails: number[] = []
-      const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset } })
+      const reqs = await storage.findProvenTxReqs({ partial: { status: 'invalid' }, paged: { limit, offset }, orderDescending: true })
       for (const req of reqs) {
         if (!req.txid || !req.rawTx) continue
         const gsr = await services.getStatusForTxids([req.txid])
@@ -101,6 +103,51 @@ describe('operations.man tests', () => {
     await storage.destroy()
   })
 
+  test.skip('3 review proven_txs', async () => {
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+    let offset = 0
+    const limit = 100
+    let allUnfails: number[] = []
+    //for (const provenTxId of  [3064, 3065, 11268, 11269, 11270, 11271] ) {
+    for (let height = 895000; height < 895026; height++) {
+      let log = ''
+      const unfails: number[] = []
+      const txs = await storage.findProvenTxs({ partial: { height }, paged: { limit, offset } })
+      for (const tx of txs) {
+        const gmpr = await services.getMerklePath(tx.txid)
+        if (gmpr && gmpr.header && gmpr.merklePath) {
+          const mp = gmpr.merklePath
+          const h = gmpr.header
+          const mr = mp.computeRoot(tx.txid)
+          const index = mp.path[0].find(leaf => leaf.hash === tx.txid)?.offset!
+
+          const mp2 = MerklePath.fromBinary(tx.merklePath)
+          const mr2 = mp2.computeRoot()
+
+          if (h.height !== mp.blockHeight || h.merkleRoot !== mr) {
+            console.log(`Merkle root mismatch for ${tx.txid} ${h.merkleRoot} != ${mr}`)
+          } else {
+            if (tx.merkleRoot !== mr || tx.height !== mp.blockHeight || tx.blockHash !== h.hash || tx.index !== index || mp2.blockHeight !== tx.height || mr2 !== tx.merkleRoot || asString(tx.merklePath) !== asString(mp.toBinary())) {
+              debugger;
+              await storage.updateProvenTx(tx.provenTxId, {
+                merklePath: mp.toBinary(),
+                merkleRoot: mr,
+                height: mp.blockHeight,
+                blockHash: h.hash,
+                index
+              })
+              log += `updated ${tx.provenTxId}\n`
+            }
+          }
+        }
+      }
+      //console.log(`${offset} ${log}`)
+      //if (txs.length < limit) break
+      //offset += txs.length
+    }
+    await storage.destroy()
+  })
+
   test.skip('10 re-internalize failed WUI exports', async () => {
     const { env, storage, services } = await _tu.createMainReviewSetup()
     // From this user
@@ -174,4 +221,57 @@ describe('operations.man tests', () => {
     })
     await storage.destroy()
   })
+
+  test.skip('12 check storage merged BEEF', async () => {
+    const userId = 127
+    const txid = 'efba8b92a22c3308f432b292b5ec7efb3869ecd50c62cb3ddfb83871bc7be194'
+    const vout = 1
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+
+    const ptx = verifyOne(await storage.findProvenTxs({ partial: { txid } }))
+
+    const mp = MerklePath.fromBinary(ptx.merklePath)
+    expect(mp.blockHeight).toBe(ptx.height)
+
+    const txids = ['24b19a5179c1f146e825643df4c6dc2ba21674828c20fc2948e105cb1ca91eae']
+
+    const r = await storage.getReqsAndBeefToShareWithWorld(txids, [])
+
+    await storage.destroy()
+  })
+
+  test('13 review use of outputs in all following transactions', async () => {
+    const { env, storage, services } = await _tu.createMainReviewSetup()
+    
+    const txids = ['2df7b5059112a42fc40adb54ee36244cee0dd216c35ad6c4b6ef4631c14a0e83'] //, '9fb38fc87c6ff39f5c7321a4c689db535c024498ed20031434485c981dd7a182', '3fb6b02e1d001dded1daee3f59dcd684489b96a35a9dfb5082b4119a31689966', '72ea8d84a4c54dbca292f4a79a5ff08cb9917fc3127c1dcff0628aeba8b40823', '0564a515566bc43c1396becf12bbf2d82d821ae7b6e0ef404eedfa090d4877c2', '3b93e4327a50a7f4a421af9fbdec0206b3b7ba5252bc5a0142d0d64aa34c2e73', 'd4b0c3d820696afad43b43e095f3b8c3df52385bb4aeddff0212e0a472dd8e4e']
+    const userId = 111
+    const txs = await storage.findTransactions({ partial: { userId }, status: ['completed', 'unproven', 'failed'], orderDescending: true, paged: { limit: 50 } })
+    const allTxids = txs.map(tx => tx.txid!)
+    debugger;
+    const reqs = await storage.findProvenTxReqs({ partial: {}, txids: allTxids })
+    const beef = new Beef()
+    for (const req of reqs) {
+      beef.mergeRawTx(req.rawTx!)
+    }
+
+    for (const txid of txids) {
+      const o = await storage.findOutputs({ partial: { txid, userId } })
+      const tx = await storage.findTransactions({ partial: { txid, userId } })
+      if (o && tx) {
+        const ltx = await Format.toLogStringTableTransaction(tx[0], storage)
+        logger(ltx)
+        for (const btx of beef.txs) {
+          const tx = btx.tx!
+          for (const i of tx.inputs) {
+            if (i.sourceTXID === txid && i.sourceOutputIndex === 0) {
+              const sltx = Format.toLogStringBeefTxid(beef, btx.txid)
+              logger(sltx)
+            }
+          }
+        }
+      }
+    }
+    await storage.destroy()
+  })
+
 })

package/test/storage/KnexMigrations.test.ts

@@ -9,7 +9,7 @@ describe('KnexMigrations tests', () => {
   const env = _tu.getEnvFlags('test')
 
   beforeAll(async () => {
-    const localSQLiteFile = await _tu.newTmpFile('migratetest.sqlite', false, false, true)
+    const localSQLiteFile = await _tu.newTmpFile('migratetest.sqlite', true, false, true)
     const knexSQLite = _tu.createLocalSQLite(localSQLiteFile)
     knexs.push(knexSQLite)