bsv-x402 0.6.0 → 0.7.0

package/dist/index.cjs

@@ -544,6 +544,8 @@ async function constructBrc105Proof(challenge, wallet, origin) {
       })
     }],
     options: {
+      returnTXIDOnly: false,
+      noSend: true,
       randomizeOutputs: false
     }
   });
@@ -555,13 +557,21 @@ async function constructBrc105Proof(challenge, wallet, origin) {
   } else {
     throw new Error("Wallet returned no transaction data (neither tx nor rawTx)");
   }
-  return {
+  const proof = {
     derivationPrefix: challenge.derivationPrefix,
     derivationSuffix,
     transaction: transactionBase64,
     clientIdentityKey,
     txid: result.txid
   };
+  const abort = wallet.abortAction ? async () => {
+    try {
+      await wallet.abortAction({ reference: result.txid });
+    } catch (err) {
+      console.warn("[x402] abortAction failed:", err);
+    }
+  } : void 0;
+  return { proof, abort };
 }
 
 // src/challenge.ts
@@ -597,6 +607,22 @@ function parseChallenge(header) {
 }
 
 // src/x402-fetch.ts
+function bytesToBase642(bytes) {
+  let binary = "";
+  for (const b of bytes) binary += String.fromCharCode(b);
+  return btoa(binary);
+}
+function numberArrayToBase642(arr) {
+  return bytesToBase642(new Uint8Array(arr));
+}
+function hexToBytes2(hex) {
+  if (hex.length % 2 !== 0) throw new Error("Hex string must have even length");
+  const bytes = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < hex.length; i += 2) {
+    bytes[i / 2] = parseInt(hex.slice(i, i + 2), 16);
+  }
+  return bytes;
+}
 var BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 function base58DecodeCheck(address) {
   let leadingZeros = 0;
@@ -660,12 +686,17 @@ async function defaultConstructProof(challenge) {
   if (!result || !result.txid) {
     throw new Error("Wallet declined payment or returned invalid result");
   }
-  if (!result.rawTx || typeof result.rawTx !== "string" || result.rawTx.length === 0) {
-    throw new Error("Wallet did not return raw transaction");
+  let beef;
+  if (result.tx && Array.isArray(result.tx) && result.tx.length > 0) {
+    beef = numberArrayToBase642(result.tx);
+  } else if (result.rawTx && typeof result.rawTx === "string" && result.rawTx.length > 0) {
+    beef = bytesToBase642(hexToBytes2(result.rawTx));
+  } else {
+    throw new Error("Wallet returned no transaction data (neither tx nor rawTx)");
   }
   return {
     txid: result.txid,
-    rawTx: result.rawTx
+    beef
   };
 }
 function createX402Fetch(config = {}) {
@@ -706,11 +737,16 @@ function createX402Fetch(config = {}) {
         return response;
       }
       let proof;
+      let abort;
       try {
         if (brc105ProofConstructor) {
-          proof = await brc105ProofConstructor(brc105Challenge);
+          const result = await brc105ProofConstructor(brc105Challenge);
+          proof = result.proof;
+          abort = result.abort;
         } else {
-          proof = await constructBrc105Proof(brc105Challenge, brc105Wallet, origin);
+          const result = await constructBrc105Proof(brc105Challenge, brc105Wallet, origin);
+          proof = result.proof;
+          abort = result.abort;
         }
       } catch (err) {
         console.error("[x402] Proof construction failed (brc105):", err);
@@ -720,7 +756,21 @@ function createX402Fetch(config = {}) {
       const headers = new Headers(init?.headers);
       headers.set("x-bsv-payment", JSON.stringify(proof));
       headers.set("x-bsv-auth-identity-key", proof.clientIdentityKey);
-      return fetch(input, { ...init, headers });
+      let retryResponse;
+      try {
+        retryResponse = await fetch(input, { ...init, headers });
+      } catch (err) {
+        if (abort) {
+          await abort();
+          console.warn("[x402] BRC-105 retry fetch failed, UTXOs released via abortAction");
+        }
+        throw err;
+      }
+      if (!retryResponse.ok && abort) {
+        await abort();
+        console.warn("[x402] Server rejected BRC-105 payment, UTXOs released via abortAction");
+      }
+      return retryResponse;
     }
     return response;
   };

package/dist/index.d.cts

@@ -6,7 +6,7 @@ interface Challenge {
 }
 interface Proof {
     txid: string;
-    rawTx: string;
+    beef: string;
 }
 interface Brc105Challenge {
     version: string;
@@ -37,6 +37,11 @@ interface Brc105Wallet {
         hmac: number[];
     }>;
     createAction(params: CWICreateActionParams): Promise<CWICreateActionResult>;
+    abortAction?: (args: {
+        reference: string;
+    }) => Promise<{
+        aborted: boolean;
+    }>;
 }
 interface Brc105Proof {
     derivationPrefix: string;
@@ -45,7 +50,11 @@ interface Brc105Proof {
     clientIdentityKey: string;
     txid: string;
 }
-type Brc105ProofConstructor = (challenge: Brc105Challenge) => Promise<Brc105Proof>;
+interface Brc105ProofResult {
+    proof: Brc105Proof;
+    abort?: () => Promise<void>;
+}
+type Brc105ProofConstructor = (challenge: Brc105Challenge) => Promise<Brc105ProofResult>;
 type PaymentProtocol = 'x402' | 'brc105';
 interface PaymentRequest {
     amount: number;
@@ -118,7 +127,7 @@ declare function parseBrc105Challenge(response: Response): Brc105Challenge;
  * 4. Call wallet.createAction with the locking script and custom instructions
  * 5. Convert transaction to base64
  */
-declare function constructBrc105Proof(challenge: Brc105Challenge, wallet: Brc105Wallet, origin?: string): Promise<Brc105Proof>;
+declare function constructBrc105Proof(challenge: Brc105Challenge, wallet: Brc105Wallet, origin?: string): Promise<Brc105ProofResult>;
 
 /**
  * Autospend balance cap per tier (max sats that can be auto-spent without confirmation).

package/dist/index.d.ts

@@ -6,7 +6,7 @@ interface Challenge {
 }
 interface Proof {
     txid: string;
-    rawTx: string;
+    beef: string;
 }
 interface Brc105Challenge {
     version: string;
@@ -37,6 +37,11 @@ interface Brc105Wallet {
         hmac: number[];
     }>;
     createAction(params: CWICreateActionParams): Promise<CWICreateActionResult>;
+    abortAction?: (args: {
+        reference: string;
+    }) => Promise<{
+        aborted: boolean;
+    }>;
 }
 interface Brc105Proof {
     derivationPrefix: string;
@@ -45,7 +50,11 @@ interface Brc105Proof {
     clientIdentityKey: string;
     txid: string;
 }
-type Brc105ProofConstructor = (challenge: Brc105Challenge) => Promise<Brc105Proof>;
+interface Brc105ProofResult {
+    proof: Brc105Proof;
+    abort?: () => Promise<void>;
+}
+type Brc105ProofConstructor = (challenge: Brc105Challenge) => Promise<Brc105ProofResult>;
 type PaymentProtocol = 'x402' | 'brc105';
 interface PaymentRequest {
     amount: number;
@@ -118,7 +127,7 @@ declare function parseBrc105Challenge(response: Response): Brc105Challenge;
  * 4. Call wallet.createAction with the locking script and custom instructions
  * 5. Convert transaction to base64
  */
-declare function constructBrc105Proof(challenge: Brc105Challenge, wallet: Brc105Wallet, origin?: string): Promise<Brc105Proof>;
+declare function constructBrc105Proof(challenge: Brc105Challenge, wallet: Brc105Wallet, origin?: string): Promise<Brc105ProofResult>;
 
 /**
  * Autospend balance cap per tier (max sats that can be auto-spent without confirmation).

package/dist/index.js

@@ -506,6 +506,8 @@ async function constructBrc105Proof(challenge, wallet, origin) {
       })
     }],
     options: {
+      returnTXIDOnly: false,
+      noSend: true,
       randomizeOutputs: false
     }
   });
@@ -517,13 +519,21 @@ async function constructBrc105Proof(challenge, wallet, origin) {
   } else {
     throw new Error("Wallet returned no transaction data (neither tx nor rawTx)");
   }
-  return {
+  const proof = {
     derivationPrefix: challenge.derivationPrefix,
     derivationSuffix,
     transaction: transactionBase64,
     clientIdentityKey,
     txid: result.txid
   };
+  const abort = wallet.abortAction ? async () => {
+    try {
+      await wallet.abortAction({ reference: result.txid });
+    } catch (err) {
+      console.warn("[x402] abortAction failed:", err);
+    }
+  } : void 0;
+  return { proof, abort };
 }
 
 // src/challenge.ts
@@ -559,6 +569,22 @@ function parseChallenge(header) {
 }
 
 // src/x402-fetch.ts
+function bytesToBase642(bytes) {
+  let binary = "";
+  for (const b of bytes) binary += String.fromCharCode(b);
+  return btoa(binary);
+}
+function numberArrayToBase642(arr) {
+  return bytesToBase642(new Uint8Array(arr));
+}
+function hexToBytes2(hex) {
+  if (hex.length % 2 !== 0) throw new Error("Hex string must have even length");
+  const bytes = new Uint8Array(hex.length / 2);
+  for (let i = 0; i < hex.length; i += 2) {
+    bytes[i / 2] = parseInt(hex.slice(i, i + 2), 16);
+  }
+  return bytes;
+}
 var BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 function base58DecodeCheck(address) {
   let leadingZeros = 0;
@@ -622,12 +648,17 @@ async function defaultConstructProof(challenge) {
   if (!result || !result.txid) {
     throw new Error("Wallet declined payment or returned invalid result");
   }
-  if (!result.rawTx || typeof result.rawTx !== "string" || result.rawTx.length === 0) {
-    throw new Error("Wallet did not return raw transaction");
+  let beef;
+  if (result.tx && Array.isArray(result.tx) && result.tx.length > 0) {
+    beef = numberArrayToBase642(result.tx);
+  } else if (result.rawTx && typeof result.rawTx === "string" && result.rawTx.length > 0) {
+    beef = bytesToBase642(hexToBytes2(result.rawTx));
+  } else {
+    throw new Error("Wallet returned no transaction data (neither tx nor rawTx)");
   }
   return {
     txid: result.txid,
-    rawTx: result.rawTx
+    beef
   };
 }
 function createX402Fetch(config = {}) {
@@ -668,11 +699,16 @@ function createX402Fetch(config = {}) {
         return response;
       }
       let proof;
+      let abort;
       try {
         if (brc105ProofConstructor) {
-          proof = await brc105ProofConstructor(brc105Challenge);
+          const result = await brc105ProofConstructor(brc105Challenge);
+          proof = result.proof;
+          abort = result.abort;
         } else {
-          proof = await constructBrc105Proof(brc105Challenge, brc105Wallet, origin);
+          const result = await constructBrc105Proof(brc105Challenge, brc105Wallet, origin);
+          proof = result.proof;
+          abort = result.abort;
         }
       } catch (err) {
         console.error("[x402] Proof construction failed (brc105):", err);
@@ -682,7 +718,21 @@ function createX402Fetch(config = {}) {
       const headers = new Headers(init?.headers);
       headers.set("x-bsv-payment", JSON.stringify(proof));
       headers.set("x-bsv-auth-identity-key", proof.clientIdentityKey);
-      return fetch(input, { ...init, headers });
+      let retryResponse;
+      try {
+        retryResponse = await fetch(input, { ...init, headers });
+      } catch (err) {
+        if (abort) {
+          await abort();
+          console.warn("[x402] BRC-105 retry fetch failed, UTXOs released via abortAction");
+        }
+        throw err;
+      }
+      if (!retryResponse.ok && abort) {
+        await abort();
+        console.warn("[x402] Server rejected BRC-105 payment, UTXOs released via abortAction");
+      }
+      return retryResponse;
     }
     return response;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsv-x402",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "x402 payment protocol client — a fetch() wrapper that handles 402 payment flows transparently",
   "type": "module",
   "main": "dist/index.cjs",
@@ -34,7 +34,7 @@
     "url": "git+https://github.com/sgbett/bsv-x402.git"
   },
   "devDependencies": {
-    "@bsv/wallet-toolbox-client": "^2.1.17",
+    "@bsv/wallet-toolbox-client": "npm:@sgbett/wallet-toolbox-client@2.1.19-fix.1",
     "@types/chrome": "^0.1.38",
     "@types/express": "^5.0.6",
     "express": "^5.2.1",