@bsv/sdk 2.1.0 → 2.1.1

package/src/primitives/Point.ts

@@ -163,20 +163,17 @@ export const scalarMultiplyWNAF = (
 ): JacobianPointBI => {
   const key = `${window}:${P0.x.toString(16)}:${P0.y.toString(16)}`
   let tbl = WNAF_TABLE_CACHE.get(key)
-  let P: JacobianPointBI
   if (tbl === undefined) {
     // Convert affine to Jacobian and pre-compute odd multiples
     const tblSize = 1 << (window - 1) // e.g. w=5 → 16 entries
     tbl = new Array(tblSize)
-    P = { X: P0.x, Y: P0.y, Z: BI_ONE }
+    const P: JacobianPointBI = { X: P0.x, Y: P0.y, Z: BI_ONE }
     tbl[0] = P
     const twoP = jpDouble(P)
     for (let i = 1; i < tblSize; i++) {
       tbl[i] = jpAdd(tbl[i - 1], twoP)
     }
     WNAF_TABLE_CACHE.set(key, tbl)
-  } else {
-    P = tbl[0]
   }
 
   // Build wNAF representation of k
@@ -277,11 +274,11 @@ export default class Point extends BasePoint {
       bytes.length - 1 === 2 * len
     ) {
       if (bytes[0] === 0x06) {
-        if (bytes[bytes.length - 1] % 2 !== 0) {
+        if (bytes.at(-1) % 2 !== 0) {
           throw new Error('Point string value is wrong length')
         }
       } else if (bytes[0] === 0x07) {
-        if (bytes[bytes.length - 1] % 2 !== 1) {
+        if (bytes.at(-1) % 2 !== 1) {
           throw new Error('Point string value is wrong length')
         }
       }
@@ -523,10 +520,10 @@ export default class Point extends BasePoint {
     } else {
       res = [0x04].concat(x, this.getY().toArray('be', len))
     }
-    if (enc !== 'hex') {
-      return res
-    } else {
+    if (enc === 'hex') {
       return toHex(res)
+    } else {
+      return res
     }
   }
 
@@ -573,19 +570,19 @@ export default class Point extends BasePoint {
       typeof this.precomputed === 'object' && this.precomputed !== null
         ? {
             doubles:
-            this.precomputed.doubles != null
-              ? {
+            this.precomputed.doubles == null
+              ? undefined
+              : {
                   step: this.precomputed.doubles.step,
                   points: this.precomputed.doubles.points.slice(1)
-                }
-              : undefined,
+                },
             naf:
-            this.precomputed.naf != null
-              ? {
+            this.precomputed.naf == null
+              ? undefined
+              : {
                   wnd: this.precomputed.naf.wnd,
                   points: this.precomputed.naf.points.slice(1)
                 }
-              : undefined
           }
         : undefined
     ]
@@ -827,8 +824,8 @@ export default class Point extends BasePoint {
     let R1: JacobianPointBI = { X: Px, Y: Py, Z: 1n }
 
     const bits = kBig.toString(2)
-    for (let i = 0; i < bits.length; i++) {
-      const bit = bits[i] === '1' ? 1n : 0n
+    for (const bitChar of bits) {
+      const bit = bitChar === '1' ? 1n : 0n
       ctSwap(bit, R0, R1)
       R1 = jpAdd(R0, R1)
       R0 = jpDouble(R0)
@@ -927,18 +924,18 @@ export default class Point extends BasePoint {
       const pre = this.precomputed
       const negate = (p: Point): Point => p.neg()
       res.precomputed = {
-        naf: pre.naf != null
-          ? {
+        naf: pre.naf == null
+          ? undefined
+          : {
               wnd: pre.naf.wnd,
               points: pre.naf.points.map(negate) as BasePoint[]
-            }
-          : undefined,
-        doubles: pre.doubles != null
-          ? {
+            },
+        doubles: pre.doubles == null
+          ? undefined
+          : {
               step: pre.doubles.step,
               points: pre.doubles.points.map((p) => (p as Point).neg())
-            }
-          : undefined,
+            },
         beta: undefined
       }
     }
@@ -1019,19 +1016,19 @@ export default class Point extends BasePoint {
       beta.precomputed = {
         beta: null,
         naf:
-          pre.naf != null
-            ? {
+          pre.naf == null
+            ? undefined
+            : {
                 wnd: pre.naf.wnd,
                 points: pre.naf.points.map(endoMul)
-              }
-            : undefined,
+              },
         doubles:
-          pre.doubles != null
-            ? {
+          pre.doubles == null
+            ? undefined
+            : {
                 step: pre.doubles.step,
                 points: pre.doubles.points.map(endoMul)
               }
-            : undefined
       }
     }
     return beta
@@ -1142,8 +1139,8 @@ export default class Point extends BasePoint {
       naf[a] = new Array(max)
       naf[b] = new Array(max)
       for (let j = 0; j < max; j++) {
-        const ja = jsf[0][j] | 0
-        const jb = jsf[1][j] | 0
+        const ja = Math.trunc(jsf[0][j])
+        const jb = Math.trunc(jsf[1][j])
 
         naf[a][j] = index[(ja + 1) * 3 + (jb + 1)]
         naf[b][j] = 0
@@ -1187,10 +1184,10 @@ export default class Point extends BasePoint {
 
         if (z.cmpn(0) === 0) { // Check if z is 0
           continue
-        } else if (!z.isNeg()) { // If z is positive
-          p = wnd[j][z.sub(one).div(two).toNumber()]
-        } else { // If z is negative
+        } else if (z.isNeg()) { // If z is negative
           p = wnd[j][z.neg().sub(one).div(two).toNumber()].neg()
+        } else { // If z is positive
+          p = wnd[j][z.sub(one).div(two).toNumber()]
         }
 
         if (p.type === 'affine') {

package/src/primitives/PrivateKey.ts

@@ -399,13 +399,13 @@ export default class PrivateKey extends BigNumber {
     let sharedSecret: Point
     if (typeof retrieveCachedSharedSecret === 'function') {
       const retrieved = retrieveCachedSharedSecret(this, publicKey)
-      if (retrieved !== undefined) {
-        sharedSecret = retrieved
-      } else {
+      if (retrieved === undefined) {
         sharedSecret = this.deriveSharedSecret(publicKey)
         if (typeof cacheSharedSecret === 'function') {
           cacheSharedSecret(this, publicKey, sharedSecret)
         }
+      } else {
+        sharedSecret = retrieved
       }
     } else {
       sharedSecret = this.deriveSharedSecret(publicKey)

package/src/primitives/PublicKey.ts

@@ -215,13 +215,13 @@ export default class PublicKey extends Point {
     let sharedSecret: Point
     if (typeof retrieveCachedSharedSecret === 'function') {
       const retrieved = retrieveCachedSharedSecret(privateKey, this)
-      if (typeof retrieved !== 'undefined') {
-        sharedSecret = retrieved
-      } else {
+      if (retrieved === undefined) {
         sharedSecret = this.deriveSharedSecret(privateKey)
         if (typeof cacheSharedSecret === 'function') {
           cacheSharedSecret(privateKey, this, sharedSecret)
         }
+      } else {
+        sharedSecret = retrieved
       }
     } else {
       sharedSecret = this.deriveSharedSecret(privateKey)

package/src/primitives/Random.ts

@@ -31,7 +31,6 @@ class Rand {
     // Try globalThis.crypto (works in Node.js 18+, modern browsers, and Deno)
     if (typeof globalThis !== 'undefined' && typeof (globalThis as any).crypto?.getRandomValues === 'function') {
       this._rand = (n) => {
-        /* eslint-disable-next-line */
         return this.getRandomValues(globalThis as any, n)
       }
       return
@@ -41,32 +40,30 @@ class Rand {
     if (typeof process !== 'undefined' && process.release?.name === 'node') {
       try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const crypto = require('crypto')
+        const crypto = require('node:crypto')
         if (typeof crypto.randomBytes === 'function') {
           this._rand = (n) => {
             return Array.from(crypto.randomBytes(n))
           }
           return
         }
-      } catch (e) {
-        // crypto module not available, continue to other checks
+      } catch (_cryptoModuleUnavailable) {
+        // node:crypto not available in this runtime; continue to other crypto API checks
       }
     }
 
     // Try self.crypto (Web Workers and Service Workers)
-    if (typeof self !== 'undefined' && typeof self.crypto?.getRandomValues === 'function') {
+    if (typeof globalThis.self !== 'undefined' && typeof globalThis.self.crypto?.getRandomValues === 'function') {
       this._rand = (n) => {
-        /* eslint-disable-next-line */
-        return this.getRandomValues(self as any, n)
+        return this.getRandomValues(globalThis.self, n)
       }
       return
     }
 
     // Try window.crypto (browsers)
-    if (typeof window !== 'undefined' && typeof (window as any).crypto?.getRandomValues === 'function') {
+    if (typeof globalThis.window !== 'undefined' && typeof (globalThis.window as any).crypto?.getRandomValues === 'function') {
       this._rand = (n) => {
-        /* eslint-disable-next-line */
-        return this.getRandomValues(window as any, n)
+        return this.getRandomValues(globalThis.window, n)
       }
       return
     }
@@ -93,9 +90,9 @@ let ayn: Rand | null = null
  * import Random from '@bsv/sdk/primitives/Random'
  * const bytes = Random(32) // Produces 32 random bytes
  */
-export default (len: number): number[] => {
-  if (ayn == null) {
-    ayn = new Rand()
-  }
+const Random = (len: number): number[] => {
+  ayn ??= new Rand()
   return ayn.generate(len)
 }
+
+export default Random

package/src/primitives/ReaderUint8Array.ts

@@ -25,7 +25,7 @@ export class ReaderUint8Array {
     } else if (Array.isArray(bin)) {
       this.bin = new Uint8Array(bin)
     } else {
-      throw new Error('ReaderUint8Array constructor: bin must be Uint8Array or number[]')
+      throw new TypeError('ReaderUint8Array constructor: bin must be Uint8Array or number[]')
     }
     this.pos = pos
     this.length = this.bin.length
@@ -61,7 +61,7 @@ export class ReaderUint8Array {
     const val = this.bin[this.pos]
     this.pos += 1
     // If the sign bit is set, convert to negative value
-    return (val & 0x80) !== 0 ? val - 0x100 : val
+    return (val & 0x80) === 0 ? val : val - 0x100
   }
 
   public readUInt16BE (): number {
@@ -73,10 +73,10 @@ export class ReaderUint8Array {
   public readInt16BE (): number {
     const val = this.readUInt16BE()
     // If the sign bit is set, convert to negative value
-    return (val & 0x8000) !== 0 ? val - 0x10000 : val
+    return (val & 0x8000) === 0 ? val : val - 0x10000
   }
 
-  public readUInt16LE (): number {
+  public readUInt16LE(): number {
     const val = this.bin[this.pos] | (this.bin[this.pos + 1] << 8)
     this.pos += 2
     return val
@@ -85,7 +85,7 @@ export class ReaderUint8Array {
   public readInt16LE (): number {
     const val = this.readUInt16LE()
     // If the sign bit is set, convert to negative value
-    const x = (val & 0x8000) !== 0 ? val - 0x10000 : val
+    const x = (val & 0x8000) === 0 ? val : val - 0x10000
     return x
   }
 
@@ -102,7 +102,7 @@ export class ReaderUint8Array {
   public readInt32BE (): number {
     const val = this.readUInt32BE()
     // If the sign bit is set, convert to negative value
-    return (val & 0x80000000) !== 0 ? val - 0x100000000 : val
+    return (val & 0x80000000) === 0 ? val : val - 0x100000000
   }
 
   public readUInt32LE (): number {
@@ -119,7 +119,7 @@ export class ReaderUint8Array {
   public readInt32LE (): number {
     const val = this.readUInt32LE()
     // Explicitly check if the sign bit is set and then convert to a negative value
-    return (val & 0x80000000) !== 0 ? val - 0x100000000 : val
+    return (val & 0x80000000) === 0 ? val : val - 0x100000000
   }
 
   public readUInt64BEBn (): BigNumber {

package/src/primitives/Schnorr.ts

@@ -2,7 +2,8 @@ import BigNumber from './BigNumber.js'
 import Curve from './Curve.js'
 import Point from './Point.js'
 import { sha256 } from './Hash.js'
-import { PrivateKey, PublicKey } from './index.js'
+import PrivateKey from './PrivateKey.js'
+import PublicKey from './PublicKey.js'
 
 /**
  * Class representing the Schnorr Zero-Knowledge Proof (ZKP) protocol.

package/src/primitives/Secp256r1.ts

@@ -189,7 +189,8 @@ export default class Secp256r1 {
     try {
       this.assertOnCurve(p)
       return true
-    } catch (err) {
+    } catch (_notOnCurve) {
+      // assertOnCurve throws when the point is not on the curve; return false
       return false
     }
   }

package/src/primitives/Signature.ts

@@ -82,17 +82,17 @@ export default class Signature {
     }
     let s = data.slice(p.place, slen + p.place)
     if (r[0] === 0) {
-      if ((r[1] & 0x80) !== 0) {
-        r = r.slice(1)
-      } else {
+      if ((r[1] & 0x80) === 0) {
         throw new Error('Invalid R-value in signature DER')
+      } else {
+        r = r.slice(1)
       }
     }
     if (s[0] === 0) {
-      if ((s[1] & 0x80) !== 0) {
-        s = s.slice(1)
-      } else {
+      if ((s[1] & 0x80) === 0) {
         throw new Error('Invalid S-value in signature DER')
+      } else {
+        s = s.slice(1)
       }
     }
 
@@ -285,7 +285,7 @@ export default class Signature {
   ): number[] | string {
     if (recovery < 0 || recovery > 3) throw new Error('Invalid recovery param')
     if (typeof compressed !== 'boolean') {
-      throw new Error('Invalid compressed param')
+      throw new TypeError('Invalid compressed param')
     }
     let compactByte = 27 + recovery
     if (compressed) {
@@ -332,7 +332,7 @@ export default class Signature {
     const G = curve.g
 
     // 1.1 LEt x = r + jn
-    const x = isSecondKey !== 0 ? r.add(n) : r
+    const x = isSecondKey === 0 ? r : r.add(n)
     const R = Point.fromX(x, isYOdd)
 
     // 1.4 Check that nR is at infinity

package/src/primitives/TransactionSignature.ts

@@ -153,7 +153,7 @@ export default class TransactionSignature extends Signature {
       const writer = new Writer()
 
       for (const input of inputs) {
-        if (typeof input.sourceTXID === 'undefined') {
+        if (input.sourceTXID === undefined) {
           if (input.sourceTransaction == null) {
             throw new Error('Missing sourceTransaction for input')
           }
@@ -185,7 +185,7 @@ export default class TransactionSignature extends Signature {
     function getOutputsHash (outputIndex?: number): number[] {
       const writer = new Writer()
 
-      if (typeof outputIndex === 'undefined') {
+      if (outputIndex === undefined) {
         for (const output of params.outputs) {
           const satoshis = output.satoshis ?? 0 // Default to 0 if undefined
           writer.writeUInt64LE(satoshis)
@@ -219,11 +219,11 @@ export default class TransactionSignature extends Signature {
     let hashOutputs = new Array(32).fill(0)
 
     if ((params.scope & TransactionSignature.SIGHASH_ANYONECANPAY) === 0) {
-      if (cache?.hashPrevouts != null) {
-        hashPrevouts = cache.hashPrevouts
-      } else {
+      if (cache?.hashPrevouts == null) {
         hashPrevouts = getPrevoutHash()
         if (cache != null) cache.hashPrevouts = hashPrevouts
+      } else {
+        hashPrevouts = cache.hashPrevouts
       }
     }
 
@@ -232,11 +232,11 @@ export default class TransactionSignature extends Signature {
       (params.scope & 31) !== TransactionSignature.SIGHASH_SINGLE &&
       (params.scope & 31) !== TransactionSignature.SIGHASH_NONE
     ) {
-      if (cache?.hashSequence != null) {
-        hashSequence = cache.hashSequence
-      } else {
+      if (cache?.hashSequence == null) {
         hashSequence = getSequenceHash()
         if (cache != null) cache.hashSequence = hashSequence
+      } else {
+        hashSequence = cache.hashSequence
       }
     }
 
@@ -244,11 +244,11 @@ export default class TransactionSignature extends Signature {
       (params.scope & 31) !== TransactionSignature.SIGHASH_SINGLE &&
       (params.scope & 31) !== TransactionSignature.SIGHASH_NONE
     ) {
-      if (cache?.hashOutputsAll != null) {
-        hashOutputs = cache.hashOutputsAll
-      } else {
+      if (cache?.hashOutputsAll == null) {
         hashOutputs = getOutputsHash()
         if (cache != null) cache.hashOutputsAll = hashOutputs
+      } else {
+        hashOutputs = cache.hashOutputsAll
       }
     } else if (
       (params.scope & 31) === TransactionSignature.SIGHASH_SINGLE &&
@@ -256,14 +256,14 @@ export default class TransactionSignature extends Signature {
     ) {
       const key = params.inputIndex
       const cachedSingle = cache?.hashOutputsSingle?.get(key)
-      if (cachedSingle != null) {
-        hashOutputs = cachedSingle
-      } else {
+      if (cachedSingle == null) {
         hashOutputs = getOutputsHash(key)
         if (cache != null) {
-          if (cache.hashOutputsSingle == null) cache.hashOutputsSingle = new Map()
+          cache.hashOutputsSingle ??= new Map()
           cache.hashOutputsSingle.set(key, hashOutputs)
         }
+      } else {
+        hashOutputs = cachedSingle
       }
     }
 
@@ -349,7 +349,7 @@ export default class TransactionSignature extends Signature {
       const scope = 1
       return new TransactionSignature(r, s, scope)
     }
-    const scope = buf[buf.length - 1]
+    const scope = buf.at(-1)
     const derbuf = buf.slice(0, buf.length - 1)
     const tempSig = Signature.fromDER(derbuf)
     return new TransactionSignature(tempSig.r, tempSig.s, scope)