@bsv/wallet-toolbox 1.1.46 → 1.1.47

package/package.json

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

package/src/Wallet.ts

@@ -888,15 +888,13 @@ export class Wallet implements WalletInterface, ProtoWallet {
   /**
    * Uses `listOutputs` to iterate through all spendable outputs in the 'default' (change) basket.
    *
+   * Outputs in the 'default' basket are managed by the wallet and MUST NOT USED AS UNMANAGED INPUTS.
+   *
    * @param {string} basket - Optional. Defaults to 'default', the wallet change basket.
    * @returns { total: number, utxos: { satoshis: number, outpoint: string }[] }
    */
-  async balance(basket: string = 'default'): Promise<{
-    total: number
-    utxos: { satoshis: number; outpoint: string }[]
-  }> {
-    let total = 0
-    const utxos: { satoshis: number; outpoint: string }[] = []
+  async balance(basket: string = 'default'): Promise<sdk.WalletBalance> {
+    const r: sdk.WalletBalance = { total: 0, utxos: [] }
     let offset = 0
     for (;;) {
       const change = await this.listOutputs({
@@ -906,12 +904,12 @@ export class Wallet implements WalletInterface, ProtoWallet {
       })
       if (change.totalOutputs === 0) break
       for (const o of change.outputs) {
-        total += o.satoshis
-        utxos.push({ satoshis: o.satoshis, outpoint: o.outpoint })
+        r.total += o.satoshis
+        r.utxos.push({ satoshis: o.satoshis, outpoint: o.outpoint })
       }
       offset += change.outputs.length
     }
-    return { total, utxos }
+    return r
   }
 }
 

package/src/monitor/tasks/TaskCheckForProofs.ts

@@ -197,6 +197,8 @@ export class TaskCheckForProofs extends WalletMonitorTask {
 
       if (ptx) {
         // We have a merklePath proof for the request (and a block header)
+        await req.updateStorageDynamicProperties(this.storage)
+        await req.refreshFromStorage(this.storage)
         const { provenTxReqId, status, txid, attempts, history } = req.toApi()
         const { index, height, blockHash, merklePath, merkleRoot } = ptx.toApi()
         const r = await this.storage.runAsStorageProvider(async sp => {
@@ -221,9 +223,9 @@ export class TaskCheckForProofs extends WalletMonitorTask {
         if (countsAsAttempt && req.status !== 'nosend') {
           req.attempts++
         }
-        await req.updateStorageDynamicProperties(this.storage)
-        await req.refreshFromStorage(this.storage)
       }
+      await req.updateStorageDynamicProperties(this.storage)
+      await req.refreshFromStorage(this.storage)
 
       log += req.historyPretty(since, indent + 2) + '\n'
 

package/src/sdk/WalletServices.interfaces.ts

@@ -207,6 +207,8 @@ export interface GetMerklePathResult {
    * The first exception error that occurred during processing, if any.
    */
   error?: sdk.WalletError
+
+  notes?: sdk.ReqHistoryNote[]
 }
 
 export interface PostTxResultForTxid {
@@ -237,6 +239,8 @@ export interface PostTxResultForTxid {
   competingTxs?: string[]
 
   data?: object | string | PostTxResultForTxidError
+
+  notes?: sdk.ReqHistoryNote[]
 }
 
 export interface PostTxResultForTxidError {
@@ -269,6 +273,8 @@ export interface PostTxsResult {
    * Service response object. Use service name and status to infer type of object.
    */
   data?: object
+
+  notes?: sdk.ReqHistoryNote[]
 }
 
 export interface GetUtxoStatusDetails {

package/src/sdk/types.ts

@@ -120,3 +120,14 @@ export interface ScriptTemplateUnlock {
   sign: (tx: Transaction, inputIndex: number) => Promise<UnlockingScript>
   estimateLength: (tx: Transaction, inputIndex: number) => Promise<number>
 }
+
+export interface WalletBalance {
+  total: number
+  utxos: { satoshis: number; outpoint: string }[]
+}
+
+export type ReqHistoryNote = {
+  when?: string
+  what: string
+  [key: string]: string | number | undefined
+}

package/src/services/Services.ts

@@ -272,11 +272,13 @@ export class Services implements sdk.WalletServices {
   ): Promise<sdk.GetMerklePathResult> {
     if (useNext) this.getMerklePathServices.next()
 
-    const r0: sdk.GetMerklePathResult = {}
+    const r0: sdk.GetMerklePathResult = { notes: [] }
 
     for (let tries = 0; tries < this.getMerklePathServices.count; tries++) {
       const service = this.getMerklePathServices.service
       const r = await service(txid, this)
+      if (r.notes) r0.notes!.push(...r.notes)
+      if (!r0.name) r0.name = r.name
       if (r.merklePath) {
         // If we have a proof, call it done.
         r0.merklePath = r.merklePath
@@ -284,9 +286,10 @@ export class Services implements sdk.WalletServices {
         r0.name = r.name
         r0.error = undefined
         break
-      } else if (r.error && !r0.error)
+      } else if (r.error && !r0.error) {
         // If we have an error and didn't before...
         r0.error = r.error
+      }
 
       this.getMerklePathServices.next()
     }

package/src/services/providers/ARC.ts

@@ -10,6 +10,7 @@ import {
   Utils
 } from '@bsv/sdk'
 import { doubleSha256BE, sdk } from '../../index.client'
+import { ReqHistoryNote } from '../../sdk'
 
 /** Configuration options for the ARC broadcaster. */
 export interface ArcConfig {
@@ -135,6 +136,8 @@ export default class ARC {
     let txid = Utils.toHex(doubleSha256BE(Utils.toArray(rawTx, 'hex')))
     if (txids) {
       txid = txids.slice(-1)[0]
+    } else {
+      txids = [txid]
     }
 
     const requestOptions: HttpClientRequestOptions = {
@@ -145,17 +148,29 @@ export default class ARC {
 
     const r: sdk.PostTxResultForTxid = {
       txid,
-      status: 'success'
+      status: 'success',
+      notes: []
     }
 
+    const url = `${this.URL}/v1/tx`
+    const nn = () => ({ name: 'ARCv1tx', when: new Date().toISOString() })
+    const nne = () => ({ ...nn(), rawTx, txids: txids.join(','), url })
+
     try {
       const response = await this.httpClient.request<ArcResponse>(
-        `${this.URL}/v1/tx`,
+        url,
         requestOptions
       )
 
+      const { txid, extraInfo, txStatus, competingTxs } = response.data
+      const nnr = () => ({
+        txid,
+        extraInfo,
+        txStatus,
+        competingTxs: competingTxs?.join(',')
+      })
+
       if (response.ok) {
-        const { txid, extraInfo, txStatus, competingTxs } = response.data
         r.data = `${txStatus} ${extraInfo}`
         if (r.txid !== txid) r.data += ` txid altered from ${r.txid} to ${txid}`
         r.txid = txid
@@ -163,35 +178,59 @@ export default class ARC {
           r.status = 'error'
           r.doubleSpend = true
           r.competingTxs = competingTxs
+          r.notes!.push({ ...nne(), ...nnr(), what: 'postRawTxDoubleSpend' })
+        } else {
+          r.notes!.push({ ...nn(), ...nnr(), what: 'postRawTxSuccess' })
         }
+      } else if (typeof response === 'string') {
+        r.notes!.push({ ...nn(), what: 'postRawTxString', response })
       } else {
         r.status = 'error'
+        const n: ReqHistoryNote = {
+          ...nn(),
+          ...nne(),
+          ...nnr(),
+          what: 'postRawTxError'
+        }
         const ed: sdk.PostTxResultForTxidError = {}
         r.data = ed
         const st = typeof response.status
-        ed.status =
-          st === 'number' || st === 'string'
-            ? response.status.toString()
-            : 'ERR_UNKNOWN'
+        if (st === 'number' || st === 'string') {
+          n.status = response.status
+          ed.status = response.status.toString()
+        } else {
+          n.status = st
+          ed.status = 'ERR_UNKNOWN'
+        }
 
         let d = response.data
         if (d && typeof d === 'string') {
+          n.data = response.data.slice(0, 128)
           try {
             d = JSON.parse(d)
           } catch {
             // Intentionally left empty
           }
-        }
-        if (d && typeof d === 'object') {
+        } else if (d && typeof d === 'object') {
           ed.more = d
           ed.detail = d['detail']
           if (typeof ed.detail !== 'string') ed.detail = undefined
+          if (ed.detail) {
+            n.detail = ed.detail
+          }
         }
+        r.notes!.push(n)
       }
     } catch (eu: unknown) {
       const e = sdk.WalletError.fromUnknown(eu)
       r.status = 'error'
       r.data = `${e.code} ${e.message}`
+      r.notes!.push({
+        ...nne(),
+        what: 'postRawTxCatch',
+        code: e.code,
+        description: e.description
+      })
     }
 
     return r
@@ -208,38 +247,68 @@ export default class ARC {
    * @returns
    */
   async postBeef(beef: Beef, txids: string[]): Promise<sdk.PostBeefResult> {
+    const r: sdk.PostBeefResult = {
+      name: 'ARC',
+      status: 'success',
+      txidResults: [],
+      notes: []
+    }
+
+    const nn = () => ({ name: 'ARCpostBeef', when: new Date().toISOString() })
+
     if (beef.version === BEEF_V2 && beef.txs.every(btx => !btx.isTxidOnly)) {
       beef.version = BEEF_V1
+      r.notes!.push({ ...nn(), what: 'postBeefV2ToV1' })
     }
 
     const beefHex = beef.toHex()
 
     const prtr = await this.postRawTx(beefHex, txids)
 
-    const r: sdk.PostBeefResult = {
-      name: 'ARC',
-      status: prtr.status,
-      txidResults: [prtr]
-    }
+    r.status = prtr.status
+    r.txidResults = [prtr]
 
+    // Since postRawTx only returns results for a single txid,
+    // replicate the basic results any additional txids.
+    // TODO: Temporary hack...
     for (const txid of txids) {
       if (prtr.txid === txid) continue
       const tr: sdk.PostTxResultForTxid = {
         txid,
-        status: 'success'
+        status: 'success',
+        notes: []
       }
+      // For the extra txids, go back to the service for confirmation...
       const dr = await this.getTxData(txid)
       if (dr.txid !== txid) {
         tr.status = 'error'
         tr.data = 'internal error'
+        tr.notes!.push({
+          ...nn(),
+          what: 'postBeefGetTxDataInternal',
+          txid,
+          returnedTxid: dr.txid
+        })
       } else if (
         dr.txStatus === 'SEEN_ON_NETWORK' ||
         dr.txStatus === 'STORED'
       ) {
         tr.data = dr.txStatus
+        tr.notes!.push({
+          ...nn(),
+          what: 'postBeefGetTxDataSuccess',
+          txid,
+          txStatus: dr.txStatus
+        })
       } else {
         tr.status = 'error'
         tr.data = dr
+        tr.notes!.push({
+          ...nn(),
+          what: 'postBeefGetTxDataError',
+          txid,
+          txStatus: dr.txStatus
+        })
       }
       r.txidResults.push(tr)
       if (r.status === 'success' && tr.status === 'error') r.status = 'error'

package/src/services/providers/WhatsOnChain.ts

@@ -2,12 +2,14 @@ import { Beef, HexString, Utils, WhatsOnChainConfig } from '@bsv/sdk'
 import {
   asArray,
   asString,
+  doubleSha256BE,
   sdk,
   validateScriptHash,
   wait
 } from '../../index.client'
 import { convertProofToMerklePath } from '../../utility/tscProofToMerklePath'
 import SdkWhatsOnChain from './SdkWhatsOnChain'
+import { ReqHistoryNote } from '../../sdk'
 
 /**
  *
@@ -116,17 +118,16 @@ export class WhatsOnChain extends SdkWhatsOnChain {
     const r: sdk.PostBeefResult = {
       name: 'WoC',
       status: 'success',
-      txidResults: []
+      txidResults: [],
+      notes: []
     }
 
     let delay = false
 
-    for (const txid of txids) {
-      const tr: sdk.PostTxResultForTxid = {
-        txid,
-        status: 'success'
-      }
+    const nn = () => ({ name: 'WoCpostBeef', when: new Date().toISOString() })
+    const nne = () => ({ ...nn(), beef: beef.toHex(), txids: txids.join(',') })
 
+    for (const txid of txids) {
       const rawTx = Utils.toHex(beef.findTxid(txid)!.rawTx!)
 
       if (delay) {
@@ -135,19 +136,21 @@ export class WhatsOnChain extends SdkWhatsOnChain {
       }
       delay = true
 
-      try {
-        const wocTxid = await this.postRawTx(rawTx)
-        if (txid !== wocTxid) {
-          tr.status = 'error'
-          tr.data = `woc returned txid ${wocTxid}, expected ${txid}`
-        }
-      } catch (eu: unknown) {
-        const e = sdk.WalletError.fromUnknown(eu)
-        tr.status = 'error'
-        tr.data = `exception ${e.code} ${e.message}`
+      const tr = await this.postRawTx(rawTx)
+      if (txid !== tr.txid) {
+        throw new sdk.WERR_INTERNAL(
+          `woc returned txid ${tr.txid}, expected ${txid}`
+        )
       }
 
       r.txidResults.push(tr)
+      if (r.status === 'success' && tr.status !== 'success') r.status = 'error'
+    }
+
+    if (r.status === 'success') {
+      r.notes!.push({ ...nn(), what: 'postBeefSuccess' })
+    } else {
+      r.notes!.push({ ...nne(), what: 'postBeefError' })
     }
 
     return r
@@ -157,7 +160,15 @@ export class WhatsOnChain extends SdkWhatsOnChain {
    * @param rawTx raw transaction to broadcast as hex string
    * @returns txid returned by transaction processor of transaction broadcast
    */
-  async postRawTx(rawTx: HexString): Promise<string> {
+  async postRawTx(rawTx: HexString): Promise<sdk.PostTxResultForTxid> {
+    let txid = Utils.toHex(doubleSha256BE(Utils.toArray(rawTx, 'hex')))
+
+    const r: sdk.PostTxResultForTxid = {
+      txid,
+      status: 'success',
+      notes: []
+    }
+
     const headers = this.getHttpHeaders()
     headers['Content-Type'] = 'application/json'
     headers['Accept'] = 'text/plain'
@@ -168,41 +179,71 @@ export class WhatsOnChain extends SdkWhatsOnChain {
       data: { txhex: rawTx }
     }
 
-    for (let retry = 0; retry < 2; retry++) {
+    const url = `${this.URL}/tx/raw`
+    const nn = () => ({ name: 'WoCpostRawTx', when: new Date().toISOString() })
+    const nne = () => ({ ...nn(), rawTx, txid, url })
+
+    const retryLimit = 5
+    for (let retry = 0; retry < retryLimit; retry++) {
       try {
         const response = await this.httpClient.request<string>(
-          `${this.URL}/tx/raw`,
+          url,
           requestOptions
         )
         if (response.statusText === 'Too Many Requests' && retry < 2) {
+          r.notes!.push({ ...nn(), what: 'postRawTxRateLimit' })
           await wait(2000)
           continue
         }
         if (response.ok) {
           const txid = response.data
-          return txid
+          r.notes!.push({ ...nn(), what: 'postRawTxRateSuccess' })
+          return r
         } else {
-          if (typeof response.data === 'string')
-            throw new sdk.WERR_INVALID_PARAMETER(
-              'rawTx',
-              `valid. ${response.data}`
-            )
-          else
-            throw new sdk.WERR_INVALID_PARAMETER(
-              'rawTx',
-              `valid. ${response.status} ${response.statusText}`
-            )
+          r.status = 'error'
+          const n: ReqHistoryNote = {
+            ...nn(),
+            ...nne(),
+            what: 'postRawTxError'
+          }
+          if (typeof response.data === 'string') {
+            n.data = response.data.slice(0, 128)
+            r.data = response.data
+          }
+          if (typeof response.statusText === 'string') {
+            n.statusText = response.data.slice(0, 128)
+            r.data = `${r.data || ''} ${response.statusText}`
+          }
+          if (
+            typeof response.status === 'string' ||
+            typeof response.status === 'number'
+          ) {
+            n.status = response.data.slice(0, 128)
+            r.data = `${r.data || ''} ${response.status}`
+          }
+          r.notes!.push(n)
         }
       } catch (eu: unknown) {
-        if (eu instanceof sdk.WERR_INVALID_PARAMETER) throw eu
+        r.status = 'error'
         const e = sdk.WalletError.fromUnknown(eu)
-        throw new sdk.WERR_INVALID_PARAMETER(
-          'rawTx',
-          `valid rawTx. error ${e.code} ${e.message} ${rawTx}`
-        )
+        r.notes!.push({
+          ...nn(),
+          ...nne(),
+          what: 'postRawTxCatch',
+          code: e.code,
+          description: e.description
+        })
+        r.data = `${e.code} ${e.description}`
       }
     }
-    throw new sdk.WERR_INTERNAL()
+    r.status = 'error'
+    r.notes!.push({
+      ...nn(),
+      ...nne(),
+      what: 'postRawTxRetryLimit',
+      retryLimit
+    })
+    return r
   }
 
   /**
@@ -213,7 +254,7 @@ export class WhatsOnChain extends SdkWhatsOnChain {
     txid: string,
     services: sdk.WalletServices
   ): Promise<sdk.GetMerklePathResult> {
-    const r: sdk.GetMerklePathResult = { name: 'WoCTsc' }
+    const r: sdk.GetMerklePathResult = { name: 'WoCTsc', notes: [] }
 
     const headers = this.getHttpHeaders()
     const requestOptions = {
@@ -227,25 +268,51 @@ export class WhatsOnChain extends SdkWhatsOnChain {
           WhatsOnChainTscProof | WhatsOnChainTscProof[]
         >(`${this.URL}/tx/${txid}/proof/tsc`, requestOptions)
         if (response.statusText === 'Too Many Requests' && retry < 2) {
+          r.notes!.push({
+            what: 'getMerklePathRetry',
+            name: r.name,
+            status: response.status,
+            statusText: response.statusText
+          })
           await wait(2000)
           continue
         }
 
-        if (response.status === 404 && response.statusText === 'Not Found')
+        if (response.status === 404 && response.statusText === 'Not Found') {
+          r.notes!.push({
+            what: 'getMerklePathNotFound',
+            name: r.name,
+            status: response.status,
+            statusText: response.statusText
+          })
           return r
+        }
 
         if (
           !response.ok ||
           response.status !== 200 ||
           response.statusText !== 'OK'
-        )
+        ) {
+          r.notes!.push({
+            what: 'getMerklePathBadStatus',
+            name: r.name,
+            status: response.status,
+            statusText: response.statusText
+          })
           throw new sdk.WERR_INVALID_PARAMETER(
             'txid',
             `valid transaction. '${txid}' response ${response.statusText}`
           )
+        }
 
         if (!response.data) {
           // Unmined, proof not yet available.
+          r.notes!.push({
+            what: 'getMerklePathNoData',
+            name: r.name,
+            status: response.status,
+            statusText: response.statusText
+          })
           return r
         }
 
@@ -263,17 +330,38 @@ export class WhatsOnChain extends SdkWhatsOnChain {
           }
           r.merklePath = convertProofToMerklePath(txid, proof)
           r.header = header
+          r.notes!.push({
+            what: 'getMerklePathSuccess',
+            name: r.name,
+            status: response.status,
+            statusText: response.statusText
+          })
         } else {
+          r.notes!.push({
+            what: 'getMerklePathNoHeader',
+            target: p.target,
+            name: r.name,
+            status: response.status,
+            statusText: response.statusText
+          })
           throw new sdk.WERR_INVALID_PARAMETER(
             'blockhash',
             'a valid on-chain block hash'
           )
         }
-      } catch (err: unknown) {
-        r.error = sdk.WalletError.fromUnknown(err)
+      } catch (eu: unknown) {
+        const e = sdk.WalletError.fromUnknown(eu)
+        r.notes!.push({
+          what: 'getMerklePathError',
+          name: r.name,
+          code: e.code,
+          description: e.description
+        })
+        r.error = e
       }
       return r
     }
+    r.notes!.push({ what: 'getMerklePathInternal', name: r.name })
     throw new sdk.WERR_INTERNAL()
   }
 

package/src/services/providers/__tests/WhatsOnChain.test.ts

@@ -49,14 +49,14 @@ describe('whatsonchain tests', () => {
       )
       const s = JSON.stringify(r)
       expect(s).toBe(
-        '{"name":"WoCTsc","merklePath":{"blockHeight":1661398,"path":[[{"offset":6,"hash":"7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b","txid":true},{"offset":7,"hash":"97dd9d9080394d52338588732d9f84e1debca93f171f674ac3beac1e75495568"}],[{"offset":2,"hash":"81beedcd219d9e03255bde2ee479db34b9fed04d30373ba8bc264a64af2515b9"}],[{"offset":0,"hash":"9965f9aaeea33f6878335e6f7e6bdb544c3a8550c84e2f0daca54e9cd912111c"}]]},"header":{"version":536870912,"previousHash":"000000000688340a14b77e49bb0fca5ac7b624f7f79a5517583d1aae61c4e658","merkleRoot":"edbc07082ca0a31d5ec89d1f503a9cd41112c0d8f3221a96acfb8a9d16f8e82b","time":1739624725,"bits":486604799,"nonce":1437884974,"height":1661398,"hash":"00000000d8a73bf9a37272a71886ea92a25376bed1c1916f2b5cfbec4d6f6a25"}}'
+        "{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathSuccess\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}],\"merklePath\":{\"blockHeight\":1661398,\"path\":[[{\"offset\":6,\"hash\":\"7e5b797b86abd31a654bf296900d6cb14d04ef0811568ff4675494af2d92166b\",\"txid\":true},{\"offset\":7,\"hash\":\"97dd9d9080394d52338588732d9f84e1debca93f171f674ac3beac1e75495568\"}],[{\"offset\":2,\"hash\":\"81beedcd219d9e03255bde2ee479db34b9fed04d30373ba8bc264a64af2515b9\"}],[{\"offset\":0,\"hash\":\"9965f9aaeea33f6878335e6f7e6bdb544c3a8550c84e2f0daca54e9cd912111c\"}]]},\"header\":{\"version\":536870912,\"previousHash\":\"000000000688340a14b77e49bb0fca5ac7b624f7f79a5517583d1aae61c4e658\",\"merkleRoot\":\"edbc07082ca0a31d5ec89d1f503a9cd41112c0d8f3221a96acfb8a9d16f8e82b\",\"time\":1739624725,\"bits\":486604799,\"nonce\":1437884974,\"height\":1661398,\"hash\":\"00000000d8a73bf9a37272a71886ea92a25376bed1c1916f2b5cfbec4d6f6a25\"}}"
       )
     }
 
     {
       const r = await wocTest.getMerklePath('1'.repeat(64), services)
       const s = JSON.stringify(r)
-      expect(s).toBe('{"name":"WoCTsc"}')
+      expect(s).toBe("{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathNoData\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}]}")
     }
   })
 
@@ -69,14 +69,13 @@ describe('whatsonchain tests', () => {
       )
       const s = JSON.stringify(r)
       expect(s).toBe(
-        '{"name":"WoCTsc","merklePath":{"blockHeight":883637,"path":[[{"offset":46,"hash":"d9978ffc6676523208f7b33bebf1b176388bbeace2c7ef67ce35c2eababa1805","txid":true},{"offset":47,"hash":"066f6fa6fa988f2e3a9d6fe35fa0d3666c652dac35cabaeebff3738a4e67f68f"}],[{"offset":22,"hash":"232089a6f77c566151bc4701fda394b5cc5bf17073140d46a73c4c3ed0a7b911"}],[{"offset":10,"hash":"c639b3a6ce127f67dbd01c7331a6fca62a4b429830387bd68ac6ac05e162116d"}],[{"offset":4,"hash":"730cec44be97881530947d782bb328d25f1122fdae206296937fffb03e936d48"}],[{"offset":3,"hash":"28b681f8ab8db0fa4d5d20cb1532b95184a155346b0b8447bde580b2406d51e6"}],[{"offset":0,"hash":"c49a18028e230dd1439b26794c08c339506f24a450f067c4facd4e0d5a346490"}],[{"offset":1,"hash":"0ba57d1b1fad6874de3640c01088e3dedad3507e5b3a3102b9a8a8055f3df88b"}],[{"offset":1,"hash":"c830edebe5565c19ba584ec73d49129344d17539f322509b7c314ae641c2fcdb"}],[{"offset":1,"hash":"ff62d5ed2a94eb93a2b7d084b8f15b12083573896b6a58cf871507e3352c75f5"}]]},"header":{"version":1040187392,"previousHash":"00000000000000000d9f6889dd6743500adee204ea25d8a57225ecd48b111769","merkleRoot":"59c1efd79fae0d9c29dd8da63f8eeec0aadde048f4491c6bfa324fcfd537156d","time":1739329877,"bits":403818359,"nonce":596827153,"height":883637,"hash":"0000000000000000060ac8d63b78d41f58c9aba0b09f81db7d51fa4905a47263"}}'
-      )
+        "{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathSuccess\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}],\"merklePath\":{\"blockHeight\":883637,\"path\":[[{\"offset\":46,\"hash\":\"d9978ffc6676523208f7b33bebf1b176388bbeace2c7ef67ce35c2eababa1805\",\"txid\":true},{\"offset\":47,\"hash\":\"066f6fa6fa988f2e3a9d6fe35fa0d3666c652dac35cabaeebff3738a4e67f68f\"}],[{\"offset\":22,\"hash\":\"232089a6f77c566151bc4701fda394b5cc5bf17073140d46a73c4c3ed0a7b911\"}],[{\"offset\":10,\"hash\":\"c639b3a6ce127f67dbd01c7331a6fca62a4b429830387bd68ac6ac05e162116d\"}],[{\"offset\":4,\"hash\":\"730cec44be97881530947d782bb328d25f1122fdae206296937fffb03e936d48\"}],[{\"offset\":3,\"hash\":\"28b681f8ab8db0fa4d5d20cb1532b95184a155346b0b8447bde580b2406d51e6\"}],[{\"offset\":0,\"hash\":\"c49a18028e230dd1439b26794c08c339506f24a450f067c4facd4e0d5a346490\"}],[{\"offset\":1,\"hash\":\"0ba57d1b1fad6874de3640c01088e3dedad3507e5b3a3102b9a8a8055f3df88b\"}],[{\"offset\":1,\"hash\":\"c830edebe5565c19ba584ec73d49129344d17539f322509b7c314ae641c2fcdb\"}],[{\"offset\":1,\"hash\":\"ff62d5ed2a94eb93a2b7d084b8f15b12083573896b6a58cf871507e3352c75f5\"}]]},\"header\":{\"version\":1040187392,\"previousHash\":\"00000000000000000d9f6889dd6743500adee204ea25d8a57225ecd48b111769\",\"merkleRoot\":\"59c1efd79fae0d9c29dd8da63f8eeec0aadde048f4491c6bfa324fcfd537156d\",\"time\":1739329877,\"bits\":403818359,\"nonce\":596827153,\"height\":883637,\"hash\":\"0000000000000000060ac8d63b78d41f58c9aba0b09f81db7d51fa4905a47263\"}}"      )
     }
 
     {
       const r = await wocMain.getMerklePath('1'.repeat(64), services)
       const s = JSON.stringify(r)
-      expect(s).toBe('{"name":"WoCTsc"}')
+      expect(s).toBe("{\"name\":\"WoCTsc\",\"notes\":[{\"what\":\"getMerklePathNoData\",\"name\":\"WoCTsc\",\"status\":200,\"statusText\":\"OK\"}]}")
     }
   })