@bsv/sdk 1.6.1 → 1.6.3

package/package.json

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

package/src/auth/clients/AuthFetch.ts

@@ -240,7 +240,6 @@ export class AuthFetch {
         reject(e)
       }
     }) as Function)
-
     // Check if server requires payment to access the requested route
     if (response.status === 402) {
       // Create and attach a payment, then retry

package/src/auth/transports/SimplifiedFetchTransport.ts

@@ -17,6 +17,7 @@ export class SimplifiedFetchTransport implements Transport {
   fetchClient: typeof fetch
   baseUrl: string
 
+
   /**
    * Constructs a new instance of SimplifiedFetchTransport.
    * @param baseUrl - The base URL for all HTTP requests made by this transport.
@@ -53,11 +54,11 @@ export class SimplifiedFetchTransport implements Transport {
             body: JSON.stringify(message)
           })
 
+          // For initialRequest message, mark connection as established and start pool.
           if (message.messageType !== "initialRequest") {
             resolve()
           }
           const response = await responsePromise
-
           // Handle the response if data is received and callback is set
           if (response.ok && this.onDataCallback) {
             const responseMessage = await response.json()
@@ -126,7 +127,8 @@ export class SimplifiedFetchTransport implements Transport {
       })
 
       // Check for an acceptable status
-      if (response.status === 500 && !response.headers.get('x-bsv-auth-request-id')) {
+      if (response.status === 500 && (response.headers.get('x-bsv-auth-request-id') == null &&
+          response.headers.get('x-bsv-auth-requested-certificates') == null)) {
         // Try parsing JSON error
         const errorInfo = await response.json()
         // Otherwise just throw whatever we got
@@ -135,7 +137,10 @@ export class SimplifiedFetchTransport implements Transport {
 
       const parsedBody = await response.arrayBuffer()
       const payloadWriter = new Utils.Writer()
-      payloadWriter.write(Utils.toArray(response.headers.get('x-bsv-auth-request-id'), 'base64'))
+      if(response.headers.get('x-bsv-auth-request-id') != null)
+      {
+          payloadWriter.write(Utils.toArray(response.headers.get('x-bsv-auth-request-id'), 'base64'));
+      }
       payloadWriter.writeVarIntNum(response.status)
 
       // PARSE RESPONSE HEADERS FROM SERVER --------------------------------

package/src/overlay-tools/LookupResolver.ts

@@ -198,7 +198,7 @@ export default class LookupResolver {
 
     // Process the successful responses
     // Aggregate outputs from all successful responses
-    const outputs = new Map<string, { beef: number[], outputIndex: number }>()
+    const outputs = new Map<string, { beef: number[], context?: number[], outputIndex: number }>()
 
     for (const response of successfulResponses) {
       if (response.type !== 'output-list') {
@@ -207,14 +207,9 @@ export default class LookupResolver {
       try {
         for (const output of response.outputs) {
           try {
-            const txId: string = String(Transaction.fromBEEF(output.beef).id('hex'))
-
-            if (txId !== '') { // ✅ Ensures `txId` is always a non-empty string
-              const key = `${String(txId)}.${String(output.outputIndex)}`
-              outputs.set(key, output)
-            } else {
-              console.warn('Invalid transaction ID:', txId)
-            }
+            const txId: string = Transaction.fromBEEF(output.beef).id('hex') // !! This is STUPIDLY inefficient.
+            const key = `${txId}.${output.outputIndex}`
+            outputs.set(key, output)
           } catch {
             continue
           }

package/src/overlay-tools/SHIPBroadcaster.ts

@@ -4,6 +4,7 @@ import {
   BroadcastFailure,
   Broadcaster
 } from '../transaction/index.js'
+import * as Utils from '../primitives/utils.js'
 import LookupResolver from './LookupResolver.js'
 import OverlayAdminTokenTemplate from './OverlayAdminTokenTemplate.js'
 
@@ -92,13 +93,25 @@ export class HTTPSOverlayBroadcastFacilitator implements OverlayBroadcastFacilit
         'HTTPS facilitator can only use URLs that start with "https:"'
       )
     }
+    const headers = {
+      'Content-Type': 'application/octet-stream',
+      'X-Topics': JSON.stringify(taggedBEEF.topics)
+    }
+    let body
+    if (Array.isArray(taggedBEEF.offChainValues)) {
+      headers['x-includes-off-chain-values'] = 'true'
+      const w = new Utils.Writer()
+      w.writeVarIntNum(taggedBEEF.beef.length)
+      w.write(taggedBEEF.beef)
+      w.write(taggedBEEF.offChainValues)
+      body = new Uint8Array(w.toArray())
+    } else {
+      body = new Uint8Array(taggedBEEF.beef)
+    }
     const response = await fetch(`${url}/submit`, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/octet-stream',
-        'X-Topics': JSON.stringify(taggedBEEF.topics)
-      },
-      body: new Uint8Array(taggedBEEF.beef)
+      headers,
+      body
     })
     if (response.ok) {
       return await response.json()
@@ -154,8 +167,8 @@ export default class TopicBroadcaster implements Broadcaster {
   async broadcast (
     tx: Transaction
   ): Promise<BroadcastResponse | BroadcastFailure> {
-    console.log(tx)
     let beef: number[]
+    const offChainValues = tx.metadata.get('OffChainValues') as number[]
     try {
       beef = tx.toBEEF()
     } catch (error) {
@@ -176,6 +189,7 @@ export default class TopicBroadcaster implements Broadcaster {
         try {
           const steak = await this.facilitator.send(host, {
             beef,
+            offChainValues,
             topics: [...topics]
           })
           if (steak == null || Object.keys(steak).length === 0) {

package/src/overlay-tools/__tests/SHIPBroadcaster.test.ts

@@ -253,7 +253,8 @@ describe('SHIPCast', () => {
     const testTx = {
       toBEEF: () => {
         throw new Error('Cannot serialize to BEEF')
-      }
+      },
+      metadata: new Map()
     } as unknown as Transaction
 
     await expect(b.broadcast(testTx)).rejects.toThrow(

package/src/transaction/Transaction.ts

@@ -318,7 +318,7 @@ export default class Transaction {
     inputs: TransactionInput[] = [],
     outputs: TransactionOutput[] = [],
     lockTime: number = 0,
-    metadata: Record<string, any> = {},
+    metadata: Record<string, any> = new Map(),
     merklePath?: MerklePath
   ) {
     this.version = version