@bsv/sdk 2.1.0 → 2.1.2

package/package.json

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

package/src/auth/Peer.ts

@@ -18,7 +18,7 @@ import { OriginatorDomainNameStringUnder250Bytes, WalletInterface } from '../wal
 
 const AUTH_VERSION = '0.1'
 const BufferCtor =
-  typeof globalThis !== 'undefined' ? (globalThis as any).Buffer : undefined
+  typeof globalThis === 'undefined' ? undefined : (globalThis as any).Buffer
 
 /**
  * Represents a peer capable of performing mutual authentication.
@@ -73,6 +73,24 @@ export class Peer {
   private readonly originator?: OriginatorDomainNameStringUnder250Bytes
   private identityPublicKey?: string
 
+  /**
+   * Resolves when the transport's `onData` listener has been registered and
+   * the peer is ready to send and receive messages.  Await this after
+   * construction before calling `toPeer` or any other method that requires
+   * the transport to be listening.
+   *
+   * @example
+   * const peer = new Peer(wallet, transport)
+   * await peer.ready
+   * await peer.toPeer(payload)
+   */
+  /*
+   * Listener must register synchronously so paired-peer mocks/transports see
+   * onDataCallback set immediately. The returned Promise resolves once registration
+   * is fully acknowledged. A lazy getter pattern would break paired-peer test mocks.
+   */
+  readonly ready: Promise<void>
+
   /**
    * Creates a new Peer instance
    *
@@ -81,6 +99,7 @@ export class Peer {
    * @param {RequestedCertificateSet} [certificatesToRequest] - Optional set of certificates to request from a peer during the initial handshake.
    * @param {SessionManager} [sessionManager] - Optional SessionManager to be used for managing peer sessions.
    * @param {boolean} [autoPersistLastSession] - Whether to auto-persist the session with the last-interacted-with peer. Defaults to true.
+   * @param {OriginatorDomainNameStringUnder250Bytes} [originator] - Optional originator domain name.
    */
   constructor (
     wallet: WalletInterface,
@@ -97,11 +116,9 @@ export class Peer {
       certifiers: [],
       types: {}
     }
-    this.transport.onData(this.handleIncomingMessage.bind(this)).catch(e => {
-      throw e
-    })
+    this.ready = this.transport.onData(this.handleIncomingMessage.bind(this)) // NOSONAR(typescript:S7059): listener must register synchronously — see ready field comment
     this.sessionManager =
-      sessionManager != null ? sessionManager : new SessionManager()
+      sessionManager ?? new SessionManager()
     if (autoPersistLastSession === false) {
       this.autoPersistLastSession = false
     } else {
@@ -249,12 +266,12 @@ export class Peer {
     }
 
     // If that session doesn't exist or isn't authenticated, initiate handshake
-    if ((peerSession == null) || !peerSession.isAuthenticated) {
+    if (peerSession?.isAuthenticated !== true) {
       // This will create a brand-new session
       const sessionNonce = await this.initiateHandshake(identityKey)
       // Now retrieve it by the sessionNonce
       peerSession = this.sessionManager.getSession(sessionNonce)
-      if ((peerSession == null) || !peerSession.isAuthenticated) {
+      if (peerSession?.isAuthenticated !== true) {
         throw new Error('Unable to establish mutual authentication with peer!')
       }
     }
@@ -423,9 +440,7 @@ export class Peer {
       if (peerIdentityKey != null) {
         const existingDetails = (error as any).details
         if (existingDetails != null && typeof existingDetails === 'object') {
-          if (existingDetails.peerIdentityKey == null) {
-            existingDetails.peerIdentityKey = peerIdentityKey
-          }
+          existingDetails.peerIdentityKey ??= peerIdentityKey
         } else {
           (error as any).details = { peerIdentityKey }
         }
@@ -548,9 +563,7 @@ export class Peer {
       signature
     }
 
-    if (this.lastInteractedWithPeer === undefined) {
-      this.lastInteractedWithPeer = message.identityKey
-    }
+    this.lastInteractedWithPeer ??= message.identityKey
 
     await this.transport.send(initialResponseMessage)
   }

package/src/auth/SessionManager.ts

@@ -31,7 +31,7 @@ export class SessionManager {
    */
   addSession (session: PeerSession): void {
     if (typeof session.sessionNonce !== 'string') {
-      throw new Error(
+      throw new TypeError(
         'Invalid session: sessionNonce is required to add a session.'
       )
     }
@@ -97,11 +97,8 @@ export class SessionManager {
       // We can prefer authenticated sessions
       if (best == null) {
         best = s
-      } else {
-        // If we want the "most recently updated" AND isAuthenticated
-        if ((s.lastUpdate ?? 0) > (best.lastUpdate ?? 0)) {
-          best = s
-        }
+      } else if ((s.lastUpdate ?? 0) > (best.lastUpdate ?? 0)) {
+        best = s
       }
     }
     // Optionally, you could also filter out isAuthenticated===false if you only want
@@ -140,6 +137,6 @@ export class SessionManager {
     if (direct) return true
     // if not directly a nonce, interpret as identityKey
     const nonces = this.identityKeyToNonces.get(identifier)
-    return !(nonces == null) && nonces.size > 0
+    return (nonces != null) && nonces.size > 0
   }
 }

package/src/auth/certificates/MasterCertificate.ts

@@ -157,7 +157,7 @@ export class MasterCertificate extends Certificate {
     privilegedReason?: string
   ): Promise<Record<CertificateFieldNameUnder50Bytes, string>> {
     if (!Array.isArray(fieldsToReveal)) {
-      throw new Error('fieldsToReveal must be an array of strings')
+      throw new TypeError('fieldsToReveal must be an array of strings')
     }
     const fieldRevelationKeyring = {}
     for (const fieldName of fieldsToReveal) {

package/src/auth/certificates/__tests/CompletedProtoWallet.ts

@@ -44,7 +44,7 @@ export class CompletedProtoWallet
     ) {
       this.keyDeriver = new CachedKeyDeriver(rootKeyOrKeyDeriver)
     } else {
-      throw new Error('Invalid key deriver provided')
+      throw new TypeError('Invalid key deriver provided')
     }
   }
 

package/src/auth/clients/AuthFetch.ts

@@ -117,11 +117,13 @@ export class AuthFetch {
 
         // Create a new transport for this base url if needed
         let peerToUse: AuthPeer
-        if (typeof this.peers[baseURL] === 'undefined') {
+        if (this.peers[baseURL] === undefined) {
           // Create a peer for the request
           const newTransport = new SimplifiedFetchTransport(baseURL)
+          const newPeer = new Peer(this.wallet, newTransport, this.requestedCertificates, this.sessionManager, undefined, this.originator)
+          await newPeer.ready
           peerToUse = {
-            peer: new Peer(this.wallet, newTransport, this.requestedCertificates, this.sessionManager, undefined, this.originator),
+            peer: newPeer,
             pendingCertificateRequests: []
           }
           this.peers[baseURL] = peerToUse
@@ -315,20 +317,20 @@ export class AuthFetch {
     const baseURL = parsedUrl.origin
 
     let peerToUse: { peer: Peer; identityKey?: string }
-    if (typeof this.peers[baseURL] !== 'undefined') {
-      peerToUse = { peer: this.peers[baseURL].peer }
-    } else {
+    if (this.peers[baseURL] === undefined) {
       const newTransport = new SimplifiedFetchTransport(baseURL)
-      peerToUse = {
-        peer: new Peer(
-          this.wallet,
-          newTransport,
-          this.requestedCertificates,
-          this.sessionManager,
-          this.originator
-        )
-      }
+      const newPeer = new Peer(
+        this.wallet,
+        newTransport,
+        this.requestedCertificates,
+        this.sessionManager,
+        this.originator
+      )
+      await newPeer.ready
+      peerToUse = { peer: newPeer }
       this.peers[baseURL] = peerToUse
+    } else {
+      peerToUse = { peer: this.peers[baseURL].peer }
     }
 
     // Return a promise that resolves when certificates are received
@@ -451,14 +453,14 @@ export class AuthFetch {
 
     // nHeaders
     writer.writeVarIntNum(includedHeaders.length)
-    for (let i = 0; i < includedHeaders.length; i++) {
+    for (const [headerKey, headerValue] of includedHeaders) {
       // headerKeyLength
-      const headerKeyAsArray = Utils.toArray(includedHeaders[i][0], 'utf8')
+      const headerKeyAsArray = Utils.toArray(headerKey, 'utf8')
       writer.writeVarIntNum(headerKeyAsArray.length)
       // headerKey
       writer.write(headerKeyAsArray)
       // headerValueLength
-      const headerValueAsArray = Utils.toArray(includedHeaders[i][1], 'utf8')
+      const headerValueAsArray = Utils.toArray(headerValue, 'utf8')
       writer.writeVarIntNum(headerValueAsArray.length)
       // headerValue
       writer.write(headerValueAsArray)
@@ -470,7 +472,7 @@ export class AuthFetch {
     if (methodsThatTypicallyHaveBody.includes(method.toUpperCase()) && body === undefined) {
       // Check if content-type is application/json
       const contentTypeHeader = includedHeaders.find(([k]) => k === 'content-type')
-      if (contentTypeHeader && contentTypeHeader[1].includes('application/json')) {
+      if (contentTypeHeader?.[1].includes('application/json') === true) {
         body = '{}'
       } else {
         body = ''
@@ -525,14 +527,14 @@ export class AuthFetch {
     if (!satoshisRequiredHeader) {
       throw new Error('Missing x-bsv-payment-satoshis-required response header.')
     }
-    const satoshisRequired = parseInt(satoshisRequiredHeader)
-    if (isNaN(satoshisRequired) || satoshisRequired <= 0) {
+    const satoshisRequired = Number.parseInt(satoshisRequiredHeader)
+    if (Number.isNaN(satoshisRequired) || satoshisRequired <= 0) {
       throw new Error('Invalid x-bsv-payment-satoshis-required response header value.')
     }
 
     const serverIdentityKey = originalResponse.headers.get('x-bsv-auth-identity-key')
     if (typeof serverIdentityKey !== 'string') {
-      throw new Error('Missing x-bsv-auth-identity-key response header.')
+      throw new TypeError('Missing x-bsv-auth-identity-key response header.')
     }
 
     const derivationPrefix = originalResponse.headers.get('x-bsv-payment-derivation-prefix')
@@ -541,7 +543,15 @@ export class AuthFetch {
     }
 
     let paymentContext = config.paymentContext
-    if (paymentContext != null) {
+    if (paymentContext == null) {
+      paymentContext = await this.createPaymentContext(
+        url,
+        config,
+        satoshisRequired,
+        serverIdentityKey,
+        derivationPrefix
+      )
+    } else {
       const requirementsChanged = !this.isPaymentContextCompatible(
         paymentContext,
         satoshisRequired,
@@ -558,14 +568,6 @@ export class AuthFetch {
           derivationPrefix
         )
       }
-    } else {
-      paymentContext = await this.createPaymentContext(
-        url,
-        config,
-        satoshisRequired,
-        serverIdentityKey,
-        derivationPrefix
-      )
     }
 
     if (paymentContext.attempts >= paymentContext.maxAttempts) {
@@ -573,7 +575,7 @@ export class AuthFetch {
     }
 
     const headersWithPayment: Record<string, string> = {
-      ...(config.headers ?? {})
+      ...config.headers
     }
     headersWithPayment['x-bsv-payment'] = JSON.stringify({
       derivationPrefix: paymentContext.derivationPrefix,
@@ -692,7 +694,7 @@ export class AuthFetch {
     url: string,
     config: SimplifiedFetchRequestOptions
   ): PaymentRetryContext['requestSummary'] {
-    const headers = { ...(config.headers ?? {}) }
+    const headers = { ...config.headers }
     const method = typeof config.method === 'string' ? config.method.toUpperCase() : 'GET'
     const bodySummary = this.describeRequestBodyForLogging(config.body)
 
@@ -727,7 +729,7 @@ export class AuthFetch {
 
     if (typeof ArrayBuffer !== 'undefined' && ArrayBuffer.isView(body)) {
       return {
-        type: body.constructor != null ? body.constructor.name : 'TypedArray',
+        type: body.constructor == null ? 'TypedArray' : body.constructor.name,
         byteLength: body.byteLength
       }
     }
@@ -754,8 +756,8 @@ export class AuthFetch {
       if (typeof serialized === 'string') {
         return { type: 'object', byteLength: Utils.toArray(serialized, 'utf8').length }
       }
-    } catch (_) {
-      // Ignore JSON serialization issues for logging purposes.
+    } catch (_jsonSerializationError) {
+      // Ignore JSON serialization issues for logging purposes only
     }
 
     return { type: typeof body, byteLength: 0 }
@@ -791,12 +793,10 @@ export class AuthFetch {
       console.error(`${prefix} ${message}`, details)
     } else if (level === 'warn') {
       console.warn(`${prefix} ${message}`, details)
+    } else if (typeof console.info === 'function') {
+      console.info(`${prefix} ${message}`, details)
     } else {
-      if (typeof console.info === 'function') {
-        console.info(`${prefix} ${message}`, details)
-      } else {
-        console.log(`${prefix} ${message}`, details)
-      }
+      console.log(`${prefix} ${message}`, details)
     }
   }
 
@@ -915,7 +915,7 @@ export class AuthFetch {
 
     // 8. ReadableStream
     if (body instanceof ReadableStream) {
-      throw new Error('ReadableStream cannot be directly converted to number[].')
+      throw new TypeError('ReadableStream cannot be directly converted to number[].')
     }
 
     // 9. Fallback

package/src/auth/transports/SimplifiedFetchTransport.ts

@@ -24,7 +24,7 @@ export class SimplifiedFetchTransport implements Transport {
    */
   constructor(baseUrl: string, fetchClient = defaultFetch) {
     if (typeof fetchClient !== 'function') {
-      throw new Error(
+      throw new TypeError(
         'SimplifiedFetchTransport requires a fetch implementation. ' +
         'In environments without fetch, provide a polyfill or custom implementation.'
       )
@@ -192,14 +192,14 @@ export class SimplifiedFetchTransport implements Transport {
 
       // nHeaders
       payloadWriter.writeVarIntNum(includedHeaders.length)
-      for (let i = 0; i < includedHeaders.length; i++) {
+      for (const [headerKey, headerValue] of includedHeaders) {
         // headerKeyLength
-        const headerKeyAsArray = Utils.toArray(includedHeaders[i][0], 'utf8')
+        const headerKeyAsArray = Utils.toArray(headerKey, 'utf8')
         payloadWriter.writeVarIntNum(headerKeyAsArray.length)
         // headerKey
         payloadWriter.write(headerKeyAsArray)
         // headerValueLength
-        const headerValueAsArray = Utils.toArray(includedHeaders[i][1], 'utf8')
+        const headerValueAsArray = Utils.toArray(headerValue, 'utf8')
         payloadWriter.writeVarIntNum(headerValueAsArray.length)
         // headerValue
         payloadWriter.write(headerValueAsArray)

package/src/compat/ECIES.ts

@@ -9,7 +9,7 @@ import { toArray, toHex, encode } from '../primitives/utils.js'
 function AES (key): void {
   if (this._tables[0][0][0] === 0) this._precompute()
 
-  let tmp, encKey, decKey
+  let tmp
   const sbox = this._tables[0][4]
   const decTable = this._tables[1]
   const keyLen = key.length
@@ -19,7 +19,9 @@ function AES (key): void {
     throw new Error('invalid aes key size')
   }
 
-  this._key = [(encKey = key.slice(0)), (decKey = [])]
+  const encKey = key.slice(0)
+  const decKey = []
+  this._key = [encKey, decKey]
 
   // schedule encryption keys
   let i: number
@@ -46,7 +48,7 @@ function AES (key): void {
 
   // schedule decryption keys
   for (let j = 0; i > 0; j++, i--) {
-    tmp = encKey[(j & 3) !== 0 ? i : i - 4]
+    tmp = encKey[(j & 3) === 0 ? i - 4 : i]
     if (i <= 4 || j < 4) {
       decKey[j] = tmp
     } else {
@@ -127,10 +129,11 @@ AES.prototype = {
 
     // Compute double and third tables
     for (i = 0; i < 256; i++) {
-      th[(d[i] = (i << 1) ^ ((i >> 7) * 283)) ^ i] = i
+      d[i] = (i << 1) ^ ((i >> 7) * 283)
+      th[d[i] ^ i] = i
     }
 
-    for (x = xInv = 0; sbox[x] === 0; x ^= (x2 !== 0 ? x2 : 1), xInv = th[xInv] !== 0 ? th[xInv] : 1) {
+    for (x = xInv = 0; sbox[x] === 0; x ^= (x2 === 0 ? 1 : x2), xInv = th[xInv] === 0 ? 1 : th[xInv]) {
       // Compute sbox
       s = xInv ^ (xInv << 1) ^ (xInv << 2) ^ (xInv << 3) ^ (xInv << 4)
       s = (s >> 8) ^ (s & 255) ^ 99
@@ -138,7 +141,9 @@ AES.prototype = {
       sboxInv[s] = x
 
       // Compute MixColumns
-      x8 = d[(x4 = d[(x2 = d[x])])]
+      x2 = d[x]
+      x4 = d[x2]
+      x8 = d[x4]
       tDec = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100)
       tEnc = (d[s] * 0x101) ^ (s * 0x1010100)
 
@@ -307,7 +312,7 @@ class CBC {
   }
 
   public static blockBufs2Buf (blockBufs: number[][]): number[] {
-    let last = blockBufs[blockBufs.length - 1]
+    let last = blockBufs.at(-1)
     last = CBC.pkcs7Unpad(last)
     blockBufs[blockBufs.length - 1] = last
 
@@ -319,7 +324,7 @@ class CBC {
   public static encrypt (
     messageBuf: number[],
     ivBuf: number[],
-    blockCipher: any /* TODO: type */,
+    blockCipher: any,
     cipherKeyBuf: number[]
   ): number[] {
     const blockSize = ivBuf.length * 8
@@ -337,7 +342,7 @@ class CBC {
   public static decrypt (
     encBuf: number[],
     ivBuf: number[],
-    blockCipher: any /* TODO: type */,
+    blockCipher: any,
     cipherKeyBuf: number[]
   ): number[] {
     const bytesize = ivBuf.length
@@ -358,7 +363,7 @@ class CBC {
   public static encryptBlock (
     blockBuf: number[],
     ivBuf: number[],
-    blockCipher: any /* TODO: type */,
+    blockCipher: any,
     cipherKeyBuf: number[]
   ): number[] {
     const xorbuf = CBC.xorBufs(blockBuf, ivBuf)
@@ -369,7 +374,7 @@ class CBC {
   public static decryptBlock (
     encBuf: number[],
     ivBuf: number[],
-    blockCipher: any /* TODO: type */,
+    blockCipher: any,
     cipherKeyBuf: number[]
   ): number[] {
     const xorbuf = blockCipher.decrypt(encBuf, cipherKeyBuf)
@@ -380,13 +385,12 @@ class CBC {
   public static encryptBlocks (
     blockBufs: number[][],
     ivBuf: number[],
-    blockCipher: any /* TODO: type */,
+    blockCipher: any,
     cipherKeyBuf: number[]
   ): number[][] {
     const encBufs: number[][] = []
 
-    for (let i = 0; i < blockBufs.length; i++) {
-      const blockBuf = blockBufs[i]
+    for (const blockBuf of blockBufs) {
       const encBuf = CBC.encryptBlock(
         blockBuf,
         ivBuf,
@@ -405,13 +409,12 @@ class CBC {
   public static decryptBlocks (
     encBufs: number[][],
     ivBuf: number[],
-    blockCipher: any /* TODO: type */,
+    blockCipher: any,
     cipherKeyBuf: number[]
   ): number[][] {
     const blockBufs: number[][] = []
 
-    for (let i = 0; i < encBufs.length; i++) {
-      const encBuf = encBufs[i]
+    for (const encBuf of encBufs) {
       const blockBuf = CBC.decryptBlock(
         encBuf,
         ivBuf,
@@ -437,7 +440,7 @@ class CBC {
   }
 
   public static pkcs7Unpad (paddedbuf: number[]): number[] {
-    const padlength = paddedbuf[paddedbuf.length - 1]
+    const padlength = paddedbuf.at(-1)
     const padbuf = paddedbuf.slice(
       paddedbuf.length - padlength,
       paddedbuf.length
@@ -548,9 +551,7 @@ export default class ECIES {
     noKey = false
   ): number[] {
     let Rbuf: string | number[] | null = null
-    if (fromPrivateKey == null) {
-      fromPrivateKey = PrivateKey.fromRandom()
-    }
+    fromPrivateKey ??= PrivateKey.fromRandom()
     if (!noKey) {
       Rbuf = fromPrivateKey.toPublicKey().encode(true)
     }
@@ -603,14 +604,12 @@ export default class ECIES {
       }
     }
 
-    if (Rbuf !== null) {
-      if (fromPublicKey == null) {
-        fromPublicKey = PublicKey.fromString(toHex(Rbuf))
-      }
-    } else {
+    if (Rbuf === null) {
       if (fromPublicKey == null) {
         throw new Error('Sender public key is required')
       }
+    } else {
+      fromPublicKey ??= PublicKey.fromString(toHex(Rbuf))
     }
 
     const { iv, kE, kM } = ECIES.ivkEkM(toPrivateKey, fromPublicKey)
@@ -644,12 +643,8 @@ export default class ECIES {
     fromPrivateKey?: PrivateKey,
     ivBuf?: number[]
   ): number[] {
-    if (fromPrivateKey == null) {
-      fromPrivateKey = PrivateKey.fromRandom()
-    }
-    if (ivBuf == null) {
-      ivBuf = Random(16)
-    }
+    fromPrivateKey ??= PrivateKey.fromRandom()
+    ivBuf ??= Random(16)
     const r = fromPrivateKey
     const RPublicKey = fromPrivateKey.toPublicKey()
     const RBuf = RPublicKey.encode(true) as number[]
@@ -689,8 +684,8 @@ export default class ECIES {
     const kEkM = Hash.sha512(Sbuf)
     const kE = kEkM.slice(0, 32)
     const kM = kEkM.slice(32, 64)
-    const c = encBuf.slice(33, encBuf.length - 32)
-    const d = encBuf.slice(encBuf.length - 32, encBuf.length)
+    const c = encBuf.slice(33, -32)
+    const d = encBuf.slice(-32)
     const d2 = Hash.sha256hmac(kM, c)
     if (toHex(d) !== toHex(d2)) {
       throw new Error('Invalid checksum')

package/src/compat/HD.ts

@@ -230,13 +230,18 @@ export default class HD {
         continue
       }
 
-      if (parseInt(c.replace("'", ''), 10).toString() !== c.replace("'", '')) {
+      const childMatch = /^(\d+)('?)$/.exec(c)
+      if (childMatch === null) {
         throw new Error('invalid path')
       }
 
-      const usePrivate = c.length > 1 && c[c.length - 1] === "'"
-      let childIndex =
-        parseInt(usePrivate ? c.slice(0, c.length - 1) : c, 10) & 0x7fffffff
+      const childIndexValue = Number.parseInt(childMatch[1], 10)
+      if (childIndexValue > 0x7fffffff) {
+        throw new Error('invalid path')
+      }
+
+      const usePrivate = childMatch[2] === "'"
+      let childIndex = childIndexValue
 
       if (usePrivate) {
         childIndex += 0x80000000
@@ -256,7 +261,7 @@ export default class HD {
    */
   public deriveChild (i: number): HD {
     if (typeof i !== 'number') {
-      throw new Error('i must be a number')
+      throw new TypeError('i must be a number')
     }
 
     const ibc: number[] = []

package/src/compat/Mnemonic.ts

@@ -35,12 +35,12 @@ export default class Mnemonic {
    */
   public toBinary (): number[] {
     const bw = new Writer()
-    if (this.mnemonic !== '') {
+    if (this.mnemonic === '') {
+      bw.writeVarIntNum(0)
+    } else {
       const buf = toArray(this.mnemonic, 'utf8')
       bw.writeVarIntNum(buf.length)
       bw.write(buf)
-    } else {
-      bw.writeVarIntNum(0)
     }
     if (this.seed.length > 0) {
       bw.writeVarIntNum(this.seed.length)
@@ -76,7 +76,7 @@ export default class Mnemonic {
    * @throws {Error} If the bit length is not a multiple of 32 or is less than 128.
    */
   public fromRandom (bits?: number): this {
-    if (bits === undefined || bits === null || isNaN(bits) || bits === 0) {
+    if (bits === undefined || bits === null || Number.isNaN(bits) || bits === 0) {
       bits = 128
     }
     if (bits % 32 !== 0) {
@@ -179,8 +179,8 @@ export default class Mnemonic {
     const hash = Hash.sha256(buf)
     let bin = ''
     const bits = buf.length * 8
-    for (let i = 0; i < buf.length; i++) {
-      bin = bin + ('00000000' + buf[i].toString(2)).slice(-8)
+    for (const byte of buf) {
+      bin = bin + ('00000000' + byte.toString(2)).slice(-8)
     }
     let hashbits = hash[0].toString(2)
     hashbits = ('00000000' + hashbits).slice(-8).slice(0, bits / 32)
@@ -198,7 +198,7 @@ export default class Mnemonic {
       if (mnemonic !== '') {
         mnemonic = mnemonic + this.Wordlist.space
       }
-      const wi = parseInt(bin.slice(i * 11, (i + 1) * 11), 2)
+      const wi = Number.parseInt(bin.slice(i * 11, (i + 1) * 11), 2)
       mnemonic = mnemonic + this.Wordlist.value[wi]
     }
 
@@ -218,8 +218,8 @@ export default class Mnemonic {
     // confirm no invalid words
     const words = mnemonic.split(this.Wordlist.space)
     let bin = ''
-    for (let i = 0; i < words.length; i++) {
-      const ind = this.Wordlist.value.indexOf(words[i])
+    for (const word of words) {
+      const ind = this.Wordlist.value.indexOf(word)
       if (ind < 0) {
         return false
       }
@@ -240,7 +240,7 @@ export default class Mnemonic {
     const buf: number[] = []
 
     for (let i = 0; i < nonhashBits.length / 8; i++) {
-      buf.push(parseInt(bin.slice(i * 8, (i + 1) * 8), 2))
+      buf.push(Number.parseInt(bin.slice(i * 8, (i + 1) * 8), 2))
     }
     const hash = Hash.sha256(buf.slice(0, nonhashBits.length / 8))
     let expectedHashBits = hash[0].toString(2)
@@ -266,7 +266,7 @@ export default class Mnemonic {
       )
     }
     if (typeof passphrase !== 'string') {
-      throw new Error('passphrase must be a string or undefined')
+      throw new TypeError('passphrase must be a string or undefined')
     }
     mnemonic = mnemonic.normalize('NFKD')
     passphrase = passphrase.normalize('NFKD')