@bsv/sdk 2.1.0 → 2.1.2

package/src/transaction/MerklePath.ts

@@ -331,7 +331,7 @@ export default class MerklePath {
     const l = offset << 1
 
     const leaf0 = this.findOrComputeLeaf(h, l)
-    if (leaf0 == null || leaf0.hash == null || leaf0.hash === '') return undefined
+    if (leaf0?.hash == null || leaf0.hash === '') return undefined
 
     const leaf1 = this.findOrComputeLeaf(h, l + 1)
     if (leaf1?.hash == null) {
@@ -431,7 +431,7 @@ export default class MerklePath {
    */
   trim (): void {
     const pushIfNew = (v: number, a: number[]): void => {
-      if (a.length === 0 || a.slice(-1)[0] !== v) {
+      if (a.length === 0 || a.at(-1) !== v) {
         a.push(v)
       }
     }
@@ -457,9 +457,9 @@ export default class MerklePath {
 
     let computedOffsets: number[] = [] // in next level
     let dropOffsets: number[] = []
-    for (let h = 0; h < this.path.length; h++) {
+    for (const level of this.path) {
       // Sort each level by increasing offset order
-      this.path[h].sort((a, b) => a.offset - b.offset)
+      level.sort((a, b) => a.offset - b.offset)
     }
     for (let l = 0; l < this.path[0].length; l++) {
       const n = this.path[0][l]

package/src/transaction/Transaction.ts

@@ -17,6 +17,7 @@ import { Beef, BEEF_V1 } from './Beef.js'
 import P2PKH from '../script/templates/P2PKH.js'
 import type { WalletInterface, DescriptionString5to50Bytes, CreateActionOptions } from '../wallet/Wallet.interfaces.js'
 import TransactionSignature from '../primitives/TransactionSignature.js'
+import Random from '../primitives/Random.js'
 
 /**
  * Represents a complete Bitcoin transaction. This class encapsulates all the details
@@ -79,7 +80,7 @@ export default class Transaction {
     if (typeof obj.pathIndex === 'number') {
       const path = BUMPs[obj.pathIndex]
       if (typeof path !== 'object') {
-        throw new Error('Invalid merkle path index found in BEEF!')
+        throw new TypeError('Invalid merkle path index found in BEEF!')
       }
       obj.tx.merklePath = path
     } else {
@@ -89,7 +90,7 @@ export default class Transaction {
         }
         const sourceObj = transactions[input.sourceTXID]
         if (typeof sourceObj !== 'object') {
-          throw new Error(
+          throw new TypeError(
             `Reference to unknown TXID in BEEF: ${input.sourceTXID ?? 'undefined'}`
           )
         }
@@ -123,10 +124,10 @@ export default class Transaction {
   static fromAtomicBEEF (beef: number[] | Uint8Array): Transaction {
     const { tx, txid, beef: b } = Transaction.fromAnyBeef(beef)
     if (txid !== b.atomicTxid) {
-      if (b.atomicTxid != null) {
-        throw new Error(`Transaction with TXID ${b.atomicTxid} not found in BEEF data.`)
-      } else {
+      if (b.atomicTxid == null) {
         throw new Error('beef must conform to BRC-95 and must contain the subject txid.')
+      } else {
+        throw new Error(`Transaction with TXID ${b.atomicTxid} not found in BEEF data.`)
       }
     }
     return tx
@@ -137,13 +138,17 @@ export default class Transaction {
     if (b.txs.length < 1) {
       throw new Error('beef must include at least one transaction.')
     }
-    const target = txid ?? b.atomicTxid ?? b.txs.slice(-1)[0].txid
+    const lastTx = b.txs.at(-1)
+    if (lastTx == null) {
+      throw new Error('beef must include at least one transaction.')
+    }
+    const target = txid ?? b.atomicTxid ?? lastTx.txid
     const tx = b.findAtomicTransaction(target)
     if (tx == null) {
-      if (txid != null) {
-        throw new Error(`Transaction with TXID ${target} not found in BEEF data.`)
-      } else {
+      if (txid == null) {
         throw new Error('beef does not contain transaction for atomic txid.')
+      } else {
+        throw new Error(`Transaction with TXID ${String(target)} not found in BEEF data.`)
       }
     }
     return { tx, beef: b, txid: target }
@@ -172,7 +177,7 @@ export default class Transaction {
       const lockingScriptBin = br.read(lockingScriptLength)
       const lockingScript = LockingScript.fromBinary(lockingScriptBin)
       const sourceTransaction = new Transaction(undefined, [], [], undefined)
-      sourceTransaction.outputs = Array(sourceOutputIndex + 1).fill(null)
+      sourceTransaction.outputs = new Array(sourceOutputIndex + 1).fill(null)
       sourceTransaction.outputs[sourceOutputIndex] = {
         satoshis,
         lockingScript
@@ -364,17 +369,15 @@ export default class Transaction {
    */
   addInput (input: TransactionInput): void {
     if (
-      typeof input.sourceTXID === 'undefined' &&
-      typeof input.sourceTransaction === 'undefined'
+      input.sourceTXID === undefined &&
+      input.sourceTransaction === undefined
     ) {
-      throw new Error(
+      throw new TypeError(
         'A reference to an an input transaction is required. If the input transaction itself cannot be referenced, its TXID must still be provided.'
       )
     }
     // If the input sequence number hasn't been set, the expectation is that it is final.
-    if (typeof input.sequence === 'undefined') {
-      input.sequence = 0xffffffff
-    }
+    input.sequence ??= 0xffffffff
     this.invalidateSerializationCaches()
     this.inputs.push(input)
   }
@@ -387,8 +390,8 @@ export default class Transaction {
   addOutput (output: TransactionOutput): void {
     this.cachedHash = undefined
     if (output.change !== true) {
-      if (typeof output.satoshis === 'undefined') {
-        throw new Error(
+      if (output.satoshis === undefined) {
+        throw new TypeError(
           'either satoshis must be defined or change must be set to true'
         )
       }
@@ -407,7 +410,7 @@ export default class Transaction {
    */
   addP2PKHOutput (address: number[] | string, satoshis?: number): void {
     const lockingScript = new P2PKH().lock(address)
-    if (typeof satoshis === 'undefined') {
+    if (satoshis === undefined) {
       return this.addOutput({ lockingScript, change: true })
     }
     this.addOutput({
@@ -462,7 +465,7 @@ export default class Transaction {
     let change = 0
     for (const input of this.inputs) {
       if (typeof input.sourceTransaction !== 'object') {
-        throw new Error(
+        throw new TypeError(
           'Source transactions are required for all inputs during fee computation'
         )
       }
@@ -492,11 +495,11 @@ export default class Transaction {
       distributedChange = this.distributeEqualChange(change, changeOutputs)
     }
     if (distributedChange < change) {
-      const lastOutput = this.outputs[this.outputs.length - 1]
-      if (lastOutput.satoshis !== undefined) {
-        lastOutput.satoshis += change - distributedChange
-      } else {
+      const lastOutput = this.outputs.at(-1)
+      if (lastOutput.satoshis === undefined) {
         lastOutput.satoshis = change - distributedChange
+      } else {
+        lastOutput.satoshis += change - distributedChange
       }
     }
   }
@@ -507,7 +510,7 @@ export default class Transaction {
   ): number {
     let distributedChange = 0
     let changeToUse = change
-    const benfordNumbers = Array(changeOutputs.length).fill(1)
+    const benfordNumbers = new Array(changeOutputs.length).fill(1)
     changeToUse -= changeOutputs.length
     distributedChange += changeOutputs.length
     for (let i = 0; i < changeOutputs.length - 1; i++) {
@@ -536,7 +539,7 @@ export default class Transaction {
   }
 
   private benfordNumber (min: number, max: number): number {
-    const d = Math.floor(Math.random() * 9) + 1
+    const d = Random(1)[0] % 9 + 1
     return Math.floor(
       min + ((max - min) * Math.log10(1 + 1 / d)) / Math.log10(10)
     )
@@ -551,7 +554,7 @@ export default class Transaction {
     let totalIn = 0
     for (const input of this.inputs) {
       if (typeof input.sourceTransaction !== 'object') {
-        throw new Error(
+        throw new TypeError(
           'Source transactions or sourceSatoshis are required for all inputs to calculate fee'
         )
       }
@@ -571,7 +574,7 @@ export default class Transaction {
   async sign (): Promise<void> {
     this.invalidateSerializationCaches()
     for (const out of this.outputs) {
-      if (typeof out.satoshis === 'undefined') {
+      if (out.satoshis === undefined) {
         if (out.change === true) {
           throw new Error(
             'There are still change outputs with uncomputed amounts. Use the fee() method to compute the change amounts and transaction fees prior to signing.'
@@ -615,11 +618,11 @@ export default class Transaction {
     writer.writeUInt32LE(this.version)
     writer.writeVarIntNum(this.inputs.length)
     for (const i of this.inputs) {
-      if (typeof i.sourceTXID === 'undefined') {
-        if (i.sourceTransaction != null) {
-          writer.write(i.sourceTransaction.hash() as number[])
-        } else {
+      if (i.sourceTXID === undefined) {
+        if (i.sourceTransaction == null) {
           throw new Error('sourceTransaction is undefined')
+        } else {
+          writer.write(i.sourceTransaction.hash() as number[])
         }
       } else {
         writer.writeReverse(toArray(i.sourceTXID, 'hex'))
@@ -650,9 +653,7 @@ export default class Transaction {
   }
 
   private getSerializedBytes (): Uint8Array {
-    if (this.rawBytesCache == null) {
-      this.rawBytesCache = this.buildSerializedBytes()
-    }
+    this.rawBytesCache ??= this.buildSerializedBytes()
     return this.rawBytesCache
   }
 
@@ -674,12 +675,12 @@ export default class Transaction {
     writer.write([0, 0, 0, 0, 0, 0xef])
     writer.writeVarIntNum(this.inputs.length)
     for (const i of this.inputs) {
-      if (typeof i.sourceTransaction === 'undefined') {
-        throw new Error(
+      if (i.sourceTransaction === undefined) {
+        throw new TypeError(
           'All inputs must have source transactions when serializing to EF format'
         )
       }
-      if (typeof i.sourceTXID === 'undefined') {
+      if (i.sourceTXID === undefined) {
         writer.write(i.sourceTransaction.hash() as number[])
       } else {
         writer.write(toArray(i.sourceTXID, 'hex').reverse() as number[])
@@ -783,9 +784,7 @@ export default class Transaction {
    * @returns {string | number[]} - The hash of the transaction in the specified format.
    */
   hash (enc?: 'hex'): number[] | string {
-    if (this.cachedHash == null) {
-      this.cachedHash = hash256(this.getSerializedBytes())
-    }
+    this.cachedHash ??= hash256(this.getSerializedBytes())
     if (enc === 'hex') {
       return toHex(this.cachedHash)
     }
@@ -866,7 +865,7 @@ export default class Transaction {
       }
 
       // Verify fee if feeModel is provided
-      if (typeof feeModel !== 'undefined') {
+      if (feeModel !== undefined) {
         if (tx === undefined) {
           throw new Error('Transaction is undefined')
         }
@@ -890,12 +889,12 @@ export default class Transaction {
       for (let i = 0; i < tx.inputs.length; i++) {
         const input = tx.inputs[i]
         if (typeof input.sourceTransaction !== 'object') {
-          throw new Error(
+          throw new TypeError(
             `Verification failed because the input at index ${i} of transaction ${txid} is missing an associated source transaction. This source transaction is required for transaction verification because there is no merkle proof for the transaction spending a UTXO it contains.`
           )
         }
         if (typeof input.unlockingScript !== 'object') {
-          throw new Error(
+          throw new TypeError(
             `Verification failed because the input at index ${i} of transaction ${txid} is missing an associated unlocking script. This script is required for transaction verification because there is no merkle proof for the transaction spending the UTXO.`
           )
         }
@@ -909,9 +908,7 @@ export default class Transaction {
         }
 
         const otherInputs = tx.inputs.filter((_, idx) => idx !== i)
-        if (typeof input.sourceTXID === 'undefined') {
-          input.sourceTXID = sourceTxid
-        }
+        input.sourceTXID ??= sourceTxid
 
         const spend = new Spend({
           sourceTXID: input.sourceTXID,
@@ -938,7 +935,7 @@ export default class Transaction {
       let outputTotal = 0
       for (const out of tx.outputs) {
         if (typeof out.satoshis !== 'number') {
-          throw new Error(
+          throw new TypeError(
             'Every output must have a defined amount during transaction verification.'
           )
         }
@@ -1240,14 +1237,14 @@ export default class Transaction {
       }
 
       // Extract options that apply to signAction (subset of CreateActionOptions)
-      const signActionOptions: SignActionOptions | undefined = options != null
-        ? {
+      const signActionOptions: SignActionOptions | undefined = options == null
+        ? undefined
+        : {
             acceptDelayedBroadcast: options.acceptDelayedBroadcast,
             returnTXIDOnly: options.returnTXIDOnly,
             noSend: options.noSend,
             sendWith: options.sendWith
           }
-        : undefined
 
       // Call signAction with the generated unlocking scripts
       const signResult = await wallet.signAction({

package/src/transaction/fee-models/SatoshisPerKilobyte.ts

@@ -53,7 +53,7 @@ export default class SatoshisPerKilobyte implements FeeModel {
           i
         )
       } else {
-        throw new Error(
+        throw new TypeError(
           'All inputs must have an unlocking script or an unlocking script template for sat/kb fee computation.'
         )
       }

package/src/transaction/http/BinaryFetchClient.ts

@@ -98,23 +98,23 @@ export function binaryHttpClient(): HttpClient {
     }
   }
 
-  if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+  if (globalThis.window !== undefined && typeof globalThis.window.fetch === 'function') {
     // Browser tab/page context
-    return new BinaryFetchClient(window.fetch.bind(window))
+    return new BinaryFetchClient(globalThis.window.fetch.bind(globalThis.window))
   } else if (typeof globalThis.fetch === 'function') {
     // Service workers, Deno, Node 18+ (any environment with global fetch)
     return new BinaryFetchClient(globalThis.fetch.bind(globalThis))
-  } else if (typeof require !== 'undefined') {
+  } else if (typeof require === 'undefined') {
+    return noHttpClient
+  } else {
     // Older Node.js — use https module
-    // eslint-disable-next-line
     try {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const https = require('https')
+      const https = require('node:https')
       return new BinaryNodejsHttpClient(https)
-    } catch (e) {
+    } catch (_httpsModuleUnavailable) {
+      // node:https not available in this runtime; fall through to noHttpClient
       return noHttpClient
     }
-  } else {
-    return noHttpClient
   }
 }

package/src/transaction/http/DefaultHttpClient.ts

@@ -14,23 +14,23 @@ export function defaultHttpClient(): HttpClient {
     }
   }
 
-  if (typeof window !== 'undefined' && typeof window.fetch === 'function') {
+  if (globalThis.window !== undefined && typeof globalThis.window.fetch === 'function') {
     // Browser tab/page context
-    return new FetchHttpClient(window.fetch.bind(window))
+    return new FetchHttpClient(globalThis.window.fetch.bind(globalThis.window))
   } else if (typeof globalThis.fetch === 'function') {
     // Service workers, Deno, Node 18+ (any environment with global fetch)
     return new FetchHttpClient(globalThis.fetch.bind(globalThis))
-  } else if (typeof require !== 'undefined') {
+  } else if (typeof require === 'undefined') {
+    return noHttpClient
+  } else {
     // Older Node.js — use https module
-    // eslint-disable-next-line
     try {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const https = require('https')
+      const https = require('node:https')
       return new NodejsHttpClient(https)
-    } catch (e) {
+    } catch (_httpsModuleUnavailable) {
+      // node:https not available in this runtime; fall through to noHttpClient
       return noHttpClient
     }
-  } else {
-    return noHttpClient
   }
 }

package/src/wallet/CachedKeyDeriver.ts

@@ -2,6 +2,8 @@ import { Point, PrivateKey, PublicKey, SymmetricKey } from '../primitives/index.
 import { Counterparty, KeyDeriver, KeyDeriverApi } from './KeyDeriver.js'
 import { WalletProtocol } from './Wallet.interfaces.js'
 
+type CachedKeyValue = PublicKey | PrivateKey | SymmetricKey | Point | number[]
+
 /**
  * A cached version of KeyDeriver that caches the results of key derivation methods.
  * This is useful for optimizing performance when the same keys are derived multiple times.
@@ -9,7 +11,7 @@ import { WalletProtocol } from './Wallet.interfaces.js'
  */
 export default class CachedKeyDeriver implements KeyDeriverApi {
   private readonly keyDeriver: KeyDeriver
-  private readonly cache: Map<string, PublicKey | PrivateKey | SymmetricKey | Point | number[]>
+  private readonly cache: Map<string, CachedKeyValue>
   private readonly maxCacheSize: number
 
   /**
@@ -47,9 +49,9 @@ export default class CachedKeyDeriver implements KeyDeriverApi {
       }
     )
     this.identityKey = this.rootKey.toPublicKey().toString()
-    this.cache = new Map<string, PublicKey | PrivateKey | SymmetricKey | Point | number[]>()
+    this.cache = new Map<string, CachedKeyValue>()
     const maxCacheSize = options?.maxCacheSize
-    this.maxCacheSize = (maxCacheSize != null && !isNaN(maxCacheSize) && maxCacheSize > 0) ? maxCacheSize : 1000
+    this.maxCacheSize = (maxCacheSize != null && !Number.isNaN(maxCacheSize) && maxCacheSize > 0) ? maxCacheSize : 1000
   }
 
   /**
@@ -252,7 +254,7 @@ export default class CachedKeyDeriver implements KeyDeriverApi {
     } else if (typeof arg === 'object' && arg !== null) {
       return JSON.stringify(arg)
     } else {
-      return String(arg)
+      return String(arg as string | number | boolean)
     }
   }
 
@@ -261,7 +263,7 @@ export default class CachedKeyDeriver implements KeyDeriverApi {
    * @param {string} cacheKey - The key of the cached item.
    * @returns {any} - The cached value.
    */
-  private cacheGet (cacheKey: string): PublicKey | PrivateKey | SymmetricKey | Point | number[] | undefined {
+  private cacheGet (cacheKey: string): CachedKeyValue | undefined {
     const value = this.cache.get(cacheKey)
     // Update the entry to reflect recent use
     this.cache.delete(cacheKey)
@@ -276,7 +278,7 @@ export default class CachedKeyDeriver implements KeyDeriverApi {
    * @param {string} cacheKey - The key of the item to cache.
    * @param {any} value - The value to cache.
    */
-  private cacheSet (cacheKey: string, value: PublicKey | PrivateKey | SymmetricKey | Point | number[]): void {
+  private cacheSet (cacheKey: string, value: CachedKeyValue): void {
     if (this.cache.size >= this.maxCacheSize) {
       // Evict the least recently used item (first item in Map)
       const firstKey = this.cache.keys().next().value

package/src/wallet/KeyDeriver.ts

@@ -8,7 +8,7 @@ import {
 } from '../primitives/index.js'
 import { WalletProtocol, PubKeyHex } from './Wallet.interfaces.js'
 
-export type Counterparty = PublicKey | PubKeyHex | 'self' | 'anyone'
+export type Counterparty = PublicKey | PubKeyHex
 
 export interface KeyDeriverApi {
   /**

package/src/wallet/Wallet.interfaces.ts

@@ -216,11 +216,11 @@ export type SecurityLevel = 0 | 1 | 2
 
 export type WalletProtocol = [SecurityLevel, ProtocolString5To400Bytes]
 
-export type WalletCounterparty = PubKeyHex | 'self' | 'anyone'
+export type WalletCounterparty = PubKeyHex
 
 export type AcquisitionProtocol = 'direct' | 'issuance'
 
-export type KeyringRevealer = PubKeyHex | 'certifier'
+export type KeyringRevealer = PubKeyHex
 
 export type ActionStatus =
   | 'completed'
@@ -412,8 +412,23 @@ export interface AbortActionArgs {
   reference: Base64String
 }
 
+/**
+ * Result of an `abortAction` call.
+ *
+ * `aborted` is informative: `true` indicates the wallet successfully invalidated
+ * the action (it will not be broadcast and its inputs are released), `false`
+ * indicates the wallet refused to abort because the underlying transaction was
+ * found to already be on chain (mined or known to mempool). On a refusal the
+ * caller should typically invoke `internalizeAction` instead, which will treat
+ * the call as explicit authorization to advance the nosend lifecycle.
+ *
+ * Note that confirming on-chain status requires network reachability. When
+ * confirmation is impossible (services unreachable or returning errors), the
+ * wallet proceeds with the abort and returns `aborted: true` rather than
+ * refusing — refusal is reserved for positive on-chain confirmation.
+ */
 export interface AbortActionResult {
-  aborted: true
+  aborted: boolean
 }
 
 export type AcquireCertificateResult = WalletCertificate
@@ -935,8 +950,6 @@ export interface DiscoverByAttributesArgs {
   seekPermission?: BooleanDefaultTrue
 }
 
-// export interface AcquireCertificateResult extends WalletCertificate {}
-
 /**
  * Every method of the `Wallet` interface has a return value of the form `Promise<object>`.
  * When errors occur, an exception object may be thrown which must conform to the `WalletErrorObject` interface.

package/src/wallet/WalletClient.ts

@@ -131,7 +131,7 @@ export default class WalletClient implements WalletInterface {
     const fastResults = await Promise.allSettled(fastAttempts)
     const fastSuccessful = fastResults
       .filter((r): r is PromiseFulfilledResult<{ success: boolean, sub?: WalletInterface }> => r.status === 'fulfilled' && r.value.success && r.value.sub !== undefined)
-      .map(r => r.value.sub as WalletInterface)
+      .map(r => r.value.sub)
 
     if (fastSuccessful.length > 0) {
       this.substrate = fastSuccessful[0]
@@ -169,7 +169,7 @@ export default class WalletClient implements WalletInterface {
 
   async abortAction (args: {
     reference: Base64String
-  }): Promise<{ aborted: true }> {
+  }): Promise<{ aborted: boolean }> {
     validateAbortActionArgs(args)
     await this.connectToSubstrate()
     return await (this.substrate as WalletInterface).abortAction(
@@ -225,7 +225,7 @@ export default class WalletClient implements WalletInterface {
     keyID?: KeyIDStringUnder800Bytes
     privileged?: BooleanDefaultFalse
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     forSelf?: BooleanDefaultFalse
   }): Promise<{ publicKey: PubKeyHex }> {
     await this.connectToSubstrate()
@@ -283,7 +283,7 @@ export default class WalletClient implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ ciphertext: Byte[] }> {
     await this.connectToSubstrate()
@@ -298,7 +298,7 @@ export default class WalletClient implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ plaintext: Byte[] }> {
     await this.connectToSubstrate()
@@ -313,7 +313,7 @@ export default class WalletClient implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ hmac: Byte[] }> {
     await this.connectToSubstrate()
@@ -329,7 +329,7 @@ export default class WalletClient implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ valid: true }> {
     await this.connectToSubstrate()
@@ -345,7 +345,7 @@ export default class WalletClient implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ signature: Byte[] }> {
     await this.connectToSubstrate()
@@ -362,7 +362,7 @@ export default class WalletClient implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     forSelf?: BooleanDefaultFalse
     privileged?: BooleanDefaultFalse
   }): Promise<{ valid: true }> {

package/src/wallet/WalletError.ts

@@ -25,7 +25,7 @@ export class WalletError extends Error {
    * @returns stringified JSON representation of the error such that it can be deserialized to a WalletError.
    */
   static unknownToJson (error: any): string {
-    let e: any | undefined
+    let e: any
     if (error.isError === true && String(error.name).startsWith('WERR_')) {
       e = {
         name: error.name,

package/src/wallet/__tests/WalletClient.substrate.test.ts

@@ -749,11 +749,15 @@ describe('WalletClient.listOutputs – substrate delegation', () => {
 
 describe('WalletClient.connectToSubstrate – error when no substrate available', () => {
   it('throws a descriptive error when auto-substrate fails to connect', async () => {
-    // The 'auto' substrate string means connectToSubstrate will try real substrates.
-    // All of them will fail in a test environment, so an error should be thrown.
-    const client = new WalletClient('auto', 'test.origin')
-    await expect(client.connectToSubstrate()).rejects.toThrow(
-      'No wallet available over any communication substrate'
-    )
+    const fetchSpy = jest.spyOn(globalThis, 'fetch').mockRejectedValue(new Error('No test wallet available'))
+
+    try {
+      const client = new WalletClient('auto', 'test.origin')
+      await expect(client.connectToSubstrate()).rejects.toThrow(
+        'No wallet available over any communication substrate'
+      )
+    } finally {
+      fetchSpy.mockRestore()
+    }
   }, 10000)
 })