@bsv/sdk 2.1.0 → 2.1.2

package/src/wallet/substrates/window.CWI.ts

@@ -40,12 +40,12 @@ export default class WindowCWISubstrate implements WalletInterface {
   private readonly CWI: WalletInterface
   constructor() {
     if (typeof window !== 'object') {
-      throw new Error(
+      throw new TypeError(
         'The window.CWI substrate requires a global window object.'
       )
     }
     if (typeof window.CWI !== 'object') {
-      throw new Error(
+      throw new TypeError(
         'The window.CWI interface does not appear to be bound to the window object.'
       )
     }
@@ -130,7 +130,7 @@ export default class WindowCWISubstrate implements WalletInterface {
   async abortAction(
     args: { reference: Base64String },
     originator?: OriginatorDomainNameStringUnder250Bytes
-  ): Promise<{ aborted: true }> {
+  ): Promise<{ aborted: boolean }> {
     return await this.CWI.abortAction(args, originator)
   }
 
@@ -258,7 +258,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       keyID?: KeyIDStringUnder800Bytes
       privileged?: BooleanDefaultFalse
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       forSelf?: BooleanDefaultFalse
     },
     originator?: OriginatorDomainNameStringUnder250Bytes
@@ -314,7 +314,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       protocolID: [SecurityLevel, ProtocolString5To400Bytes]
       keyID: KeyIDStringUnder800Bytes
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       privileged?: BooleanDefaultFalse
     },
     originator?: OriginatorDomainNameStringUnder250Bytes
@@ -328,7 +328,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       protocolID: [SecurityLevel, ProtocolString5To400Bytes]
       keyID: KeyIDStringUnder800Bytes
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       privileged?: BooleanDefaultFalse
     },
     originator?: OriginatorDomainNameStringUnder250Bytes
@@ -342,7 +342,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       protocolID: [SecurityLevel, ProtocolString5To400Bytes]
       keyID: KeyIDStringUnder800Bytes
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       privileged?: BooleanDefaultFalse
     },
     originator?: OriginatorDomainNameStringUnder250Bytes
@@ -357,7 +357,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       protocolID: [SecurityLevel, ProtocolString5To400Bytes]
       keyID: KeyIDStringUnder800Bytes
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       privileged?: BooleanDefaultFalse
     },
     originator?: OriginatorDomainNameStringUnder250Bytes
@@ -372,7 +372,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       protocolID: [SecurityLevel, ProtocolString5To400Bytes]
       keyID: KeyIDStringUnder800Bytes
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       privileged?: BooleanDefaultFalse
     },
     originator?: OriginatorDomainNameStringUnder250Bytes
@@ -388,7 +388,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       protocolID: [SecurityLevel, ProtocolString5To400Bytes]
       keyID: KeyIDStringUnder800Bytes
       privilegedReason?: DescriptionString5to50Bytes
-      counterparty?: PubKeyHex | 'self' | 'anyone'
+      counterparty?: PubKeyHex
       forSelf?: BooleanDefaultFalse
       privileged?: BooleanDefaultFalse
     },
