@bsv/sdk 2.0.10 → 2.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/sdk",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "type": "module",
   "description": "BSV Blockchain Software Development Kit",
   "main": "dist/cjs/mod.js",

package/src/auth/utils/__tests/validateCertificates.test.ts

@@ -1,7 +1,8 @@
 import { validateCertificates } from '../../../auth/utils/validateCertificates'
 import { VerifiableCertificate } from '../../../auth/certificates/VerifiableCertificate'
-import { ProtoWallet } from '../../../wallet/index'
+import { ProtoWallet, WalletInterface } from '../../../wallet/index'
 import { PrivateKey } from '../../../primitives/index'
+import { AuthMessage } from '../../../auth/types'
 
 let mockVerify = jest.fn(async () => await Promise.resolve(true))
 let mockDecryptFields = jest.fn(
@@ -40,8 +41,8 @@ jest.mock('../../../auth/certificates/VerifiableCertificate', () => {
 })
 
 describe('validateCertificates', () => {
-  let verifierWallet
-  let message
+  let verifierWallet: WalletInterface
+  let message: AuthMessage
 
   beforeEach(() => {
     jest.clearAllMocks()
@@ -53,8 +54,10 @@ describe('validateCertificates', () => {
       async () => await Promise.resolve({ field1: 'decryptedValue1' })
     )
 
-    verifierWallet = new ProtoWallet(new PrivateKey(1))
+    verifierWallet = new ProtoWallet(new PrivateKey(1)) as unknown as WalletInterface
     message = {
+      version: '1.0',
+      messageType: 'certificateResponse',
       identityKey: 'valid_subject',
       certificates: [
         {
@@ -65,7 +68,7 @@ describe('validateCertificates', () => {
           revocationOutpoint: 'outpoint',
           fields: { field1: 'encryptedData1' },
           decryptedFields: {}
-        }
+        } as any
       ]
     }
   })
@@ -76,9 +79,9 @@ describe('validateCertificates', () => {
     ).resolves.not.toThrow()
 
     expect(VerifiableCertificate).toHaveBeenCalledTimes(
-      message.certificates.length
+      message.certificates!.length
     )
-    expect(mockVerify).toHaveBeenCalledTimes(message.certificates.length)
+    expect(mockVerify).toHaveBeenCalledTimes(message.certificates!.length)
     expect(mockDecryptFields).toHaveBeenCalledWith(verifierWallet, undefined, undefined, undefined)
   })
 
@@ -147,9 +150,9 @@ describe('validateCertificates', () => {
       revocationOutpoint: 'outpoint',
       fields: { field1: 'encryptedData1' },
       decryptedFields: {}
-    }
+    } as any
 
-    message.certificates.push(anotherCertificate)
+    message.certificates!.push(anotherCertificate)
 
     await expect(
       validateCertificates(verifierWallet, message)

package/src/kvstore/__tests/LocalKVStore.test.ts

@@ -6,13 +6,11 @@ import * as Utils from '../../primitives/utils.js'
 import {
   WalletInterface,
   ListOutputsResult,
-  WalletDecryptResult,
   WalletEncryptResult,
   CreateActionResult,
   SignActionResult
 } from '../../wallet/Wallet.interfaces.js'
 import Transaction from '../../transaction/Transaction.js'
-import { Beef } from '../../transaction/Beef.js'
 import { mock } from 'node:test'
 
 // --- Constants for Mock Values ---
@@ -303,7 +301,7 @@ describe('localKVStore', () => {
       const existingOutput = { outpoint: existingOutpoint, txid: 'oldTxId', vout: 0, lockingScript: 'oldScriptHex' } // Added script
       const mockBEEF = [1, 2, 3, 4, 5, 6]
       const signableRef = 'signableTxRef123'
-      const signableTx = []
+      const signableTx: any[] = []
       const updatedTxId = 'updatedTxId'
 
       const valueArray = Array.from(testRawValueBuffer)
@@ -397,7 +395,7 @@ describe('localKVStore', () => {
       const existingOutput2 = { outpoint: existingOutpoint2, txid: 'oldTxId2', vout: 1, lockingScript: 's2' }
       const mockBEEF = [1, 2, 3, 4, 5, 6]
       const signableRef = 'signableTxRefMulti'
-      const signableTx = []
+      const signableTx: any[] = []
       const updatedTxId = 'updatedTxIdMulti'
       const mockTxObject = {} // Dummy TX object
 
@@ -564,7 +562,7 @@ describe('localKVStore', () => {
       const existingOutput2 = { outpoint: existingOutpoint2, txid: 'removeTxId2', vout: 1, lockingScript: 's2' }
       const mockBEEF = Buffer.from('mockBEEFRemove')
       const signableRef = 'signableTxRefRemove'
-      const signableTx = []
+      const signableTx: any[] = []
       const removalTxId = 'removalTxId'
       const mockTxObject = {}
 
@@ -628,7 +626,7 @@ describe('localKVStore', () => {
       const existingOutput1 = { outpoint: existingOutpoint1, txid: 'failRemoveTxId1', vout: 0, lockingScript: 's1' }
       const mockBEEF = Buffer.from('mockBEEFFailRemove')
       const signableRef = 'signableTxRefFailRemove'
-      const signableTx = []
+      const signableTx: any[] = []
       const mockTxObject = {}
 
       mockWallet.listOutputs.mockResolvedValue({ outputs: [existingOutput1], totalOutputs: 1, BEEF: mockBEEF } as any)

package/src/overlay-tools/HostReputationTracker.ts

@@ -67,12 +67,14 @@ export class HostReputationTracker {
     const now = Date.now()
     entry.totalFailures += 1
     entry.consecutiveFailures += 1
-    const msg =
-      typeof reason === 'string'
-        ? reason
-        : reason instanceof Error
-          ? reason.message
-          : undefined
+    let msg: string | undefined
+    if (typeof reason === 'string') {
+      msg = reason
+    } else if (reason instanceof Error) {
+      msg = reason.message
+    } else {
+      msg = undefined
+    }
     const immediate =
       typeof msg === 'string' &&
       (msg.includes('ERR_NAME_NOT_RESOLVED') ||
@@ -93,12 +95,13 @@ export class HostReputationTracker {
       entry.backoffUntil = now + backoffDuration
     }
     entry.lastUpdatedAt = now
-    entry.lastError =
-      typeof reason === 'string'
-        ? reason
-        : reason instanceof Error
-          ? reason.message
-          : undefined
+    if (typeof reason === 'string') {
+      entry.lastError = reason
+    } else if (reason instanceof Error) {
+      entry.lastError = reason.message
+    } else {
+      entry.lastError = undefined
+    }
     this.saveToStorage()
   }
 
@@ -133,13 +136,13 @@ export class HostReputationTracker {
 
   snapshot (host: string): HostReputationEntry | undefined {
     const entry = this.stats.get(host)
-    return entry != null ? { ...entry } : undefined
+    return entry == null ? undefined : { ...entry }
   }
 
   private getStorage (): any {
     try {
       const g: any = typeof globalThis === 'object' ? globalThis : undefined
-      if (g == null || g.localStorage == null) return undefined
+      if (g?.localStorage == null) return undefined
       return g.localStorage
     } catch {
       return undefined

package/src/primitives/PrivateKey.ts

@@ -55,7 +55,7 @@ export class KeyShares {
       const [x, y, t, i] = shareParts
       if (t === undefined) throw new Error('Threshold not found in share ' + idx.toString())
       if (i === undefined) throw new Error('Integrity not found in share ' + idx.toString())
-      const tInt = parseInt(t)
+      const tInt = Number.parseInt(t, 10)
       if (idx !== 0 && threshold !== tInt) { throw new Error('Threshold mismatch in share ' + idx.toString()) }
       if (idx !== 0 && integrity !== i) { throw new Error('Integrity mismatch in share ' + idx.toString()) }
       threshold = tInt
@@ -399,7 +399,7 @@ export default class PrivateKey extends BigNumber {
     let sharedSecret: Point
     if (typeof retrieveCachedSharedSecret === 'function') {
       const retrieved = retrieveCachedSharedSecret(this, publicKey)
-      if (typeof retrieved !== 'undefined') {
+      if (retrieved !== undefined) {
         sharedSecret = retrieved
       } else {
         sharedSecret = this.deriveSharedSecret(publicKey)
@@ -429,7 +429,7 @@ export default class PrivateKey extends BigNumber {
    * const shares = key.toKeyShares(2, 5)
    */
   toKeyShares (threshold: number, totalShares: number): KeyShares {
-    if (typeof threshold !== 'number' || typeof totalShares !== 'number') { throw new Error('threshold and totalShares must be numbers') }
+    if (typeof threshold !== 'number' || typeof totalShares !== 'number') { throw new TypeError('threshold and totalShares must be numbers') }
     if (threshold < 2) throw new Error('threshold must be at least 2')
     if (totalShares < 2) throw new Error('totalShares must be at least 2')
     if (threshold > totalShares) { throw new Error('threshold should be less than or equal to totalShares') }

package/src/script/Spend.ts

@@ -266,7 +266,11 @@ export default class Spend {
     if (this.stack.length === 0) {
       this.scriptEvaluationError('Attempted to pop from an empty stack.')
     }
-    const item = this.stack.pop() as number[]
+    const item = this.stack.pop()
+    if (item === undefined) {
+      this.scriptEvaluationError('Attempted to pop from an empty stack.')
+      return [] // unreachable; scriptEvaluationError always throws
+    }
     this.stackMem -= item.length
     return item
   }
@@ -290,7 +294,11 @@ export default class Spend {
     if (this.altStack.length === 0) {
       this.scriptEvaluationError('Attempted to pop from an empty alt stack.')
     }
-    const item = this.altStack.pop() as number[]
+    const item = this.altStack.pop()
+    if (item === undefined) {
+      this.scriptEvaluationError('Attempted to pop from an empty alt stack.')
+      return [] // unreachable; scriptEvaluationError always throws
+    }
     this.altStackMem -= item.length
     return item
   }
@@ -308,7 +316,7 @@ export default class Spend {
         this.scriptEvaluationError('The signature must have a low S value.')
         return false
       }
-    } catch (e) {
+    } catch {
       this.scriptEvaluationError('The signature format is invalid.')
       return false
     }
@@ -340,7 +348,7 @@ export default class Spend {
     }
     try {
       PublicKey.fromDER(buf as number[]) // This can throw for stricter DER rules
-    } catch (e) {
+    } catch {
       this.scriptEvaluationError('The public key is in an unknown format.')
       return false
     }
@@ -395,7 +403,7 @@ export default class Spend {
     const operation = currentScript.chunks[this.programCounter]
 
     const currentOpcode = operation.op
-    if (typeof currentOpcode === 'undefined') {
+    if (currentOpcode === undefined) {
       this.scriptEvaluationError(`Missing opcode in ${this.context} at pc=${this.programCounter}.`) // Error thrown
     }
     if (Array.isArray(operation.data) && operation.data.length > maxScriptElementSize) {
@@ -547,7 +555,7 @@ export default class Spend {
           break
         case OP.OP_ELSE:
           if (this.ifStack.length === 0) this.scriptEvaluationError('OP_ELSE requires a preceeding OP_IF.')
-          this.ifStack[this.ifStack.length - 1] = !this.ifStack[this.ifStack.length - 1]
+          this.ifStack[this.ifStack.length - 1] = !(this.ifStack[this.ifStack.length - 1])
           break
         case OP.OP_ENDIF:
           if (this.ifStack.length === 0) this.scriptEvaluationError('OP_ENDIF requires a preceeding OP_IF.')
@@ -682,7 +690,7 @@ export default class Spend {
           // stack is [... rest, x1, x2]
           // We want [... rest, x2_copy, x1, x2]
           this.ensureStackMem(buf1.length)
-          this.stack.splice(this.stack.length - 2, 0, buf1.slice()) // Insert copy of x2 before x1
+          this.stack.splice(-2, 0, buf1.slice()) // Insert copy of x2 before x1
           this.stackMem += buf1.length // Account for the new copy
           break
         case OP.OP_SIZE:
@@ -769,7 +777,7 @@ export default class Spend {
             case OP.OP_NEGATE: bn = bn.neg(); break
             case OP.OP_ABS: if (bn.isNeg()) bn = bn.neg(); break
             case OP.OP_NOT: bn = new BigNumber(bn.cmpn(0) === 0 ? 1 : 0); break
-            case OP.OP_0NOTEQUAL: bn = new BigNumber(bn.cmpn(0) !== 0 ? 1 : 0); break
+            case OP.OP_0NOTEQUAL: bn = new BigNumber(bn.cmpn(0) === 0 ? 0 : 1); break
           }
           this.pushStack(bn.toScriptNum())
           break
@@ -812,7 +820,7 @@ export default class Spend {
             case OP.OP_BOOLOR: resultBnArithmetic = new BigNumber((bn1.cmpn(0) !== 0 || bn2.cmpn(0) !== 0) ? 1 : 0); break
             case OP.OP_NUMEQUAL: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) === 0 ? 1 : 0); break
             case OP.OP_NUMEQUALVERIFY: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) === 0 ? 1 : 0); break
-            case OP.OP_NUMNOTEQUAL: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) !== 0 ? 1 : 0); break
+            case OP.OP_NUMNOTEQUAL: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) === 0 ? 0 : 1); break
             case OP.OP_LESSTHAN: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) < 0 ? 1 : 0); break
             case OP.OP_GREATERTHAN: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) > 0 ? 1 : 0); break
             case OP.OP_LESSTHANOREQUAL: resultBnArithmetic = new BigNumber(bn1.cmp(bn2) <= 0 ? 1 : 0); break
@@ -875,7 +883,7 @@ export default class Spend {
 
               pubkey = PublicKey.fromDER(bufPubkey)
               fSuccess = this.verifySignature(sig, pubkey, subscript)
-            } catch (e) {
+            } catch {
               fSuccess = false
             }
           }
@@ -949,7 +957,7 @@ export default class Spend {
                 sig = TransactionSignature.fromChecksigFormat(bufSig)
                 pubkey = PublicKey.fromDER(bufPubkey)
                 fOk = this.verifySignature(sig, pubkey, subscript)
-              } catch (e) {
+              } catch {
                 fOk = false
               }
             }

package/src/storage/StorageDownloader.ts

@@ -35,9 +35,9 @@ export class StorageDownloader {
     }
     const decodedResults: string[] = []
     const currentTime = Math.floor(Date.now() / 1000)
-    for (let i = 0; i < response.outputs.length; i++) {
-      const tx = Transaction.fromBEEF(response.outputs[i].beef)
-      const { fields } = PushDrop.decode(tx.outputs[response.outputs[i].outputIndex].lockingScript)
+    for (const output of response.outputs) {
+      const tx = Transaction.fromBEEF(output.beef)
+      const { fields } = PushDrop.decode(tx.outputs[output.outputIndex].lockingScript)
 
       const expiryTime = new Utils.Reader(fields[3]).readVarIntNum()
       if (expiryTime < currentTime) {
@@ -66,10 +66,10 @@ export class StorageDownloader {
       throw new Error('No one currently hosts this file!')
     }
 
-    for (let i = 0; i < downloadURLs.length; i++) {
+    for (const url of downloadURLs) {
       try {
         // The url is fetched
-        const result = await fetch(downloadURLs[i], { method: 'GET' })
+        const result = await fetch(url, { method: 'GET' })
 
         // If the request fails, continue to the next url
         if (!result.ok || result.status >= 400 || result.body == null) {
@@ -105,7 +105,7 @@ export class StorageDownloader {
           data,
           mimeType: result.headers.get('Content-Type')
         }
-      } catch (error) {
+      } catch {
         continue
       }
     }

package/src/storage/StorageUtils.ts

@@ -68,7 +68,7 @@ export const isValidURL = (URL: string): boolean => {
   try {
     getHashFromURL(URL)
     return true
-  } catch (e) {
+  } catch {
     return false
   }
 }

package/src/transaction/MerklePath.ts

@@ -61,7 +61,7 @@ export default class MerklePath {
     const blockHeight = reader.readVarIntNum()
     const treeHeight = reader.readUInt8()
     // Explicitly define the type of path as an array of arrays of leaf objects
-    const path: Array<Array<{ offset: number, hash?: string, txid?: boolean, duplicate?: boolean }>> = Array(treeHeight)
+    const path: Array<Array<{ offset: number, hash?: string, txid?: boolean, duplicate?: boolean }>> = new Array(treeHeight)
       .fill(null)
       .map(() => [])
     let flags: number, offset: number, nLeavesAtThisHeight: number
@@ -76,7 +76,7 @@ export default class MerklePath {
           txid?: boolean
           duplicate?: boolean
         } = { offset }
-        if ((flags & 1) !== 0) {
+        if ((flags & 1) === 1) {
           leaf.duplicate = true
         } else {
           if ((flags & 2) !== 0) {
@@ -140,7 +140,7 @@ export default class MerklePath {
     this.path = path
 
     // store all of the legal offsets which we expect given the txid indices.
-    const legalOffsets = Array(this.path.length)
+    const legalOffsets = new Array(this.path.length)
       .fill(0)
       .map(() => new Set())
     this.path.forEach((leaves, height) => {
@@ -161,12 +161,10 @@ export default class MerklePath {
               legalOffsets[h].add((leaf.offset >> h) ^ 1)
             }
           }
-        } else {
-          if (legalOffsetsOnly && !legalOffsets[height].has(leaf.offset)) {
-            throw new Error(
-              `Invalid offset: ${leaf.offset}, at height: ${height}, with legal offsets: ${Array.from(legalOffsets[height]).join(', ')}`
-            )
-          }
+        } else if (legalOffsetsOnly && !legalOffsets[height].has(leaf.offset)) {
+          throw new Error(
+            `Invalid offset: ${leaf.offset}, at height: ${height}, with legal offsets: ${Array.from(legalOffsets[height]).join(', ')}`
+          )
         }
       })
     })
@@ -260,19 +258,16 @@ export default class MerklePath {
   computeRoot (txid?: string): string {
     if (typeof txid !== 'string') {
       const foundLeaf = this.path[0].find((leaf) => Boolean(leaf?.hash))
-      if (foundLeaf === null || foundLeaf === undefined) {
+      if (foundLeaf == null) {
         throw new Error('No valid leaf found in the Merkle Path')
       }
       txid = foundLeaf.hash
     }
     // Find the index of the txid at the lowest level of the Merkle tree
     if (typeof txid !== 'string') {
-      throw new Error('Transaction ID is undefined')
+      throw new TypeError('Transaction ID is undefined')
     }
     const index = this.indexOf(txid)
-    if (typeof index !== 'number') {
-      throw new Error(`This proof does not contain the txid: ${txid ?? 'undefined'}`)
-    }
     // Calculate the root using the index as a way to determine which direction to concatenate.
     const hash = (m: string): string =>
       toHex(hash256(toArray(m, 'hex').reverse()).reverse())
@@ -281,17 +276,26 @@ export default class MerklePath {
     // special case for blocks with only one transaction
     if (this.path.length === 1 && this.path[0].length === 1) return workingHash
 
-    for (let height = 0; height < this.path.length; height++) {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const leaves = this.path[height]
+    // Determine effective tree height. For a compound path where all txids are at level 0
+    // (path.length === 1 or intermediate levels are empty/trimmed), we need to compute up
+    // to the height implied by the highest offset present in path[0].
+    const maxOffset = this.path[0].reduce((max, l) => Math.max(max, l.offset), 0)
+    const treeHeight = Math.max(this.path.length, 32 - Math.clz32(maxOffset))
+
+    for (let height = 0; height < treeHeight; height++) {
       const offset = (index >> height) ^ 1
       const leaf = this.findOrComputeLeaf(height, offset)
       if (typeof leaf !== 'object') {
+        // For single-level paths (all txids at level 0), the sibling may be beyond the tree
+        // because this is the last odd node at this height. Bitcoin Merkle duplicates it.
+        if (this.path.length === 1 && (index >> height) === (maxOffset >> height)) {
+          workingHash = hash((workingHash ?? '') + (workingHash ?? ''))
+          continue
+        }
         throw new Error(`Missing hash for index ${index} at height ${height}`)
-      }
-      if (leaf.duplicate === true) {
+      } else if (leaf.duplicate === true) {
         workingHash = hash((workingHash ?? '') + (workingHash ?? ''))
-      } else if (offset % 2 !== 0) {
+      } else if (offset % 2 === 1) {
         workingHash = hash((leaf.hash ?? '') + (workingHash ?? ''))
       } else {
         workingHash = hash((workingHash ?? '') + (leaf.hash ?? ''))
@@ -315,9 +319,9 @@ export default class MerklePath {
     const hash = (m: string): string =>
       toHex(hash256(toArray(m, 'hex').reverse()).reverse())
 
-    let leaf: MerklePathLeaf | undefined = this.path[height].find(
-      (l) => l.offset === offset
-    )
+    let leaf: MerklePathLeaf | undefined = height < this.path.length
+      ? this.path[height].find((l) => l.offset === offset)
+      : undefined
 
     if (leaf != null) return leaf
 
@@ -330,7 +334,20 @@ export default class MerklePath {
     if (leaf0 == null || leaf0.hash == null || leaf0.hash === '') return undefined
 
     const leaf1 = this.findOrComputeLeaf(h, l + 1)
-    if (leaf1 == null) return undefined
+    if (leaf1?.hash == null) {
+      // Explicit duplicate marker — duplicate leaf0 regardless of path depth.
+      if (leaf1?.duplicate === true) {
+        return { offset, hash: hash(leaf0.hash + leaf0.hash) }
+      }
+      // For single-level paths, leaf0 may be the last odd node at height h — duplicate it.
+      if (this.path.length === 1) {
+        const maxOffset0 = this.path[0].reduce((max, lf) => Math.max(max, lf.offset), 0)
+        if (l === (maxOffset0 >> h)) {
+          return { offset, hash: hash(leaf0.hash + leaf0.hash) }
+        }
+      }
+      return undefined
+    }
 
     let workinghash: string
     if (leaf1.duplicate === true) {
@@ -388,26 +405,18 @@ export default class MerklePath {
     const combinedPath: Array<Array<{ offset: number, hash?: string, txid?: boolean, duplicate?: boolean }>> = []
     for (let h = 0; h < this.path.length; h++) {
       combinedPath.push([])
-      for (let l = 0; l < this.path[h].length; l++) {
-        combinedPath[h].push(this.path[h][l])
+      for (const leaf of this.path[h]) {
+        combinedPath[h].push(leaf)
       }
-      for (let l = 0; l < other.path[h].length; l++) {
-        if (
-          combinedPath[h].find(
-            (leaf) => leaf.offset === other.path[h][l].offset
-          ) === undefined
-        ) {
-          combinedPath[h].push(other.path[h][l])
-        } else {
+      for (const otherLeaf of other.path[h]) {
+        const existingLeaf = combinedPath[h].find(
+          (leaf) => leaf.offset === otherLeaf.offset
+        )
+        if (existingLeaf === undefined) {
+          combinedPath[h].push(otherLeaf)
+        } else if (otherLeaf?.txid !== undefined && otherLeaf?.txid !== null) {
           // Ensure that any elements which appear in both are not downgraded to a non txid.
-          if (other.path[h][l]?.txid !== undefined && other.path[h][l]?.txid !== null) {
-            const target = combinedPath[h].find(
-              (leaf) => leaf.offset === other.path[h][l].offset
-            )
-            if (target !== null && target !== undefined) {
-              target.txid = true
-            }
-          }
+          existingLeaf.txid = true
         }
       }
     }