@bsv/sdk 2.0.16 → 2.1.1

package/src/primitives/utils.ts

@@ -1,14 +1,12 @@
 import BigNumber from './BigNumber.js'
 import { hash256 } from './Hash.js'
 import { assertValidHex } from './hex.js'
-import { WriterUint8Array } from './WriterUint8Array.js'
-import { ReaderUint8Array } from './ReaderUint8Array.js'
 
-export { WriterUint8Array }
-export { ReaderUint8Array }
+export { WriterUint8Array } from './WriterUint8Array.js'
+export { ReaderUint8Array } from './ReaderUint8Array.js'
 
 const BufferCtor =
-  typeof globalThis !== 'undefined' ? (globalThis as any).Buffer : undefined
+  typeof globalThis === 'undefined' ? undefined : (globalThis as any).Buffer
 const CAN_USE_BUFFER =
   BufferCtor != null && typeof BufferCtor.from === 'function'
 
@@ -75,7 +73,7 @@ export const toArray = (msg: any, enc?: 'hex' | 'utf8' | 'base64'): any[] => {
   if (msg === undefined) return []
 
   if (typeof msg !== 'string') {
-    return Array.from(msg, (item: any) => item | 0)
+    return Array.from(msg, (item: any) => Math.trunc(item))
   }
 
   switch (enc) {
@@ -106,8 +104,8 @@ const hexToArray = (msg: string): number[] => {
   const out = new Array(normalized.length / 2)
   let o = 0
   for (let i = 0; i < normalized.length; i += 2) {
-    const hi = HEX_CHAR_TO_VALUE[normalized.charCodeAt(i)]
-    const lo = HEX_CHAR_TO_VALUE[normalized.charCodeAt(i + 1)]
+    const hi = HEX_CHAR_TO_VALUE[normalized.codePointAt(i) as number]
+    const lo = HEX_CHAR_TO_VALUE[normalized.codePointAt(i + 1) as number]
     out[o++] = (hi << 4) | lo
   }
   return out
@@ -119,8 +117,8 @@ export function base64ToArray (msg: string): number[] {
   }
 
   // cleanse string
-  let s = msg.trim().replace(/[\r\n\t\f\v ]+/g, '')
-  s = s.replace(/-/g, '+').replace(/_/g, '/')
+  let s = msg.trim().replaceAll(/[\r\n\t\f\v ]+/g, '')
+  s = s.replaceAll('-', '+').replaceAll('_', '/')
 
   // ensure padding is correct
   const padIndex = s.indexOf('=')
@@ -135,17 +133,12 @@ export function base64ToArray (msg: string): number[] {
     s = s.slice(0, padIndex)
   }
 
-  // if (s.length % 4 === 1)
-  // {
-  //   throw new Error("Invalid base64 length")
-  // }
-
   const result: number[] = []
   let bitBuffer = 0
   let bitCount = 0
 
   for (let i = 0; i < s.length; i++) {
-    const c = s.charCodeAt(i)
+    const c = s.codePointAt(i) as number
     // using ascii map values rather than indexOf
     let v = -1
     if (c >= 65 && c <= 90) {
@@ -271,7 +264,7 @@ export const fromBase58 = (str: string): number[] => {
     throw new Error(`Invalid base58 character “${match.join('')}”`)
   }
   const lz = str.match(/^1+/gmu)
-  const psz: number = (lz !== null) ? lz[0].length : 0
+  const psz: number = lz === null ? 0 : lz[0].length
   const size = ((str.length - psz) * (Math.log(58) / Math.log(256)) + 1) >>> 0
 
   const uint8 = new Uint8Array([
@@ -306,9 +299,9 @@ export const fromBase58 = (str: string): number[] => {
  * @returns The base58 string representation
  */
 export const toBase58 = (bin: number[]): string => {
-  const base58Map = Array(256).fill(-1)
+  const base58Map = new Array(256).fill(-1)
   for (let i = 0; i < base58chars.length; ++i) {
-    base58Map[base58chars.charCodeAt(i)] = i
+    base58Map[base58chars.codePointAt(i) as number] = i
   }
 
   const result: number[] = []
@@ -317,23 +310,23 @@ export const toBase58 = (bin: number[]): string => {
     let carry = byte
     for (let j = 0; j < result.length; ++j) {
       const x = (base58Map[result[j]] << 8) + carry
-      result[j] = base58chars.charCodeAt(x % 58)
-      carry = (x / 58) | 0
+      result[j] = base58chars.codePointAt(x % 58) as number
+      carry = Math.trunc(x / 58)
     }
     while (carry !== 0) {
-      result.push(base58chars.charCodeAt(carry % 58))
-      carry = (carry / 58) | 0
+      result.push(base58chars.codePointAt(carry % 58) as number)
+      carry = Math.trunc(carry / 58)
     }
   }
 
   for (const byte of bin) {
-    if (byte !== 0) break
-    else result.push('1'.charCodeAt(0))
+    if (byte === 0) result.push('1'.codePointAt(0) as number)
+    else break
   }
 
   result.reverse()
 
-  return String.fromCharCode(...result)
+  return String.fromCodePoint(...result)
 }
 
 /**
@@ -383,7 +376,7 @@ export class Writer {
   private length: number
 
   constructor (bufs?: WriterChunk[]) {
-    this.bufs = bufs !== undefined ? bufs : []
+    this.bufs = bufs ?? []
     this.length = 0
     for (const b of this.bufs) this.length += b.length
   }
@@ -408,13 +401,13 @@ export class Writer {
     let offset = 0
     for (const buf of this.bufs) {
       if (buf instanceof Uint8Array) {
-        for (let i = 0; i < buf.length; i++) {
-          ret[offset++] = buf[i]
+        for (const byte of buf) {
+          ret[offset++] = byte
         }
       } else {
         const arr = buf as number[]
-        for (let i = 0; i < arr.length; i++) {
-          ret[offset++] = arr[i]
+        for (const item of arr) {
+          ret[offset++] = item
         }
       }
     }
@@ -447,10 +440,7 @@ export class Writer {
   }
 
   writeInt8 (n: number): this {
-    const buf = new Array(1)
-    buf[0] = n & 0xff
-    this.write(buf)
-    return this
+    return this.writeUInt8(n)
   }
 
   writeUInt16BE (n: number): this {
@@ -657,7 +647,7 @@ export class Reader {
     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 {
@@ -669,7 +659,7 @@ export class Reader {
   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 {
@@ -681,7 +671,7 @@ export class Reader {
   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
   }
 
@@ -698,7 +688,7 @@ export class Reader {
   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 {
@@ -715,7 +705,7 @@ export class Reader {
   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 {
@@ -797,7 +787,7 @@ export const minimallyEncode = (buf: number[]): number[] => {
   }
 
   // If the last byte is not 0x00 or 0x80, we are minimally encoded.
-  const last = buf[buf.length - 1]
+  const last = buf.at(-1)
   if ((last & 0x7f) !== 0) {
     return buf
   }
@@ -809,7 +799,7 @@ export const minimallyEncode = (buf: number[]): number[] => {
   }
 
   // If the next byte has it sign bit set, then we are minimaly encoded.
-  if ((buf[buf.length - 2] & 0x80) !== 0) {
+  if ((buf.at(-2) & 0x80) !== 0) {
     return buf
   }
 
@@ -817,15 +807,15 @@ export const minimallyEncode = (buf: number[]): number[] => {
   for (let i = buf.length - 1; i > 0; i--) {
     // We found a non zero byte, time to encode.
     if (buf[i - 1] !== 0) {
-      if ((buf[i - 1] & 0x80) !== 0) {
+      if ((buf[i - 1] & 0x80) === 0) {
+        // the sign bit is clear, we can use it.
+        buf[i - 1] |= last
+        return buf.slice(0, i)
+      } else {
         // We found a byte with it sign bit set so we need one more
         // byte.
         buf[i] = last
         return buf.slice(0, i + 1)
-      } else {
-        // the sign bit is clear, we can use it.
-        buf[i - 1] |= last
-        return buf.slice(0, i)
       }
     }
   }

package/src/registry/RegistryClient.ts

@@ -64,9 +64,7 @@ export class RegistryClient {
    * @returns The public identity key as a hex string.
    */
   private async getIdentityKey (): Promise<PubKeyHex> {
-    if (this.cachedIdentityKey === undefined) {
-      this.cachedIdentityKey = (await this.wallet.getPublicKey({ identityKey: true })).publicKey
-    }
+    this.cachedIdentityKey ??= (await this.wallet.getPublicKey({ identityKey: true })).publicKey
     return this.cachedIdentityKey
   }
 
@@ -75,9 +73,7 @@ export class RegistryClient {
    * @returns The network type ('mainnet' or 'testnet').
    */
   private async getNetwork (): Promise<'mainnet' | 'testnet'> {
-    if (this.network === undefined) {
-      this.network = (await this.wallet.getNetwork({})).network
-    }
+    this.network ??= (await this.wallet.getNetwork({})).network
     return this.network
   }
 
@@ -229,7 +225,7 @@ export class RegistryClient {
   async removeDefinition (
     registryRecord: RegistryRecord
   ): Promise<BroadcastResponse | BroadcastFailure> {
-    if (registryRecord.txid === undefined || typeof registryRecord.outputIndex === 'undefined' || registryRecord.lockingScript === undefined) {
+    if (registryRecord.txid === undefined || registryRecord.outputIndex === undefined || registryRecord.lockingScript === undefined) {
       throw new Error('Invalid registry record. Missing txid, outputIndex, or lockingScript.')
     }
 
@@ -240,14 +236,16 @@ export class RegistryClient {
     }
 
     // Create a descriptive label for the item we're removing
-    const itemIdentifier =
-      registryRecord.definitionType === 'basket'
-        ? registryRecord.basketID
-        : registryRecord.definitionType === 'protocol'
-          ? registryRecord.name
-          : registryRecord.definitionType === 'certificate'
-            ? (registryRecord.name !== undefined ? registryRecord.name : registryRecord.type)
-            : 'unknown'
+    let itemIdentifier: string | undefined
+    if (registryRecord.definitionType === 'basket') {
+      itemIdentifier = registryRecord.basketID
+    } else if (registryRecord.definitionType === 'protocol') {
+      itemIdentifier = registryRecord.name
+    } else if (registryRecord.definitionType === 'certificate') {
+      itemIdentifier = registryRecord.name ?? registryRecord.type
+    } else {
+      itemIdentifier = 'unknown'
+    }
 
     const outpoint = `${registryRecord.txid}.${registryRecord.outputIndex}`
     const { signableTransaction } = await this.wallet.createAction({
@@ -321,7 +319,7 @@ export class RegistryClient {
     registryRecord: RegistryRecord,
     updatedData: DefinitionData
   ): Promise<BroadcastResponse | BroadcastFailure> {
-    if (registryRecord.txid === undefined || typeof registryRecord.outputIndex === 'undefined' || registryRecord.lockingScript === undefined) {
+    if (registryRecord.txid === undefined || registryRecord.outputIndex === undefined || registryRecord.lockingScript === undefined) {
       throw new Error('Invalid registry record. Missing txid, outputIndex, or lockingScript.')
     }
 
@@ -337,14 +335,16 @@ export class RegistryClient {
     }
 
     // Create a descriptive label for the item we're updating
-    const itemIdentifier =
-      registryRecord.definitionType === 'basket'
-        ? registryRecord.basketID
-        : registryRecord.definitionType === 'protocol'
-          ? registryRecord.name
-          : registryRecord.definitionType === 'certificate'
-            ? (registryRecord.name !== undefined ? registryRecord.name : registryRecord.type)
-            : 'unknown'
+    let itemIdentifier: string | undefined
+    if (registryRecord.definitionType === 'basket') {
+      itemIdentifier = registryRecord.basketID
+    } else if (registryRecord.definitionType === 'protocol') {
+      itemIdentifier = registryRecord.name
+    } else if (registryRecord.definitionType === 'certificate') {
+      itemIdentifier = registryRecord.name ?? registryRecord.type
+    } else {
+      itemIdentifier = 'unknown'
+    }
 
     const pushdrop = new PushDrop(this.wallet, this.originator)
 
@@ -660,7 +660,7 @@ export function deserializeWalletProtocol (str: string): WalletProtocol {
 
   // Validate that the protocol string is a string and its length is within the allowed bounds.
   if (typeof protocolString !== 'string') {
-    throw new Error('Invalid protocolID')
+    throw new TypeError('Invalid protocolID')
   }
 
   return [security as SecurityLevel, protocolString]

package/src/remittance/RemittanceManager.ts

@@ -419,7 +419,7 @@ export class RemittanceManager {
    */
   async startListening (hostOverride?: string): Promise<void> {
     if (typeof this.comms.listenForLiveMessages !== 'function') {
-      throw new Error('CommsLayer does not support live message listening')
+      throw new TypeError('CommsLayer does not support live message listening')
     }
 
     await this.comms.listenForLiveMessages({
@@ -994,12 +994,13 @@ export class RemittanceManager {
         } else if (takerRequests && !makerRequests) {
           requesterRole = 'taker'
         } else if (makerRequests && takerRequests && makerRequest !== takerRequest) {
-          requesterRole =
-            makerRequest === 'beforeInvoicing' && takerRequest === 'beforeSettlement'
-              ? 'maker'
-              : makerRequest === 'beforeSettlement' && takerRequest === 'beforeInvoicing'
-                ? 'taker'
-                : undefined
+          if (makerRequest === 'beforeInvoicing' && takerRequest === 'beforeSettlement') {
+            requesterRole = 'maker'
+          } else if (makerRequest === 'beforeSettlement' && takerRequest === 'beforeInvoicing') {
+            requesterRole = 'taker'
+          } else {
+            requesterRole = undefined
+          }
         }
 
         if (typeof requesterRole !== 'string') return 'taker'
@@ -1083,7 +1084,7 @@ export class RemittanceManager {
       case 'identityVerificationRequest': {
         const payload = env.payload as IdentityVerificationRequest
         if (typeof payload !== 'object') {
-          throw new Error('Identity verification request payload missing data')
+          throw new TypeError('Identity verification request payload missing data')
         }
 
         if (this.cfg.identityLayer == null) {
@@ -1117,7 +1118,7 @@ export class RemittanceManager {
       case 'identityVerificationResponse': {
         const payload = env.payload as IdentityVerificationResponse
         if (typeof payload !== 'object') {
-          throw new Error('Identity verification response payload missing data')
+          throw new TypeError('Identity verification response payload missing data')
         }
 
         if (this.cfg.identityLayer == null) {
@@ -1155,7 +1156,7 @@ export class RemittanceManager {
       case 'identityVerificationAcknowledgment': {
         const payload = env.payload as IdentityVerificationAcknowledgment
         if (typeof payload !== 'object') {
-          throw new Error('Identity verification acknowledgment payload missing data')
+          throw new TypeError('Identity verification acknowledgment payload missing data')
         }
 
         thread.identity.acknowledgmentReceived = true
@@ -1168,7 +1169,7 @@ export class RemittanceManager {
       case 'invoice': {
         const invoice = env.payload as Invoice
         if (typeof invoice !== 'object') {
-          throw new Error('Invoice payload missing invoice data')
+          throw new TypeError('Invoice payload missing invoice data')
         }
 
         thread.invoice = invoice
@@ -1181,7 +1182,7 @@ export class RemittanceManager {
       case 'settlement': {
         const settlement = env.payload as Settlement
         if (typeof settlement !== 'object') {
-          throw new Error('Settlement payload missing settlement data')
+          throw new TypeError('Settlement payload missing settlement data')
         }
 
         if (this.shouldRequireIdentityBeforeSettlement(thread) && !thread.flags.hasIdentified) {
@@ -1253,7 +1254,7 @@ export class RemittanceManager {
       case 'receipt': {
         const receipt = env.payload as Receipt
         if (typeof receipt !== 'object') {
-          throw new Error('Receipt payload missing receipt data')
+          throw new TypeError('Receipt payload missing receipt data')
         }
 
         thread.receipt = receipt
@@ -1275,7 +1276,7 @@ export class RemittanceManager {
       case 'termination': {
         const payload = env.payload as Termination
         if (typeof payload !== 'object') {
-          throw new Error('Termination payload missing data')
+          throw new TypeError('Termination payload missing data')
         }
         thread.termination = payload
         thread.lastError = { message: payload.message, at: this.now() }
@@ -1430,9 +1431,7 @@ export class RemittanceManager {
     thread.protocolLog ??= []
     thread.stateLog ??= []
 
-    if (thread.state == null) {
-      thread.state = this.deriveThreadState(thread)
-    }
+    thread.state ??= this.deriveThreadState(thread)
     return thread
   }
 
@@ -1575,7 +1574,7 @@ export class RemittanceManager {
 
   private requireMyIdentityKey (errMsg: string): PubKeyHex {
     if (typeof this.myIdentityKey !== 'string') {
-      throw new Error(errMsg)
+      throw new TypeError(errMsg)
     }
     return this.myIdentityKey
   }

package/src/remittance/modules/BasicBRC29.ts

@@ -1,8 +1,5 @@
-import type {
-  Invoice,
-  RemittanceOptionId,
-  Termination
-} from '../types.js'
+import type { RemittanceOptionId, Termination } from '../types.js'
+
 import type { ModuleContext } from '../types.js'
 import type { RemittanceModule } from '../RemittanceModule.js'
 import type {