@bsv/sdk 1.6.7 → 1.6.9

package/docs/primitives.md

@@ -3229,7 +3229,8 @@ export class Reader {
     public readInt32LE(): number 
     public readUInt64BEBn(): BigNumber 
     public readUInt64LEBn(): BigNumber 
-    public readVarIntNum(): number 
+    public readInt64LEBn(): BigNumber 
+    public readVarIntNum(signed: boolean = true): number 
     public readVarInt(): number[] 
     public readVarIntBn(): BigNumber 
 }

package/docs/wallet.md

@@ -3958,6 +3958,15 @@ Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](
 ---
 ## Functions
 
+### Function: toOriginHeader
+
+```ts
+export function toOriginHeader(originator: string, fallbackScheme = "http"): string | undefined 
+```
+
+Links: [API](#api), [Interfaces](#interfaces), [Classes](#classes), [Functions](#functions), [Types](#types), [Enums](#enums), [Variables](#variables)
+
+---
 ## Types
 
 | | | |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/sdk",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "type": "module",
   "description": "BSV Blockchain Software Development Kit",
   "main": "dist/cjs/mod.js",
@@ -223,7 +223,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bitcoin-sv/ts-sdk.git"
+    "url": "git+https://github.com/bsv-blockchain/ts-sdk.git"
   },
   "keywords": [
     "BSV",
@@ -235,9 +235,9 @@
   "author": "BSV Blockchain Association",
   "license": "SEE LICENSE IN LICENSE.txt",
   "bugs": {
-    "url": "https://github.com/bitcoin-sv/ts-sdk/issues"
+    "url": "https://github.com/bsv-blockchain/ts-sdk/issues"
   },
-  "homepage": "https://github.com/bitcoin-sv/ts-sdk#readme",
+  "homepage": "https://github.com/bsv-blockchain/ts-sdk#readme",
   "devDependencies": {
     "@eslint/js": "^9.23.0",
     "@jest/globals": "^29.7.0",

package/src/primitives/utils.ts

@@ -525,6 +525,9 @@ export class Writer {
 
   static varIntNum (n: number): number[] {
     let buf: number[]
+    if (n < 0) {
+      return this.varIntBn(new BigNumber(n))
+    }
     if (n < 253) {
       buf = [n] // 1 byte
     } else if (n < 0x10000) {
@@ -565,6 +568,9 @@ export class Writer {
 
   static varIntBn (bn: BigNumber): number[] {
     let buf: number[]
+    if (bn.isNeg()) {
+      bn = bn.add(OverflowUint64) // Adjust for negative numbers
+    }
     if (bn.ltn(253)) {
       const n = bn.toNumber()
       // No need for bitwise operation as the value is within a byte's range
@@ -708,7 +714,16 @@ export class Reader {
     return bn
   }
 
-  public readVarIntNum (): number {
+  public readInt64LEBn (): BigNumber {
+    const bin = this.readReverse(8)
+    let bn = new BigNumber(bin)
+    if (bn.gte(OverflowInt64)) {
+      bn = bn.sub(OverflowUint64) // Adjust for negative numbers
+    }
+    return bn
+  }
+
+  public readVarIntNum (signed: boolean = true): number {
     const first = this.readUInt8()
     let bn: BigNumber
     switch (first) {
@@ -717,7 +732,7 @@ export class Reader {
       case 0xfe:
         return this.readUInt32LE()
       case 0xff:
-        bn = this.readUInt64LEBn()
+        bn = signed ? this.readInt64LEBn() : this.readUInt64LEBn()
         if (bn.lte(new BigNumber(2).pow(new BigNumber(53)))) {
           return bn.toNumber()
         } else {
@@ -801,3 +816,6 @@ export const minimallyEncode = (buf: number[]): number[] => {
   // If we found the whole thing is zeros, then we have a zero.
   return []
 }
+
+const OverflowInt64 = new BigNumber(2).pow(new BigNumber(63))
+const OverflowUint64 = new BigNumber(2).pow(new BigNumber(64))

package/src/transaction/__tests/Transaction.test.ts

@@ -806,7 +806,7 @@ describe('Transaction', () => {
         expect(beef).toEqual(BRC62Hex)
       })
       it('Does not double-encode transactions', () => {
-        // Source: https://github.com/bitcoin-sv/ts-sdk/issues/77
+        // Source: https://github.com/bsv-blockchain/ts-sdk/issues/77
         const incorrect =
           '0100beef01fe76eb0c000e02c402deff5437203e0b5cb22646cbada24a60349bf45c8b280ffb755868f2955c3111c500f4076b7f48031fc467f87d5e99d9c3c0b59e4dca5e3049f58b735c59b413a8b6016300bad9c2d948e8a2ca647fdb50f2fd36641c4adf937b41134405a3e7f734b8beb201300053604a579558b5f7030e618d5c726a19229e0ff677f6edf109f41c5cfdafc93e0119005f8465c2a8d1558afbfa80c2395f3f8866a2fa5015e54fab778b0149da58376c010d00cd452b4e74f57d199cdb81b8a0e4a62dcdaf89504d6c63a5a65d5b866912b8c0010700d2ae7e2ce76da560509172066f1a1cf81faf81d73f9c0f6fd5af0904973dcfb10102006e5e077bcaa35c0240d61c1f3bba8d789223711ec035ef88b0911fc569d2b95a010000c961038959b9d404297a180c066816562dd2a34986c0960121a87ba91a51262f010100a50e381b4e8812479ea561e5bab7dcaa80078652b1b39ee5410966c515a3442b010100383ce8891ca7bf1ddefa5e0d8a1ba9ab01cb4e18046e9d7d0d438b5aaecc38b2010100c694be322b4e74acca8a5ef7703afedb708281321fd674f1221eebc743b0e01c0101000f3cc61f2b3d762cfecdd977ba768a5cbb0a4b402ad4f0d1bd3a98a582794c35010100094ad56eeea3b47edb2b298775f2efabe48172612cb3419962632251d8cdb78e010100de84bf9dd8873f37decbda1b5188e24ead978b147a63c809691702d19c47e8cb050200000001b67f1b6a6c3e70742a39b82ba45d51c983f598963ebf237101cc372da1144b83020000006b483045022100d14c3eb0c1438747c124f099bc664bf945cd27cbd96915027057e508bbc9e03302203c73f79d4e00f8018783e1008ce0fbb8e8c58bff6bd8042ab7e3966a66c8788c41210356762156ee9347c3e2ceca17d13713028d5446f453e9cbcb0ea170b4ca7fab52ffffffff037c660000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac75330100000000001976a914eb645f9ea7e4e232e54b9651474c100026698c3088acf2458005000000001976a914802737e30c85b6fe86e26fb28e03140058aca65e88ac0000000001000100000001deff5437203e0b5cb22646cbada24a60349bf45c8b280ffb755868f2955c3111000000006a473044022076da9f61380c208f43652587c219b4452a7b803a0407c2c7c0f3bc27612c4e88022021a9eb02da5529873a5986933f9c35965aa78537b9e2aef9382de33cfb1ab4bb41210314793e1758db3caa7d2bce97b347ae3ced2f8a402b797ed986be63473d4644a0ffffffff023c330000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac3c330000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac00000000000200000001b67f1b6a6c3e70742a39b82ba45d51c983f598963ebf237101cc372da1144b83020000006b483045022100d14c3eb0c1438747c124f099bc664bf945cd27cbd96915027057e508bbc9e03302203c73f79d4e00f8018783e1008ce0fbb8e8c58bff6bd8042ab7e3966a66c8788c41210356762156ee9347c3e2ceca17d13713028d5446f453e9cbcb0ea170b4ca7fab52ffffffff037c660000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac75330100000000001976a914eb645f9ea7e4e232e54b9651474c100026698c3088acf2458005000000001976a914802737e30c85b6fe86e26fb28e03140058aca65e88ac0000000001000100000001deff5437203e0b5cb22646cbada24a60349bf45c8b280ffb755868f2955c3111000000006a473044022076da9f61380c208f43652587c219b4452a7b803a0407c2c7c0f3bc27612c4e88022021a9eb02da5529873a5986933f9c35965aa78537b9e2aef9382de33cfb1ab4bb41210314793e1758db3caa7d2bce97b347ae3ced2f8a402b797ed986be63473d4644a0ffffffff023c330000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac3c330000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac000000000001000000022e7f69f3e1e17e22cfb8818577b3c83a4fbbbc1bab55c70ffcdd994ae30ea48b000000006b483045022100d9a2d1efea4896b36b2eb5af42cf52009982c7c31b446213fe37f26835d9d72202203e4dee0ceb068a4936e79b0bf69f72203906a00a4256cb1a7b30a40764616e8441210314793e1758db3caa7d2bce97b347ae3ced2f8a402b797ed986be63473d4644a0ffffffff2e7f69f3e1e17e22cfb8818577b3c83a4fbbbc1bab55c70ffcdd994ae30ea48b010000006b483045022100b57a09145c57b7b5efb4b546f1b0bfb7adbc5e64d35d9d6989345d4c60c483940220280998a210a49a6efaacda6fb73670001bb7269d069be80eb14ea2227a73e82241210314793e1758db3caa7d2bce97b347ae3ced2f8a402b797ed986be63473d4644a0ffffffff0174660000000000001976a91417c85798ff61f7ec8af257f672d973b6ec6d88fd88ac0000000000'
         const correct =

package/src/wallet/substrates/HTTPWalletJSON.ts

@@ -36,6 +36,7 @@ import {
   VersionString7To30Bytes,
 } from '../Wallet.interfaces.js'
 import { WERR_REVIEW_ACTIONS } from '../WERR_REVIEW_ACTIONS.js'
+import { toOriginHeader } from './utils/toOriginHeader.js'
 
 export default class HTTPWalletJSON implements WalletInterface {
   baseUrl: string
@@ -52,14 +53,23 @@ export default class HTTPWalletJSON implements WalletInterface {
     this.originator = originator
     this.httpClient = httpClient
 
+    // Detect if we're in a browser environment
+    const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined'
+
     this.api = async (call: string, args: object) => {
+      // In browser environments, let the browser handle Origin header automatically
+      // In Node.js environments, we need to set it manually if originator is provided
+      const origin = !isBrowser && this.originator
+        ? toOriginHeader(this.originator, 'http')
+        : undefined
+
       const res = await (
         await httpClient(`${this.baseUrl}/${call}`, {
           method: 'POST',
           headers: {
             Accept: 'application/json',
             'Content-Type': 'application/json',
-            Originator: this.originator ?? ''
+            ...(origin ? { Origin: origin } : {}),
           },
           body: JSON.stringify(args)
         })

package/src/wallet/substrates/WalletWireProcessor.ts

@@ -2094,7 +2094,7 @@ export default class WalletWireProcessor implements WalletWire {
         cert.certifier,
         cert.revocationOutpoint,
         cert.fields,
-        cert.signaturre
+        cert.signature
       )
       const certBin = certificate.toBinary()
 

package/src/wallet/substrates/__tests/toOriginHeader.test.ts

@@ -0,0 +1,34 @@
+import { toOriginHeader } from "../utils/toOriginHeader"
+
+afterEach(() => jest.resetAllMocks())
+
+type FetchMockCall = Parameters<typeof fetch> // alias for readability
+
+function okJson(body: unknown = {}) {
+  return Promise.resolve({
+    ok: true,
+    status: 200,
+    json: () => Promise.resolve(body),
+  } as Response)
+}
+
+describe("toOriginHeader()", () => {
+  const vectors: Array<[originator: string, baseUrl: string, expected: string | undefined]> = [
+    /* originator,                     baseUrl,                      expected */
+    ["localhost", "http://localhost:3321", "http://localhost"],
+    ["localhost:3000", "http://localhost:3321", "http://localhost:3000"],
+    ["example.com", "https://api.example.com", "https://example.com"],
+    ["https://example.com:8443", "http://localhost:3321", "https://example.com:8443"],
+    // ["metanet://somehost", "http://localhost:3321", "metanet://somehost"], // TODO: Consider adding support in the future
+  ]
+
+  it.each(vectors)("originator=%p, baseUrl=%p → %p", (originator, baseUrl, expected) => {
+    const schemeFromBase = new URL(baseUrl).protocol.replace(":", "")
+    const result = toOriginHeader(originator, schemeFromBase)
+    expect(result).toBe(expected)
+  })
+
+  it("throws on clearly malformed input", () => {
+    expect(() => toOriginHeader("bad url^%", "http")).toThrow()
+  })
+})

package/src/wallet/substrates/utils/toOriginHeader.ts

@@ -0,0 +1,15 @@
+export function toOriginHeader(originator: string, fallbackScheme = 'http'): string | undefined {
+  // If the caller already gave us a scheme, assume it’s fine
+  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(originator)) {
+    try {
+      return new URL(originator).origin       // trims any path/query
+    } catch { /* fall through to fix-up */ }
+  }
+
+  // Otherwise, prepend the fallback scheme and validate
+  try {
+    return new URL(`${fallbackScheme}://${originator}`).origin
+  } catch {
+    throw new Error(`Invalid originator value: ${originator}`)
+  }
+}