@@ -406,7 +406,7 @@ export default class WindowCWISubstrate implements WalletInterface {
       signature: HexString
       fields: Record<CertificateFieldNameUnder50Bytes, string>
       certifier: PubKeyHex
-      keyringRevealer: PubKeyHex | 'certifier'
+      keyringRevealer: PubKeyHex
       keyringForSubject: Record<CertificateFieldNameUnder50Bytes, Base64String>
       acquisitionProtocol: 'direct' | 'issuance'
       certifierUrl?: string

package/src/wallet/validationHelpers.ts

@@ -274,7 +274,7 @@ export function validateBase64String (s: string, name: string, min?: number, max
 
   let paddingCount = 0
   for (let i = 0; i < s.length; i++) {
-    const char = s.charCodeAt(i)
+    const char = s.codePointAt(i) ?? 0
     if (char >= 65 && char <= 90) continue // A-Z
     if (char >= 97 && char <= 122) continue // a-z
     if (char >= 48 && char <= 57) continue // 0-9
@@ -392,7 +392,7 @@ export interface ValidCreateActionInput {
 export function validateCreateActionInput (i: CreateActionInput): ValidCreateActionInput {
   if (i.unlockingScript === undefined && i.unlockingScriptLength === undefined) { throw new WERR_INVALID_PARAMETER('unlockingScript, unlockingScriptLength', 'at least one valid value.') }
   const unlockingScript = validateOptionalHexString(i.unlockingScript, 'unlockingScript')
-  const unlockingScriptLength = i.unlockingScriptLength ?? (unlockingScript != null ? unlockingScript.length / 2 : 0)
+  const unlockingScriptLength = i.unlockingScriptLength ?? (unlockingScript == null ? 0 : unlockingScript.length / 2)
   if (unlockingScript && unlockingScriptLength !== unlockingScript.length / 2) { throw new WERR_INVALID_PARAMETER('unlockingScriptLength', 'length unlockingScript if both valid.') }
   const vi: ValidCreateActionInput = {
     outpoint: parseWalletOutpoint(i.outpoint),
@@ -439,7 +439,7 @@ export function validateCreateActionOutput (o: CreateActionOutput): ValidCreateA
  * @returns ValidCreateActionOptions with defaults applied
  */
 export function validateCreateActionOptions (options?: CreateActionOptions): ValidCreateActionOptions {
-  const o = options != null ? options : {}
+  const o = options ?? {}
   const vo: ValidCreateActionOptions = {
     signAndProcess: defaultTrue(o.signAndProcess),
     acceptDelayedBroadcast: defaultTrue(o.acceptDelayedBroadcast),
@@ -566,7 +566,7 @@ export function validateCreateActionArgs (args: CreateActionArgs, logger?: Walle
  * Convert string outpoints to `{ txid: string, vout: number }`
  */
 export function validateSignActionOptions (options?: SignActionOptions): ValidSignActionOptions {
-  const o = options != null ? options : {}
+  const o = options ?? {}
   const vo: ValidSignActionOptions = {
     acceptDelayedBroadcast: defaultTrue(o.acceptDelayedBroadcast),
     returnTXIDOnly: defaultFalse(o.returnTXIDOnly),
@@ -657,7 +657,7 @@ export function validateBasketInsertion (args?: BasketInsertion): ValidBasketIns
   if (args === undefined) return undefined
   const v: ValidBasketInsertion = {
     basket: validateBasket(args.basket),
-    customInstructions: validateOptionalStringLength(args.customInstructions, 'customInstructions', 0, 1000), // TODO: real max??
+    customInstructions: validateOptionalStringLength(args.customInstructions, 'customInstructions', 0, 1000),
     tags: defaultEmpty(args.tags).map(t => validateTag(t))
   }
   return v
@@ -724,7 +724,7 @@ export function validateInternalizeActionArgs (args: InternalizeActionArgs): Val
     tx: args.tx,
     outputs: args.outputs.map(o => validateInternalizeOutput(o)),
     description: validateStringLength(args.description, 'description', 5, 2000),
-    labels: (args.labels != null ? args.labels : []).map(t => validateLabel(t)),
+    labels: (args.labels ?? []).map(t => validateLabel(t)),
     seekPermission: defaultTrue(args.seekPermission)
   }
 
@@ -1126,7 +1126,7 @@ export function validateListOutputsArgs (args: ListOutputsArgs): ValidListOutput
 
   const vargs: ValidListOutputsArgs = {
     basket: validateBasket(args.basket),
-    tags: (args.tags != null ? args.tags : []).map(t => validateTag(t)),
+    tags: (args.tags ?? []).map(t => validateTag(t)),
     tagQueryMode,
     includeLockingScripts: args.include === 'locking scripts',
     includeTransactions: args.include === 'entire transactions',
@@ -1134,7 +1134,7 @@ export function validateListOutputsArgs (args: ListOutputsArgs): ValidListOutput
     includeTags: defaultFalse(args.includeTags),
     includeLabels: defaultFalse(args.includeLabels),
     limit: validateInteger(args.limit, 'limit', 10, 1, 10000),
-    offset: validateInteger(args.offset, 'offset', 0, undefined, undefined),
+    offset: validateInteger(args.offset, 'offset', 0),
     seekPermission: defaultTrue(args.seekPermission),
     knownTxids: []
   }
@@ -1176,7 +1176,7 @@ export function validateListActionsArgs (args: ListActionsArgs): ValidListAction
   else throw new WERR_INVALID_PARAMETER('labelQueryMode', 'undefined, \'any\', or \'all\'')
 
   const vargs: ValidListActionsArgs = {
-    labels: (args.labels != null ? args.labels : []).map(t => validateLabel(t)),
+    labels: (args.labels ?? []).map(t => validateLabel(t)),
     labelQueryMode,
     includeLabels: defaultFalse(args.includeLabels),
     includeInputs: defaultFalse(args.includeInputs),