@bsv/sdk 1.9.30 → 2.0.0-beta.0

package/docs/reference/primitives.md

@@ -4961,14 +4961,14 @@ Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](
 
 | | |
 | --- | --- |
-| [AES](#function-aes) | [pbkdf2](#function-pbkdf2) |
-| [AESGCM](#function-aesgcm) | [realHtonl](#function-realhtonl) |
-| [AESGCMDecrypt](#function-aesgcmdecrypt) | [red](#function-red) |
-| [assertValidHex](#function-assertvalidhex) | [swapBytes32](#function-swapbytes32) |
-| [base64ToArray](#function-base64toarray) | [toArray](#function-toarray) |
+| [AES](#function-aes) | [normalizeHex](#function-normalizehex) |
+| [AESGCM](#function-aesgcm) | [pbkdf2](#function-pbkdf2) |
+| [AESGCMDecrypt](#function-aesgcmdecrypt) | [realHtonl](#function-realhtonl) |
+| [assertValidHex](#function-assertvalidhex) | [red](#function-red) |
+| [base64ToArray](#function-base64toarray) | [swapBytes32](#function-swapbytes32) |
+| [constantTimeEquals](#function-constanttimeequals) | [toArray](#function-toarray) |
 | [ghash](#function-ghash) | [toBase64](#function-tobase64) |
 | [htonl](#function-htonl) | [verifyNotNull](#function-verifynotnull) |
-| [normalizeHex](#function-normalizehex) |  |
 
 Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](#functions), [Types](#types), [Enums](#enums), [Variables](#variables)
 
@@ -5067,6 +5067,15 @@ export function base64ToArray(msg: string): number[]
 
 Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](#functions), [Types](#types), [Enums](#enums), [Variables](#variables)
 
+---
+### Function: constantTimeEquals
+
+```ts
+export function constantTimeEquals(a: Uint8Array | number[], b: Uint8Array | number[]): boolean 
+```
+
+Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](#functions), [Types](#types), [Enums](#enums), [Variables](#variables)
+
 ---
 ### Function: ghash
 
@@ -5736,7 +5745,7 @@ Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](
 ```ts
 incrementLeastSignificantThirtyTwoBits = function (block: Bytes): Bytes {
     const result = block.slice();
-    for (let i = 15; i !== 11; i--) {
+    for (let i = 15; i > 11; i--) {
         result[i] = (result[i] + 1) & 255;
         if (result[i] !== 0) {
             break;
@@ -6265,81 +6274,7 @@ Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](
 
 ```ts
 toUTF8 = (arr: number[]): string => {
-    let result = "";
-    const replacementChar = "\uFFFD";
-    for (let i = 0; i < arr.length; i++) {
-        const byte1 = arr[i];
-        if (byte1 <= 127) {
-            result += String.fromCharCode(byte1);
-            continue;
-        }
-        const emitReplacement = (): void => {
-            result += replacementChar;
-        };
-        if (byte1 >= 192 && byte1 <= 223) {
-            if (i + 1 >= arr.length) {
-                emitReplacement();
-                continue;
-            }
-            const byte2 = arr[i + 1];
-            if ((byte2 & 192) !== 128) {
-                emitReplacement();
-                i += 1;
-                continue;
-            }
-            const codePoint = ((byte1 & 31) << 6) | (byte2 & 63);
-            result += String.fromCharCode(codePoint);
-            i += 1;
-            continue;
-        }
-        if (byte1 >= 224 && byte1 <= 239) {
-            if (i + 2 >= arr.length) {
-                emitReplacement();
-                continue;
-            }
-            const byte2 = arr[i + 1];
-            const byte3 = arr[i + 2];
-            if ((byte2 & 192) !== 128 || (byte3 & 192) !== 128) {
-                emitReplacement();
-                i += 2;
-                continue;
-            }
-            const codePoint = ((byte1 & 15) << 12) |
-                ((byte2 & 63) << 6) |
-                (byte3 & 63);
-            result += String.fromCharCode(codePoint);
-            i += 2;
-            continue;
-        }
-        if (byte1 >= 240 && byte1 <= 247) {
-            if (i + 3 >= arr.length) {
-                emitReplacement();
-                continue;
-            }
-            const byte2 = arr[i + 1];
-            const byte3 = arr[i + 2];
-            const byte4 = arr[i + 3];
-            if ((byte2 & 192) !== 128 ||
-                (byte3 & 192) !== 128 ||
-                (byte4 & 192) !== 128) {
-                emitReplacement();
-                i += 3;
-                continue;
-            }
-            const codePoint = ((byte1 & 7) << 18) |
-                ((byte2 & 63) << 12) |
-                ((byte3 & 63) << 6) |
-                (byte4 & 63);
-            const offset = codePoint - 65536;
-            const highSurrogate = 55296 + (offset >> 10);
-            const lowSurrogate = 56320 + (offset & 1023);
-            result += String.fromCharCode(highSurrogate, lowSurrogate);
-            i += 3;
-            continue;
-        }
-        emitReplacement();
-    }
-    return result;
+    return new TextDecoder().decode(new Uint8Array(arr));
 }
 ```
 

package/package.json

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

package/src/auth/Peer.ts

@@ -525,7 +525,10 @@ export class Peer {
 
     // Create signature
     const { signature } = await this.wallet.createSignature({
-      data: Peer.base64ToBytes(message.initialNonce + sessionNonce),
+      data: [
+        ...Peer.base64ToBytes(message.initialNonce),
+        ...Peer.base64ToBytes(sessionNonce)
+      ],
       protocolID: [2, 'auth message signature'],
       keyID: `${message.initialNonce} ${sessionNonce}`,
       counterparty: message.identityKey

package/src/primitives/__tests/utils.test.ts

@@ -323,13 +323,17 @@ describe('verifyNotNull', () => {
   })
 })
 
-describe('toUTF8 strict UTF-8 decoding (TOB-21)', () => {
+describe('toUTF8 UTF-8 decoding', () => {
 
-  it('replaces invalid 2-byte sequences with U+FFFD', () => {
+  it('decodes ASCII bytes', () => {
+    expect(toUTF8([0x48, 0x65, 0x6c, 0x6c, 0x6f])).toBe('Hello')
+  })
+
+  it('replaces invalid 2-byte sequences with U+FFFD and continues decoding', () => {
     // 0xC2 should expect a continuation byte 0x80–0xBF
     const arr = [0xC2, 0x20]   // 0x20 is INVALID continuation
     const str = toUTF8(arr)
-    expect(str).toBe('\uFFFD')
+    expect(str).toBe('\uFFFD ')
   })
 
   it('decodes valid 3-byte sequences', () => {
@@ -337,10 +341,10 @@ describe('toUTF8 strict UTF-8 decoding (TOB-21)', () => {
     expect(toUTF8(euro)).toBe('€')
   })
 
-  it('replaces invalid 3-byte sequences', () => {
+  it('replaces invalid 3-byte sequences with U+FFFD and continues decoding', () => {
     // Middle byte invalid
     const arr = [0xE2, 0x20, 0xAC]
-    expect(toUTF8(arr)).toBe('\uFFFD')
+    expect(toUTF8(arr)).toBe('\uFFFD \uFFFD')
   })
 
   it('decodes valid 4-byte sequences into surrogate pairs', () => {
@@ -348,10 +352,10 @@ describe('toUTF8 strict UTF-8 decoding (TOB-21)', () => {
     expect(toUTF8(smile)).toBe('😀')
   })
 
-  it('replaces invalid 4-byte sequences with U+FFFD', () => {
+  it('replaces invalid 4-byte sequences with U+FFFD and continues decoding', () => {
     // 0x9F is valid, 0x20 is INVALID continuation for byte 3
     const arr = [0xF0, 0x9F, 0x20, 0x80]
-    expect(toUTF8(arr)).toBe('\uFFFD')
+    expect(toUTF8(arr)).toBe('\uFFFD \uFFFD')
   })
 
   it('replaces incomplete UTF-8 sequence at end', () => {
@@ -359,6 +363,25 @@ describe('toUTF8 strict UTF-8 decoding (TOB-21)', () => {
     expect(toUTF8(arr)).toBe('\uFFFD')
   })
 
+  it('replaces overlong sequences with U+FFFD', () => {
+    expect(toUTF8([0xC0, 0xAF])).toBe('\uFFFD\uFFFD')
+  })
+
+  it('replaces UTF-8 encoded surrogates with U+FFFD', () => {
+    expect(toUTF8([0xED, 0xA0, 0x80])).toBe('\uFFFD\uFFFD\uFFFD')
+  })
+
+})
+
+describe("toArray('utf8') UTF-8 encoding", () => {
+  it('round-trips UTF-8 strings', () => {
+    const s = 'Hello € 😀'
+    expect(toUTF8(toArray(s, 'utf8') as number[])).toBe(s)
+  })
+
+  it('replaces lone surrogates with U+FFFD when encoding', () => {
+    expect(toArray('\uD800', 'utf8')).toEqual([0xEF, 0xBF, 0xBD])
+  })
 })
 
 describe('Point.encode infinity handling', () => {

package/src/primitives/utils.ts

@@ -168,53 +168,7 @@ export function base64ToArray (msg: string): number[] {
  * @returns An array of numbers, each representing a byte in the UTF-8 encoded string.
  */
 function utf8ToArray (str: string): number[] {
-  const result: number[] = []
-
-  for (let i = 0; i < str.length; i++) {
-    const cp = str.codePointAt(i)
-    if (cp === undefined) {
-      // Should never be out of range.
-      throw new Error(`Index out of range: ${i}`)
-    }
-    let codePoint = cp
-
-    if (codePoint > 0xFFFF) {
-      // Valid surrogate pair => skip the next code unit because codePointAt
-      // has already combined them into a single code point.
-      i++
-    } else {
-      // Check if codePoint is a lone (unpaired) high surrogate or low surrogate.
-      if (codePoint >= 0xD800 && codePoint <= 0xDFFF) {
-        // Replace with the replacement character (U+FFFD).
-        codePoint = 0xFFFD
-      }
-    }
-
-    // Encode according to the UTF-8 standard
-    if (codePoint <= 0x7F) {
-      result.push(codePoint)
-    } else if (codePoint <= 0x7FF) {
-      result.push(
-        0xC0 | (codePoint >> 6),
-        0x80 | (codePoint & 0x3F)
-      )
-    } else if (codePoint <= 0xFFFF) {
-      result.push(
-        0xE0 | (codePoint >> 12),
-        0x80 | ((codePoint >> 6) & 0x3F),
-        0x80 | (codePoint & 0x3F)
-      )
-    } else {
-      result.push(
-        0xF0 | (codePoint >> 18),
-        0x80 | ((codePoint >> 12) & 0x3F),
-        0x80 | ((codePoint >> 6) & 0x3F),
-        0x80 | (codePoint & 0x3F)
-      )
-    }
-  }
-
-  return result
+  return Array.from(new TextEncoder().encode(str))
 }
 
 /**
@@ -223,86 +177,7 @@ function utf8ToArray (str: string): number[] {
  * @returns {string} - The UTF-8 encoded string.
  */
 export const toUTF8 = (arr: number[]): string => {
-  let result = ''
-  const replacementChar = '\uFFFD'
-  for (let i = 0; i < arr.length; i++) {
-    const byte1 = arr[i]
-    if (byte1 <= 0x7f) {
-      result += String.fromCharCode(byte1)
-      continue
-    }
-    const emitReplacement = (): void => {
-      result += replacementChar
-    }
-    if (byte1 >= 0xc0 && byte1 <= 0xdf) {
-      if (i + 1 >= arr.length) {
-        emitReplacement()
-        continue
-      }
-      const byte2 = arr[i + 1]
-      if ((byte2 & 0xc0) !== 0x80) {
-        emitReplacement()
-        i += 1
-        continue
-      }
-      const codePoint = ((byte1 & 0x1f) << 6) | (byte2 & 0x3f)
-      result += String.fromCharCode(codePoint)
-      i += 1
-      continue
-    }
-    if (byte1 >= 0xe0 && byte1 <= 0xef) {
-      if (i + 2 >= arr.length) {
-        emitReplacement()
-        continue
-      }
-      const byte2 = arr[i + 1]
-      const byte3 = arr[i + 2]
-      if ((byte2 & 0xc0) !== 0x80 || (byte3 & 0xc0) !== 0x80) {
-        emitReplacement()
-        i += 2
-        continue
-      }
-      const codePoint =
-        ((byte1 & 0x0f) << 12) |
-        ((byte2 & 0x3f) << 6) |
-        (byte3 & 0x3f)
-
-      result += String.fromCharCode(codePoint)
-      i += 2
-      continue
-    }
-    if (byte1 >= 0xf0 && byte1 <= 0xf7) {
-      if (i + 3 >= arr.length) {
-        emitReplacement()
-        continue
-      }
-      const byte2 = arr[i + 1]
-      const byte3 = arr[i + 2]
-      const byte4 = arr[i + 3]
-      if (
-        (byte2 & 0xc0) !== 0x80 ||
-        (byte3 & 0xc0) !== 0x80 ||
-        (byte4 & 0xc0) !== 0x80
-      ) {
-        emitReplacement()
-        i += 3
-        continue
-      }
-      const codePoint =
-        ((byte1 & 0x07) << 18) |
-        ((byte2 & 0x3f) << 12) |
-        ((byte3 & 0x3f) << 6) |
-        (byte4 & 0x3f)
-      const offset = codePoint - 0x10000
-      const highSurrogate = 0xd800 + (offset >> 10)
-      const lowSurrogate = 0xdc00 + (offset & 0x3ff)
-      result += String.fromCharCode(highSurrogate, lowSurrogate)
-      i += 3
-      continue
-    }
-    emitReplacement()
-  }
-  return result
+  return new TextDecoder().decode(new Uint8Array(arr))
 }
 
 /**