@bsv/sdk 2.0.16 → 2.1.1

package/src/wallet/substrates/HTTPWalletJSON.ts

@@ -56,7 +56,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     this.httpClient = httpClient
 
     // Detect if we're in a browser environment
-    const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && window?.origin !== 'file://'
+    const isBrowser = typeof globalThis.window !== 'undefined' && typeof document !== 'undefined' && globalThis.window?.origin !== 'file://'
 
     this.api = async (call: string, args: object) => {
       // In browser environments, let the browser handle Origin header automatically
@@ -66,21 +66,22 @@ export default class HTTPWalletJSON implements WalletInterface {
         : undefined
 
       if (!isBrowser && origin === undefined) {
-        console.error('Originator is required in Node.js environments')
+        throw new Error(
+          'HTTPWalletJSON: originator is required when using the HTTP substrate in Node.js. ' +
+          'Pass an originator (e.g. "example.com") to the constructor.'
+        )
       }
 
-      const res = await (
-        await httpClient(`${this.baseUrl}/${call}`, {
-          method: 'POST',
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(origin ? { Origin: origin } : {}),
-            ...(origin ? { Originator: origin } : {}),
-          },
-          body: JSON.stringify(args)
-        })
-      )
+      const res = await httpClient(`${this.baseUrl}/${call}`, {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(origin ? { Origin: origin } : {}),
+          ...(origin ? { Originator: origin } : {}),
+        },
+        body: JSON.stringify(args)
+      })
 
       const data = await res.json()
 
