@bsv/sdk 1.3.25 → 1.3.27

package/package.json

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

package/src/auth/clients/AuthFetch.ts

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import { Utils, Random, P2PKH, PublicKey, WalletInterface } from '../../../mod.js'
+import { Utils, Random, P2PKH, PublicKey, WalletInterface, createNonce } from '../../../mod.js'
 import { Peer } from '../Peer.js'
 import { SimplifiedFetchTransport } from '../transports/SimplifiedFetchTransport.js'
 import { SessionManager } from '../SessionManager.js'
@@ -329,6 +329,19 @@ export class AuthFetch {
       writer.write(headerValueAsArray)
     }
 
+    // If method typically carries a body and body is undefined, default it
+    // This prevents signature verification errors due to mismatch default body types with express
+    const methodsThatTypicallyHaveBody = ['POST', 'PUT', 'PATCH', 'DELETE']
+    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')) {
+        body = '{}'
+      } else {
+        body = ''
+      }
+    }
+
     // Handle body
     if (body) {
       const reqBody = await this.normalizeBodyToNumberArray(body) // Use the utility function
@@ -397,15 +410,15 @@ export class AuthFetch {
     }
 
     // Create a random suffix for the derivation path
-    const derivationSuffix = Utils.toBase64(Random(10))
+    const derivationSuffix = await createNonce(this.wallet)
 
     // Derive the script hex from the server identity key
     const { publicKey: derivedPublicKey } = await this.wallet.getPublicKey({
-      protocolID: [2, 'wallet payment'],
+      protocolID: [2, '3241645161d8'], // wallet payment protocol
       keyID: `${derivationPrefix} ${derivationSuffix}`,
       counterparty: serverIdentityKey
     })
-    const lockingScript = new P2PKH().lock(PublicKey.fromString(derivedPublicKey).toHash()).toHex()
+    const lockingScript = new P2PKH().lock(PublicKey.fromString(derivedPublicKey).toAddress()).toHex()
 
     // Create the payment transaction using createAction
     const { tx } = await this.wallet.createAction({
@@ -421,6 +434,7 @@ export class AuthFetch {
     config.headers = config.headers || {}
     config.headers['x-bsv-payment'] = JSON.stringify({
       derivationPrefix,
+      derivationSuffix,
       transaction: Utils.toBase64(tx)
     })
     config.retryCounter ??= 3
@@ -430,11 +444,16 @@ export class AuthFetch {
   }
 
   private async normalizeBodyToNumberArray(body: BodyInit | null | undefined): Promise<number[]> {
-    // 1. Null / undefined
+    // 0. Null / undefined
     if (body == null) {
       return []
     }
 
+    // 1. object
+    if (typeof body === 'object') {
+      return Utils.toArray(JSON.stringify(body, 'utf8'))
+    }
+
     // 2. number[]
     if (Array.isArray(body) && body.every((item) => typeof item === 'number')) {
       return body // Return the array as is

package/src/auth/utils/createNonce.ts

@@ -2,7 +2,8 @@ import {
   Utils,
   Random,
   WalletInterface,
-  WalletCounterparty
+  WalletCounterparty,
+  Base64String
 } from '../../../mod.js'
 
 /**
@@ -14,7 +15,7 @@ import {
 export async function createNonce(
   wallet: WalletInterface,
   counterparty: WalletCounterparty = 'self'
-): Promise<string> {
+): Promise<Base64String> {
   // Generate 16 random bytes for the first half of the data
   const firstHalf = Random(16)
   // Create an sha256 HMAC

package/src/auth/utils/verifyNonce.ts

@@ -1,4 +1,4 @@
-import { Utils, WalletInterface, WalletCounterparty } from '../../../mod.js'
+import { Utils, WalletInterface, WalletCounterparty, Base64String } from '../../../mod.js'
 
 /**
  * Verifies a nonce derived from a wallet
@@ -8,7 +8,7 @@ import { Utils, WalletInterface, WalletCounterparty } from '../../../mod.js'
  * @returns The status of the validation
  */
 export async function verifyNonce(
-  nonce: string,
+  nonce: Base64String,
   wallet: WalletInterface,
   counterparty: WalletCounterparty = 'self'
 ): Promise<boolean> {