@x402x/client 0.2.0 → 2.0.0

package/README.md

@@ -44,7 +44,7 @@ Client → Facilitator → Smart Contract (Hook)
 ### After (@x402x/client)
 
 ```typescript
-import { parseDefaultAssetAmount } from "@x402x/core";
+import { parseDefaultAssetAmount } from "@x402x/extensions";
 
 const atomicAmount = parseDefaultAssetAmount("1", network); // '1000000'
 const client = new X402Client({ wallet, network, facilitatorUrl });
@@ -64,18 +64,18 @@ const result = await client.execute({
 ### Installation
 
 ```bash
-npm install @x402x/client @x402x/core
+npm install @x402x/client @x402x/extensions
 # or
-pnpm add @x402x/client @x402x/core
+pnpm add @x402x/client @x402x/extensions
 # or
-yarn add @x402x/client @x402x/core
+yarn add @x402x/client @x402x/extensions
 ```
 
 ### Basic Usage (React + wagmi)
 
 ```typescript
 import { X402Client } from '@x402x/client';
-import { TransferHook, parseDefaultAssetAmount } from '@x402x/core';
+import { TransferHook, parseDefaultAssetAmount } from '@x402x/extensions';
 import { useWalletClient } from 'wagmi';
 import { publicActions } from 'viem';
 
@@ -119,10 +119,10 @@ The `amount` parameter in `client.execute()` and `prepareSettlement()` **must be
 
 ### Converting USD Amounts to Atomic Units
 
-Use `parseDefaultAssetAmount()` from `@x402x/core` to convert USD amounts:
+Use `parseDefaultAssetAmount()` from `@x402x/extensions` to convert USD amounts:
 
 ```typescript
-import { parseDefaultAssetAmount, formatDefaultAssetAmount } from "@x402x/core";
+import { parseDefaultAssetAmount, formatDefaultAssetAmount } from "@x402x/extensions";
 
 // Convert USD to atomic units
 const atomicAmount = parseDefaultAssetAmount("1", "base-sepolia"); // '1000000' (1 USDC)
@@ -143,7 +143,7 @@ const displayAmount = formatDefaultAssetAmount("1000000", "base-sepolia"); // '1
 
 ```typescript
 import { X402Client } from "@x402x/client";
-import { parseDefaultAssetAmount } from "@x402x/core";
+import { parseDefaultAssetAmount } from "@x402x/extensions";
 
 const client = new X402Client({ wallet, network: "base-sepolia" });
 
@@ -195,7 +195,7 @@ const client = new X402Client({
 });
 
 // Convert USD amount to atomic units