@@ -152,7 +153,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     keyID?: KeyIDStringUnder800Bytes
     privileged?: BooleanDefaultFalse
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     forSelf?: BooleanDefaultFalse
   }): Promise<{ publicKey: PubKeyHex }> {
     return await this.api('getPublicKey', args) as { publicKey: PubKeyHex }
@@ -216,7 +217,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ ciphertext: Byte[] }> {
     return await this.api('encrypt', args) as { ciphertext: Byte[] }
@@ -228,7 +229,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ plaintext: Byte[] }> {
     return await this.api('decrypt', args) as { plaintext: Byte[] }
@@ -240,7 +241,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ hmac: Byte[] }> {
     return await this.api('createHmac', args) as { hmac: Byte[] }
@@ -253,7 +254,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ valid: true }> {
     return await this.api('verifyHmac', args) as { valid: true }
@@ -266,7 +267,7 @@ export default class HTTPWalletJSON implements WalletInterface {
     protocolID: [SecurityLevel, ProtocolString5To400Bytes]
     keyID: KeyIDStringUnder800Bytes
     privilegedReason?: DescriptionString5to50Bytes
-    counterparty?: PubKeyHex | 'self' | 'anyone'
+    counterparty?: PubKeyHex
     privileged?: BooleanDefaultFalse
   }): Promise<{ signature: Byte[] }> {
     return await this.api('createSignature', args) as { signature: Byte[] }
@@ -280,7 +281,7 @@ export default class HTTPWalletJSON 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/substrates/ReactNativeWebView.ts

@@ -19,16 +19,16 @@ export default class ReactNativeWebView extends InvokableWalletBase {
 
   constructor(domain: string = '*') {
     super()
-    if (typeof window !== 'object') {
-      throw new Error('The XDM substrate requires a global window object.')
+    if (typeof globalThis.window !== 'object') {
+      throw new TypeError('The XDM substrate requires a global window object.')
     }
-    if (!(window as unknown as ReactNativeWindow).hasOwnProperty("ReactNativeWebView")) {
+    if (!(globalThis.window as unknown as ReactNativeWindow).hasOwnProperty("ReactNativeWebView")) {
       throw new Error(
         'The window object does not have a ReactNativeWebView property.'
       )
     }
-    if (typeof (window as unknown as ReactNativeWindow).ReactNativeWebView.postMessage !== 'function') {
-      throw new Error(
+    if (typeof (globalThis.window as unknown as ReactNativeWindow).ReactNativeWebView.postMessage !== 'function') {
+      throw new TypeError(
         'The window.ReactNativeWebView property does not seem to support postMessage calls.'
       )
     }
@@ -47,8 +47,8 @@ export default class ReactNativeWebView extends InvokableWalletBase {
         ) {
           return
         }
-        if (typeof window.removeEventListener === 'function') {
-          window.removeEventListener('message', listener)
+        if (typeof globalThis.window.removeEventListener === 'function') {
+          globalThis.window.removeEventListener('message', listener)
         }
         if (data.status === 'error') {
           const err = new WalletError(data.description, data.code)
@@ -57,8 +57,8 @@ export default class ReactNativeWebView extends InvokableWalletBase {
           resolve(data.result)
         }
       }
-      window.addEventListener('message', listener)
-      ;(window as unknown as ReactNativeWindow).ReactNativeWebView.postMessage(
+      globalThis.window.addEventListener('message', listener)
+      ;(globalThis.window as unknown as ReactNativeWindow).ReactNativeWebView.postMessage(
         JSON.stringify({
           type: 'CWI',
           isInvocation: true,

package/src/wallet/substrates/WalletWireProcessor.ts

@@ -319,26 +319,28 @@ export default class WalletWireProcessor implements WalletWire {
           }
 
           // tx
-          if (createActionResult.tx != null) {
+          if (createActionResult.tx == null) {
+            resultWriter.writeInt8(0)
+          } else {
             resultWriter.writeInt8(1)
             resultWriter.writeVarIntNum(createActionResult.tx.length)
             resultWriter.write(createActionResult.tx)
-          } else {
-            resultWriter.writeInt8(0)
           }
 
           // noSendChange
-          if (createActionResult.noSendChange != null) {
+          if (createActionResult.noSendChange == null) {
+            resultWriter.writeVarIntNum(-1)
+          } else {
             resultWriter.writeVarIntNum(createActionResult.noSendChange.length)
             for (const outpoint of createActionResult.noSendChange) {
               resultWriter.write(this.encodeOutpoint(outpoint))
             }
-          } else {
-            resultWriter.writeVarIntNum(-1)
           }
 
           // sendWithResults
-          if (createActionResult.sendWithResults != null) {
+          if (createActionResult.sendWithResults == null) {
+            resultWriter.writeVarIntNum(-1)
+          } else {
             resultWriter.writeVarIntNum(
               createActionResult.sendWithResults.length
             )
@@ -350,12 +352,12 @@ export default class WalletWireProcessor implements WalletWire {
               else if (result.status === 'failed') statusCode = 3
               resultWriter.writeInt8(statusCode)
             }
-          } else {
-            resultWriter.writeVarIntNum(-1)
           }
 
           // signableTransaction
-          if (createActionResult.signableTransaction != null) {
+          if (createActionResult.signableTransaction == null) {
+            resultWriter.writeInt8(0)
+          } else {
             resultWriter.writeInt8(1)
             resultWriter.writeVarIntNum(
               createActionResult.signableTransaction.tx.length
@@ -367,8 +369,6 @@ export default class WalletWireProcessor implements WalletWire {
             )
             resultWriter.writeVarIntNum(referenceBytes.length)
             resultWriter.write(referenceBytes)
-          } else {
-            resultWriter.writeInt8(0)
           }
 
           // Return success code and result
@@ -474,16 +474,18 @@ export default class WalletWireProcessor implements WalletWire {
           }
 
           // tx
-          if (signActionResult.tx != null) {
+          if (signActionResult.tx == null) {
+            resultWriter.writeInt8(0)
+          } else {
             resultWriter.writeInt8(1)
             resultWriter.writeVarIntNum(signActionResult.tx.length)
             resultWriter.write(signActionResult.tx)
-          } else {
-            resultWriter.writeInt8(0)
           }
 
           // sendWithResults
-          if (signActionResult.sendWithResults != null) {
+          if (signActionResult.sendWithResults == null) {
+            resultWriter.writeVarIntNum(-1)
+          } else {
             resultWriter.writeVarIntNum(
               signActionResult.sendWithResults.length
             )
@@ -495,8 +497,6 @@ export default class WalletWireProcessor implements WalletWire {
               else if (result.status === 'failed') statusCode = 3
               resultWriter.writeInt8(statusCode)
             }
-          } else {
-            resultWriter.writeVarIntNum(-1)
           }
 
           // Return success code and result
@@ -644,15 +644,15 @@ export default class WalletWireProcessor implements WalletWire {
             resultWriter.write(descriptionBytes)
 
             // labels
-            if (action.labels !== undefined) {
+            if (action.labels === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               resultWriter.writeVarIntNum(action.labels.length)
               for (const label of action.labels) {
                 const labelBytes = Utils.toArray(label, 'utf8')
                 resultWriter.writeVarIntNum(labelBytes.length)
                 resultWriter.write(labelBytes)
               }
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
 
             // version
@@ -662,7 +662,9 @@ export default class WalletWireProcessor implements WalletWire {
             resultWriter.writeVarIntNum(action.lockTime)
 
             // inputs
-            if (action.inputs !== undefined) {
+            if (action.inputs === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               resultWriter.writeVarIntNum(action.inputs.length)
               for (const input of action.inputs) {
                 // sourceOutpoint
@@ -672,27 +674,27 @@ export default class WalletWireProcessor implements WalletWire {
                 resultWriter.writeVarIntNum(input.sourceSatoshis)
 
                 // sourceLockingScript
-                if (input.sourceLockingScript !== undefined) {
+                if (input.sourceLockingScript === undefined) {
+                  resultWriter.writeVarIntNum(-1)
+                } else {
                   const sourceLockingScriptBytes = Utils.toArray(
                     input.sourceLockingScript,
                     'hex'
                   )
                   resultWriter.writeVarIntNum(sourceLockingScriptBytes.length)
                   resultWriter.write(sourceLockingScriptBytes)
-                } else {
-                  resultWriter.writeVarIntNum(-1)
                 }
 
                 // unlockingScript
-                if (input.unlockingScript !== undefined) {
+                if (input.unlockingScript === undefined) {
+                  resultWriter.writeVarIntNum(-1)
+                } else {
                   const unlockingScriptBytes = Utils.toArray(
                     input.unlockingScript,
                     'hex'
                   )
                   resultWriter.writeVarIntNum(unlockingScriptBytes.length)
                   resultWriter.write(unlockingScriptBytes)
-                } else {
-                  resultWriter.writeVarIntNum(-1)
                 }
 
                 // inputDescription
@@ -706,12 +708,12 @@ export default class WalletWireProcessor implements WalletWire {
                 // sequenceNumber
                 resultWriter.writeVarIntNum(input.sequenceNumber)
               }
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
 
             // outputs
-            if (action.outputs !== undefined) {
+            if (action.outputs === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               resultWriter.writeVarIntNum(action.outputs.length)
               for (const output of action.outputs) {
                 // outputIndex
@@ -721,15 +723,15 @@ export default class WalletWireProcessor implements WalletWire {
                 resultWriter.writeVarIntNum(output.satoshis)
 
                 // lockingScript
-                if (output.lockingScript !== undefined) {
+                if (output.lockingScript === undefined) {
+                  resultWriter.writeVarIntNum(-1)
+                } else {
                   const lockingScriptBytes = Utils.toArray(
                     output.lockingScript,
                     'hex'
                   )
                   resultWriter.writeVarIntNum(lockingScriptBytes.length)
                   resultWriter.write(lockingScriptBytes)
-                } else {
-                  resultWriter.writeVarIntNum(-1)
                 }
 
                 // spendable
@@ -744,40 +746,38 @@ export default class WalletWireProcessor implements WalletWire {
                 resultWriter.write(outputDescriptionBytes)
 
                 // basket
-                if (output.basket !== undefined) {
+                if (output.basket === undefined) {
+                  resultWriter.writeVarIntNum(-1)
+                } else {
                   const basketBytes = Utils.toArray(output.basket, 'utf8')
                   resultWriter.writeVarIntNum(basketBytes.length)
                   resultWriter.write(basketBytes)
-                } else {
-                  resultWriter.writeVarIntNum(-1)
                 }
 
                 // tags
-                if (output.tags !== undefined) {
+                if (output.tags === undefined) {
+                  resultWriter.writeVarIntNum(-1)
+                } else {
                   resultWriter.writeVarIntNum(output.tags.length)
                   for (const tag of output.tags) {
                     const tagBytes = Utils.toArray(tag, 'utf8')
                     resultWriter.writeVarIntNum(tagBytes.length)
                     resultWriter.write(tagBytes)
                   }
-                } else {
-                  resultWriter.writeVarIntNum(-1)
                 }
 
                 // customInstructions
-                if (output.customInstructions !== undefined) {
+                if (output.customInstructions === undefined) {
+                  resultWriter.writeVarIntNum(-1)
+                } else {
                   const customInstructionsBytes = Utils.toArray(
                     output.customInstructions,
                     'utf8'
                   )
                   resultWriter.writeVarIntNum(customInstructionsBytes.length)
                   resultWriter.write(customInstructionsBytes)
-                } else {
-                  resultWriter.writeVarIntNum(-1)
                 }
               }
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
           }
 
@@ -1000,11 +1000,11 @@ export default class WalletWireProcessor implements WalletWire {
           resultWriter.writeVarIntNum(listOutputsResult.totalOutputs)
 
           // BEEF length and BEEF or -1
-          if (listOutputsResult.BEEF != null) {
+          if (listOutputsResult.BEEF == null) {
+            resultWriter.writeVarIntNum(-1)
+          } else {
             resultWriter.writeVarIntNum(listOutputsResult.BEEF.length)
             resultWriter.write(listOutputsResult.BEEF)
-          } else {
-            resultWriter.writeVarIntNum(-1)
           }
 
           // outputs
@@ -1016,51 +1016,51 @@ export default class WalletWireProcessor implements WalletWire {
             resultWriter.writeVarIntNum(output.satoshis)
 
             // lockingScript
-            if (output.lockingScript !== undefined) {
+            if (output.lockingScript === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               const lockingScriptBytes = Utils.toArray(
                 output.lockingScript,
                 'hex'
               )
               resultWriter.writeVarIntNum(lockingScriptBytes.length)
               resultWriter.write(lockingScriptBytes)
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
 
             // customInstructions
-            if (output.customInstructions !== undefined) {
+            if (output.customInstructions === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               const customInstructionsBytes = Utils.toArray(
                 output.customInstructions,
                 'utf8'
               )
               resultWriter.writeVarIntNum(customInstructionsBytes.length)
               resultWriter.write(customInstructionsBytes)
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
 
             // tags
-            if (output.tags !== undefined) {
+            if (output.tags === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               resultWriter.writeVarIntNum(output.tags.length)
               for (const tag of output.tags) {
                 const tagBytes = Utils.toArray(tag, 'utf8')
                 resultWriter.writeVarIntNum(tagBytes.length)
                 resultWriter.write(tagBytes)
               }
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
 
             // labels
-            if (output.labels !== undefined) {
+            if (output.labels === undefined) {
+              resultWriter.writeVarIntNum(-1)
+            } else {
               resultWriter.writeVarIntNum(output.labels.length)
               for (const label of output.labels) {
                 const labelBytes = Utils.toArray(label, 'utf8')
                 resultWriter.writeVarIntNum(labelBytes.length)
                 resultWriter.write(labelBytes)
               }
-            } else {
-              resultWriter.writeVarIntNum(-1)
             }
           }
 
@@ -1098,7 +1098,25 @@ export default class WalletWireProcessor implements WalletWire {
           const identityKeyFlag = paramsReader.readUInt8()
           args.identityKey = identityKeyFlag === 1
 
-          if (args.identityKey !== true) {
+          if (args.identityKey === true) {
+            // Deserialize privilege parameters
+            const privilegedFlag = paramsReader.readInt8()
+            if (privilegedFlag === -1) {
+              args.privileged = undefined
+            } else {
+              args.privileged = privilegedFlag === 1
+            }
+
+            const privilegedReasonLength = paramsReader.readInt8()
+            if (privilegedReasonLength === -1) {
+              args.privilegedReason = undefined
+            } else {
+              const privilegedReasonBytes = paramsReader.read(
+                privilegedReasonLength
+              )
+              args.privilegedReason = Utils.toUTF8(privilegedReasonBytes)
+            }
+          } else {
             // Deserialize protocolID
             args.protocolID = this.decodeProtocolID(paramsReader)
 
@@ -1117,13 +1135,13 @@ export default class WalletWireProcessor implements WalletWire {
             }
 
             const privilegedReasonLength = paramsReader.readInt8()
-            if (privilegedReasonLength !== -1) {
+            if (privilegedReasonLength === -1) {
+              args.privilegedReason = undefined
+            } else {
               const privilegedReasonBytes = paramsReader.read(
                 privilegedReasonLength
               )
               args.privilegedReason = Utils.toUTF8(privilegedReasonBytes)
-            } else {
-              args.privilegedReason = undefined
             }
 
             // Deserialize forSelf
@@ -1133,24 +1151,6 @@ export default class WalletWireProcessor implements WalletWire {
             } else {
               args.forSelf = forSelfFlag === 1
             }
-          } else {
-            // Deserialize privilege parameters
-            const privilegedFlag = paramsReader.readInt8()
-            if (privilegedFlag === -1) {
-              args.privileged = undefined
-            } else {
-              args.privileged = privilegedFlag === 1
-            }
-
-            const privilegedReasonLength = paramsReader.readInt8()
-            if (privilegedReasonLength !== -1) {
-              const privilegedReasonBytes = paramsReader.read(
-                privilegedReasonLength
-              )
-              args.privilegedReason = Utils.toUTF8(privilegedReasonBytes)
-            } else {
-              args.privilegedReason = undefined
-            }
           }
 
           // Deserialize seekPermission
@@ -2085,7 +2085,7 @@ export default class WalletWireProcessor implements WalletWire {
 
   private decodeCounterparty(
     reader: Utils.Reader
-  ): string | 'self' | 'anyone' | undefined {
+  ): string | undefined {
     const counterpartyFlag = reader.readUInt8()
     if (counterpartyFlag === 11) {
       return 'self'