-import { parseDefaultAssetAmount } from "@x402x/core";
+import { parseDefaultAssetAmount } from "@x402x/extensions";
 const atomicAmount = parseDefaultAssetAmount("1", "base-sepolia"); // '1000000'
 
 const result = await client.execute({
@@ -240,7 +240,7 @@ Provides automatic state management for settlements.
 
 ```typescript
 import { useExecute } from '@x402x/client';
-import { parseDefaultAssetAmount } from '@x402x/core';
+import { parseDefaultAssetAmount } from '@x402x/extensions';
 
 function PayButton() {
   // Uses default facilitator at https://facilitator.x402x.dev/
@@ -285,7 +285,7 @@ Understanding the x402 protocol terminology used in this SDK:
 **Verify** (from x402 protocol) - Validate a payment payload without executing it on-chain. This is useful for pre-validation before actual settlement.
 
 - In x402 protocol: `POST /verify` endpoint
-- In @x402x/core: `verify()` function
+- In @x402x/extensions: `verify()` function
 - Use case: Check if payment is valid before committing resources
 
 ### settle
@@ -293,7 +293,7 @@ Understanding the x402 protocol terminology used in this SDK:
 **Settle** (from x402 protocol) - Execute a payment on-chain by submitting it to the blockchain. This is the actual payment execution step.
 
 - In x402 protocol: `POST /settle` endpoint
-- In @x402x/core: `settle()` function
+- In @x402x/extensions: `settle()` function
 - In @x402x/client: `settle()` function (convenience wrapper)
 - Use case: Submit signed payment for blockchain execution
 
@@ -333,7 +333,7 @@ Prepares settlement data for signing.
 
 ```typescript
 import { prepareSettlement } from "@x402x/client";
-import { parseDefaultAssetAmount } from "@x402x/core";
+import { parseDefaultAssetAmount } from "@x402x/extensions";
 
 // Convert USD amount to atomic units
 const atomicAmount = parseDefaultAssetAmount("1", "base-sepolia"); // '1000000'
@@ -377,7 +377,7 @@ const result = await settle("https://facilitator.x402x.dev", signed);
 
 ```typescript
 import { X402Client } from "@x402x/client";
-import { TransferHook, parseDefaultAssetAmount } from "@x402x/core";
+import { TransferHook, parseDefaultAssetAmount } from "@x402x/extensions";
 
 // Uses default facilitator at https://facilitator.x402x.dev/
 const client = new X402Client({
@@ -404,7 +404,7 @@ TransferHook supports distributing funds to multiple recipients by percentage:
 
 ```typescript
 import { X402Client } from "@x402x/client";
-import { TransferHook, parseDefaultAssetAmount, type Split } from "@x402x/core";
+import { TransferHook, parseDefaultAssetAmount, type Split } from "@x402x/extensions";
 
 const client = new X402Client({
   wallet: walletClient,
@@ -449,7 +449,7 @@ console.log("Distributed transfer:", result.txHash);
 
 ```typescript
 import { useExecute } from '@x402x/client';
-import { NFTMintHook, parseDefaultAssetAmount } from '@x402x/core';
+import { NFTMintHook, parseDefaultAssetAmount } from '@x402x/extensions';
 
 function MintNFT() {
   // Uses default facilitator
@@ -484,7 +484,7 @@ function MintNFT() {
 
 ```typescript
 import { prepareSettlement, signAuthorization, settle } from "@x402x/client";
-import { calculateFacilitatorFee, TransferHook, parseDefaultAssetAmount } from "@x402x/core";
+import { calculateFacilitatorFee, TransferHook, parseDefaultAssetAmount } from "@x402x/extensions";
 
 // 1. Query minimum fee
 const hookData = TransferHook.encode([
@@ -527,7 +527,7 @@ console.log("Transaction:", result.transaction);
 ```typescript
 import { ref } from "vue";
 import { X402Client } from "@x402x/client";
-import { TransferHook, parseDefaultAssetAmount } from "@x402x/core";
+import { TransferHook, parseDefaultAssetAmount } from "@x402x/extensions";
 
 export function usePayment() {
   const status = ref("idle");
@@ -660,7 +660,7 @@ function Component() {
 ```typescript
 // 10 lines with @x402x/client (no facilitatorUrl needed!)
 import { useExecute } from "@x402x/client";
-import { TransferHook, parseDefaultAssetAmount } from "@x402x/core";
+import { TransferHook, parseDefaultAssetAmount } from "@x402x/extensions";
 
 function Component() {
   // Uses default facilitator automatically
@@ -683,7 +683,7 @@ function Component() {
 
 ## Related Packages
 
-- [@x402x/core](../core) - Core utilities and commitment calculation
+- [@x402x/extensions](../extensions) - Core utilities and network configuration
 - [@x402x/facilitator](../../facilitator) - Facilitator server implementation
 - [x402](https://github.com/coinbase/x402) - Base x402 protocol
 

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var core = require('@x402x/core');
+var extensions = require('@x402x/extensions');
 var viem = require('viem');
 var actions = require('viem/actions');
 var react = require('react');
@@ -56,7 +56,11 @@ var ValidationError = class _ValidationError extends X402ClientError {
   }
 };
 function generateSalt() {
-  const randomBytes = crypto.getRandomValues(new Uint8Array(32));
+  const cryptoObj = globalThis.crypto;
+  if (!cryptoObj || !cryptoObj.getRandomValues) {
+    throw new Error("crypto.getRandomValues is not available");
+  }
+  const randomBytes = cryptoObj.getRandomValues(new Uint8Array(32));
   return `0x${Array.from(randomBytes).map((b) => b.toString(16).padStart(2, "0")).join("")}`;
 }
 function normalizeAddress(address, name = "address") {
@@ -141,9 +145,10 @@ function calculateTimeWindow(maxTimeoutSeconds = 300) {
 }
 
 // src/core/prepare.ts
+var DEFAULT_FACILITATOR_URL = "https://facilitator.x402x.dev";
 async function queryFacilitatorFee(facilitatorUrl, network, hook, hookData = "0x") {
   try {
-    return await core.calculateFacilitatorFee(facilitatorUrl, network, hook, hookData);
+    return await extensions.calculateFacilitatorFee(facilitatorUrl, network, hook, hookData);
   } catch (error) {
     if (error instanceof Error) {
       throw new FacilitatorError(
@@ -167,7 +172,7 @@ async function prepareSettlement(params) {
   if (!from) {
     throw new ValidationError("Wallet client must have an account");
   }
-  const networkConfig = params.networkConfig || core.getNetworkConfig(params.network);
+  const networkConfig = params.networkConfig || extensions.getNetworkConfig(params.network);
   if (!networkConfig) {
     throw new NetworkError(
       `Network '${params.network}' is not supported. Please provide custom networkConfig.`
@@ -177,10 +182,11 @@ async function prepareSettlement(params) {
   validateAddress(asset, "asset");
   const salt = params.customSalt || generateSalt();
   let facilitatorFee = params.facilitatorFee || "0";
-  if (!params.facilitatorFee && params.facilitatorUrl) {
+  if (!params.facilitatorFee) {
+    const facilitatorUrl = params.facilitatorUrl || DEFAULT_FACILITATOR_URL;
     try {
       const feeEstimate = await queryFacilitatorFee(
-        params.facilitatorUrl,
+        facilitatorUrl,
         params.network,
         params.hook,
         params.hookData
@@ -201,7 +207,7 @@ async function prepareSettlement(params) {
   }
   const timeWindow = params.validAfter && params.validBefore ? { validAfter: params.validAfter, validBefore: params.validBefore } : calculateTimeWindow(300);
   const totalAmount = (BigInt(atomicAmount) + BigInt(facilitatorFee)).toString();
-  const commitment = core.calculateCommitment({
+  const commitment = extensions.calculateCommitment({
     chainId: networkConfig.chainId,
     hub: networkConfig.settlementRouter,
     asset,
@@ -309,39 +315,52 @@ async function signAuthorization(wallet, settlement) {
 }
 async function settle(facilitatorUrl, signed, timeout = 3e4) {
   try {
-    const paymentPayload = {
-      x402Version: 1,
-      scheme: "exact",
-      network: signed.settlement.network,
-      // Network type compatibility
-      payload: {
-        signature: signed.signature,
-        authorization: {
-          from: signed.authorization.from,
-          to: signed.authorization.to,
-          value: signed.authorization.value,
-          validAfter: signed.authorization.validAfter,
-          validBefore: signed.authorization.validBefore,
-          nonce: signed.authorization.nonce
-        }
+    const canonicalNetwork = extensions.toCanonicalNetworkKey(signed.settlement.network);
+    const totalAmount = (BigInt(signed.settlement.amount) + BigInt(signed.settlement.facilitatorFee)).toString();
+    const exactEvmPayload = {
+      signature: signed.signature,
+      authorization: {
+        from: signed.authorization.from,
+        to: signed.authorization.to,
+        value: signed.authorization.value,
+        validAfter: signed.authorization.validAfter,
+        validBefore: signed.authorization.validBefore,
+        nonce: signed.authorization.nonce
       }
     };
+    const paymentPayload = {
+      x402Version: 2,
+      // Use v2 protocol
+      resource: {
+        url: "https://x402x.dev/serverless",
+        description: "x402x Serverless Settlement",
+        mimeType: "application/json"
+      },
+      accepted: {
+        scheme: "exact",
+        network: canonicalNetwork,
+        // Type cast required: core_v2 Network type accepts both CAIP-2 and legacy formats
+        asset: signed.settlement.asset,
+        amount: totalAmount,
+        // Use totalAmount to match commitment calculation
+        payTo: signed.settlement.networkConfig.settlementRouter,
+        maxTimeoutSeconds: 300,
+        extra: {}
+      },
+      // Standard EVM exact scheme payload
+      payload: exactEvmPayload
+      // Type cast required: ExactEvmPayload structure matches v2 protocol
+    };
     const paymentRequirements = {
       scheme: "exact",
-      network: signed.settlement.network,
-      // Network type compatibility
-      maxAmountRequired: signed.settlement.amount,
+      network: canonicalNetwork,
+      // Type cast required: core_v2 Network type accepts CAIP-2 format
+      amount: totalAmount,
+      // Total amount including facilitator fee
       asset: signed.settlement.asset,
       payTo: signed.settlement.networkConfig.settlementRouter,
       maxTimeoutSeconds: 300,
       // 5 minutes
-      // Required by x402 protocol (even though not used in serverless mode)
-      // In the future, the x402 v2 will remove the resource field from the payment requirements
-      // (https://github.com/coinbase/x402/pull/446)
-      resource: "https://x402x.dev/serverless",
-      // Placeholder for serverless mode
-      description: "x402x Serverless Settlement",
-      mimeType: "application/json",
       extra: {
         name: signed.settlement.networkConfig.defaultAsset.eip712.name,
         version: signed.settlement.networkConfig.defaultAsset.eip712.version,
@@ -353,8 +372,7 @@ async function settle(facilitatorUrl, signed, timeout = 3e4) {
         hookData: signed.settlement.hookData
       }
     };
-    paymentPayload.paymentRequirements = paymentRequirements;
-    const result = await core.settle(facilitatorUrl, paymentPayload, paymentRequirements, timeout);
+    const result = await extensions.settle(facilitatorUrl, paymentPayload, paymentRequirements, timeout);
     return {
       success: result.success,
       transaction: result.transaction,
@@ -374,7 +392,6 @@ async function settle(facilitatorUrl, signed, timeout = 3e4) {
 }
 
 // src/client.ts
-var DEFAULT_FACILITATOR_URL = "https://facilitator.x402x.dev";
 var X402Client = class {
   /**
    * Create a new X402Client instance
@@ -446,7 +463,7 @@ var X402Client = class {
    * ```
    */
   async execute(params, waitForConfirmation = false) {
-    const hook = params.hook ? normalizeAddress(params.hook, "hook") : core.TransferHook.getAddress(this.config.network);
+    const hook = params.hook ? normalizeAddress(params.hook, "hook") : extensions.TransferHook.getAddress(this.config.network);
     const payTo = normalizeAddress(params.payTo, "payTo");
     const hookData = params.hookData || "0x";
     if (params.hookData) {
@@ -507,7 +524,7 @@ var X402Client = class {
     const normalizedHook = normalizeAddress(hook, "hook");
     validateHex(hookData, "hookData");
     try {
-      return await core.calculateFacilitatorFee(
+      return await extensions.calculateFacilitatorFee(
         this.config.facilitatorUrl,
         this.config.network,
         normalizedHook,
@@ -586,12 +603,28 @@ var CHAIN_ID_TO_NETWORK = {
   84532: "base-sepolia",
   8453: "base",
   196: "x-layer",
-  1952: "x-layer-testnet"
+  1952: "x-layer-testnet",
+  97: "bsc-testnet",
+  56: "bsc"
 };
 function useX402Client(config) {
-  const { data: walletClient } = wagmi.useWalletClient();
-  const { isConnected } = wagmi.useAccount();
-  const chainId = wagmi.useChainId();
+  let walletClient;
+  let isConnected;
+  let chainId;
+  try {
+    const walletClientResult = wagmi.useWalletClient();
+    const accountResult = wagmi.useAccount();
+    const chainIdResult = wagmi.useChainId();
+    walletClient = walletClientResult.data;
+    isConnected = accountResult.isConnected;
+    chainId = chainIdResult;
+  } catch (error) {
+    if (error instanceof wagmi.WagmiProviderNotFoundError || error?.name === "WagmiProviderNotFoundError" || error instanceof Error && error.message.includes("useConfig") && error.message.includes("WagmiProvider")) {
+      return null;
+    }
+    console.warn("[x402x] Unable to access wagmi provider:", error);
+    return null;
+  }
   return react.useMemo(() => {
     if (!isConnected || !walletClient) {
       return null;
@@ -674,15 +707,15 @@ function useExecute(config) {
 
 Object.defineProperty(exports, "AmountError", {
   enumerable: true,
-  get: function () { return core.AmountError; }
+  get: function () { return extensions.AmountError; }
 });
 Object.defineProperty(exports, "formatDefaultAssetAmount", {
   enumerable: true,
-  get: function () { return core.formatDefaultAssetAmount; }
+  get: function () { return extensions.formatDefaultAssetAmount; }
 });
 Object.defineProperty(exports, "parseDefaultAssetAmount", {
   enumerable: true,
-  get: function () { return core.parseDefaultAssetAmount; }
+  get: function () { return extensions.parseDefaultAssetAmount; }
 });
 exports.DEFAULT_FACILITATOR_URL = DEFAULT_FACILITATOR_URL;
 exports.FacilitatorError = FacilitatorError;