x402z-client 0.0.8 → 0.0.9

package/README.md

@@ -8,15 +8,22 @@ Client-side helpers for the erc7984-mind-v1 x402 scheme.
 pnpm add x402z-client x402z-shared
 ```
 
+## Folder map
+
+- `src/http/`: HTTP client helpers
+- `src/scheme/`: scheme implementation + registration
+- `src/relayer/`: relayer payment input helpers
+- `src/index.ts`: public exports
+
 ## Usage
 
 ```ts
 import { createX402zClient } from "x402z-client";
-import { createRelayerInstance, SepoliaConfig } from "x402z-shared";
+import { createRelayer, SepoliaConfig } from "x402z-shared";
 import { privateKeyToAccount } from "viem/accounts";
 
 const account = privateKeyToAccount("0x...");
-const relayer = await createRelayerInstance(SepoliaConfig);
+const relayer = await createRelayer(SepoliaConfig);
 
 const client = createX402zClient({
   signer: {
@@ -30,24 +37,6 @@ const response = await client.pay("https://example.com/demo");
 console.log(response.status);
 ```
 
-## Usage (Browser)
-
-```ts
-import { createX402zWebClient } from "x402z-client/web";
-import { SepoliaConfig } from "x402z-shared/web";
-
-const client = await createX402zWebClient({
-  signer: {
-    address: "0x...",
-    signTypedData: async args => window.ethereum.request({ method: "eth_signTypedData_v4", params: [args] }),
-  },
-  relayerConfig: { ...SepoliaConfig, network: window.ethereum },
-});
-
-const response = await client.pay("https://example.com/demo");
-console.log(response.status);
-```
-
 `createX402zClient` builds the confidential payment input automatically using the
 `confidential.batcherAddress` provided by the server’s payment requirements.
 
@@ -57,14 +46,10 @@ console.log(response.status);
   - `signer` (required): EIP-712 signer for x402 payloads
   - `relayer` (required): Zama relayer instance used to build encrypted inputs
   - `fetch` (optional): custom fetch implementation
-- `createX402zWebClient(config)`
-  - `signer` (required): EIP-712 signer for x402 payloads
-  - `relayerConfig` (required): relayer instance config (browser)
-  - `fetch` (optional): custom fetch implementation
 - `client.pay(url, options?)`: performs the 402 handshake and retries with payment headers
 
 ## Notes
 
 - Scheme name: `erc7984-mind-v1`
 - The client does not expose balance helpers; use `x402z-shared` for that.
-- The browser entry (`x402z-client/web`) uses a web-only scheme implementation wired to `x402z-shared/web`.
+- For browser usage, use `x402z-client-web` with `x402z-shared-web`.

package/dist/index.d.mts

@@ -5,7 +5,7 @@ import { ConfidentialPaymentInput, RelayerInstance } from 'x402z-shared';
 import { x402Client } from '@x402/core/client';
 export { AfterPaymentCreationHook, BeforePaymentCreationHook, OnPaymentCreationFailureHook, PaymentCreatedContext, PaymentCreationContext, PaymentCreationFailureContext, PaymentPolicy, SchemeRegistration, SelectPaymentRequirements, x402Client, x402ClientConfig, x402HTTPClient } from '@x402/core/client';
 
-type ConfidentialClientConfig = {
+type X402zClientSchemeOptions = {
     signer: ClientEvmSigner;
     buildPayment: (requirements: PaymentRequirements) => ConfidentialPaymentInput | Promise<ConfidentialPaymentInput>;
     eip712?: {
@@ -15,23 +15,23 @@ type ConfidentialClientConfig = {
     hashEncryptedAmountInput?: (encryptedAmountInput: `0x${string}`) => `0x${string}`;
     clock?: () => number;
 };
-declare class ConfidentialEvmScheme implements SchemeNetworkClient {
+declare class X402zEvmClientScheme implements SchemeNetworkClient {
     private readonly config;
     readonly scheme = "erc7984-mind-v1";
     private readonly hashFn;
     private readonly clock;
-    constructor(config: ConfidentialClientConfig);
+    constructor(config: X402zClientSchemeOptions);
     createPaymentPayload(x402Version: number, paymentRequirements: PaymentRequirements): Promise<Pick<PaymentPayload, "x402Version" | "payload">>;
 }
 
-type ConfidentialClientRegisterConfig = ConfidentialClientConfig & {
+type X402zClientRegistrationOptions = X402zClientSchemeOptions & {
     networks?: Network[];
 };
-declare function registerConfidentialEvmScheme(client: x402Client, config: ConfidentialClientRegisterConfig): x402Client;
+declare function registerX402zEvmClientScheme(client: x402Client, config: X402zClientRegistrationOptions): x402Client;
 
-declare function buildPaymentInputFromRelayer(relayer: RelayerInstance, requirements: PaymentRequirements, amount: number): Promise<ConfidentialPaymentInput>;
+declare function buildPaymentInput(relayer: RelayerInstance, requirements: PaymentRequirements, amount: number): Promise<ConfidentialPaymentInput>;
 
-type X402zClientConfig = Omit<ConfidentialClientRegisterConfig, "buildPayment"> & {
+type X402zClientOptions = Omit<X402zClientRegistrationOptions, "buildPayment"> & {
     relayer: RelayerInstance;
     fetch?: typeof fetch;
     debug?: boolean;
@@ -39,8 +39,8 @@ type X402zClientConfig = Omit<ConfidentialClientRegisterConfig, "buildPayment">
 type PayOptions = {
     headers?: Record<string, string>;
 };
-declare function createX402zClient(config: X402zClientConfig): {
+declare function createX402zClient(config: X402zClientOptions): {
     pay(url: string, options?: PayOptions): Promise<Response>;
 };
 
-export { type ConfidentialClientConfig, type ConfidentialClientRegisterConfig, ConfidentialEvmScheme, type PayOptions, type X402zClientConfig, buildPaymentInputFromRelayer, createX402zClient, registerConfidentialEvmScheme };
+export { type PayOptions, type X402zClientOptions, type X402zClientRegistrationOptions, type X402zClientSchemeOptions, X402zEvmClientScheme, buildPaymentInput, createX402zClient, registerX402zEvmClientScheme };

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { ConfidentialPaymentInput, RelayerInstance } from 'x402z-shared';
 import { x402Client } from '@x402/core/client';
 export { AfterPaymentCreationHook, BeforePaymentCreationHook, OnPaymentCreationFailureHook, PaymentCreatedContext, PaymentCreationContext, PaymentCreationFailureContext, PaymentPolicy, SchemeRegistration, SelectPaymentRequirements, x402Client, x402ClientConfig, x402HTTPClient } from '@x402/core/client';
 
-type ConfidentialClientConfig = {
+type X402zClientSchemeOptions = {
     signer: ClientEvmSigner;
     buildPayment: (requirements: PaymentRequirements) => ConfidentialPaymentInput | Promise<ConfidentialPaymentInput>;
     eip712?: {
@@ -15,23 +15,23 @@ type ConfidentialClientConfig = {
     hashEncryptedAmountInput?: (encryptedAmountInput: `0x${string}`) => `0x${string}`;
     clock?: () => number;
 };
-declare class ConfidentialEvmScheme implements SchemeNetworkClient {
+declare class X402zEvmClientScheme implements SchemeNetworkClient {
     private readonly config;
     readonly scheme = "erc7984-mind-v1";
     private readonly hashFn;
     private readonly clock;
-    constructor(config: ConfidentialClientConfig);
+    constructor(config: X402zClientSchemeOptions);
     createPaymentPayload(x402Version: number, paymentRequirements: PaymentRequirements): Promise<Pick<PaymentPayload, "x402Version" | "payload">>;
 }
 
-type ConfidentialClientRegisterConfig = ConfidentialClientConfig & {
+type X402zClientRegistrationOptions = X402zClientSchemeOptions & {
     networks?: Network[];
 };
-declare function registerConfidentialEvmScheme(client: x402Client, config: ConfidentialClientRegisterConfig): x402Client;
+declare function registerX402zEvmClientScheme(client: x402Client, config: X402zClientRegistrationOptions): x402Client;
 
-declare function buildPaymentInputFromRelayer(relayer: RelayerInstance, requirements: PaymentRequirements, amount: number): Promise<ConfidentialPaymentInput>;
+declare function buildPaymentInput(relayer: RelayerInstance, requirements: PaymentRequirements, amount: number): Promise<ConfidentialPaymentInput>;
 
-type X402zClientConfig = Omit<ConfidentialClientRegisterConfig, "buildPayment"> & {
+type X402zClientOptions = Omit<X402zClientRegistrationOptions, "buildPayment"> & {
     relayer: RelayerInstance;
     fetch?: typeof fetch;
     debug?: boolean;
@@ -39,8 +39,8 @@ type X402zClientConfig = Omit<ConfidentialClientRegisterConfig, "buildPayment">
 type PayOptions = {
     headers?: Record<string, string>;
 };
-declare function createX402zClient(config: X402zClientConfig): {
+declare function createX402zClient(config: X402zClientOptions): {
     pay(url: string, options?: PayOptions): Promise<Response>;
 };
 
-export { type ConfidentialClientConfig, type ConfidentialClientRegisterConfig, ConfidentialEvmScheme, type PayOptions, type X402zClientConfig, buildPaymentInputFromRelayer, createX402zClient, registerConfidentialEvmScheme };
+export { type PayOptions, type X402zClientOptions, type X402zClientRegistrationOptions, type X402zClientSchemeOptions, X402zEvmClientScheme, buildPaymentInput, createX402zClient, registerX402zEvmClientScheme };

package/dist/index.js

@@ -20,16 +20,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  ConfidentialEvmScheme: () => ConfidentialEvmScheme,
-  buildPaymentInputFromRelayer: () => buildPaymentInputFromRelayer,
+  X402zEvmClientScheme: () => X402zEvmClientScheme,
+  buildPaymentInput: () => buildPaymentInput,
   createX402zClient: () => createX402zClient,
-  registerConfidentialEvmScheme: () => registerConfidentialEvmScheme,
-  x402Client: () => import_client2.x402Client,
-  x402HTTPClient: () => import_client2.x402HTTPClient
+  registerX402zEvmClientScheme: () => registerX402zEvmClientScheme,
+  x402Client: () => import_client3.x402Client,
+  x402HTTPClient: () => import_client3.x402HTTPClient
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/scheme.ts
+// src/scheme/scheme.ts
 var import_viem = require("viem");
 var import_x402z_shared = require("x402z-shared");
 var ZERO_BYTES32 = "0x0000000000000000000000000000000000000000000000000000000000000000";
@@ -45,7 +45,7 @@ function normalizeIntegerAmount(value, fallback) {
   }
   return fallbackNormalized;
 }
-var ConfidentialEvmScheme = class {
+var X402zEvmClientScheme = class {
   constructor(config) {
     this.config = config;
     this.scheme = "erc7984-mind-v1";
@@ -112,21 +112,21 @@ var ConfidentialEvmScheme = class {
   }
 };
 
-// src/register.ts
-function registerConfidentialEvmScheme(client, config) {
+// src/scheme/register.ts
+function registerX402zEvmClientScheme(client, config) {
   if (config.networks && config.networks.length > 0) {
     for (const network of config.networks) {
-      client.register(network, new ConfidentialEvmScheme(config));
+      client.register(network, new X402zEvmClientScheme(config));
     }
     return client;
   }
-  client.register("eip155:*", new ConfidentialEvmScheme(config));
+  client.register("eip155:*", new X402zEvmClientScheme(config));
   return client;
 }
 
-// src/relayer.ts
+// src/relayer/build.ts
 var import_x402z_shared2 = require("x402z-shared");
-async function buildPaymentInputFromRelayer(relayer, requirements, amount) {
+async function buildPaymentInput(relayer, requirements, amount) {
   const extra = requirements.extra;
   const batcherAddress = extra?.confidential?.batcherAddress;
   if (!batcherAddress) {
@@ -144,7 +144,7 @@ async function buildPaymentInputFromRelayer(relayer, requirements, amount) {
   };
 }
 
-// src/http.ts
+// src/http/client.ts
 var import_client = require("@x402/core/client");
 var import_http = require("@x402/core/http");
 var import_viem2 = require("viem");
@@ -165,6 +165,13 @@ function createX402zClient(config) {
     if (!batcherAddress) {
       throw new Error("Missing confidential.batcherAddress in payment requirements");
     }
+    if (debugEnabled) {
+      console.debug("[x402z-client] encrypt input", {
+        tokenAddress: requirements.asset,
+        batcherAddress,
+        amount: requirements.amount
+      });
+    }
     const encrypted = await (0, import_x402z_shared3.createEncryptedAmountInput)(
       config.relayer,
       requirements.asset,
@@ -177,7 +184,7 @@ function createX402zClient(config) {
     };
   };
   const client = new import_client.x402Client();
-  registerConfidentialEvmScheme(client, {
+  registerX402zEvmClientScheme(client, {
     ...registerConfig,
     buildPayment
   });
@@ -222,13 +229,13 @@ function createX402zClient(config) {
 }
 
 // src/index.ts
-var import_client2 = require("@x402/core/client");
+var import_client3 = require("@x402/core/client");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ConfidentialEvmScheme,
-  buildPaymentInputFromRelayer,
+  X402zEvmClientScheme,
+  buildPaymentInput,
   createX402zClient,
-  registerConfidentialEvmScheme,
+  registerX402zEvmClientScheme,
   x402Client,
   x402HTTPClient
 });

package/dist/index.mjs

@@ -1,4 +1,4 @@
-// src/scheme.ts
+// src/scheme/scheme.ts
 import { getAddress } from "viem";
 import {
   confidentialPaymentTypes,
@@ -19,7 +19,7 @@ function normalizeIntegerAmount(value, fallback) {
   }
   return fallbackNormalized;
 }
-var ConfidentialEvmScheme = class {
+var X402zEvmClientScheme = class {
   constructor(config) {
     this.config = config;
     this.scheme = "erc7984-mind-v1";
@@ -86,21 +86,21 @@ var ConfidentialEvmScheme = class {
   }
 };
 
-// src/register.ts
-function registerConfidentialEvmScheme(client, config) {
+// src/scheme/register.ts
+function registerX402zEvmClientScheme(client, config) {
   if (config.networks && config.networks.length > 0) {
     for (const network of config.networks) {
-      client.register(network, new ConfidentialEvmScheme(config));
+      client.register(network, new X402zEvmClientScheme(config));
     }
     return client;
   }
-  client.register("eip155:*", new ConfidentialEvmScheme(config));
+  client.register("eip155:*", new X402zEvmClientScheme(config));
   return client;
 }
 
-// src/relayer.ts
+// src/relayer/build.ts
 import { createEncryptedAmountInput } from "x402z-shared";
-async function buildPaymentInputFromRelayer(relayer, requirements, amount) {
+async function buildPaymentInput(relayer, requirements, amount) {
   const extra = requirements.extra;
   const batcherAddress = extra?.confidential?.batcherAddress;
   if (!batcherAddress) {
@@ -118,7 +118,7 @@ async function buildPaymentInputFromRelayer(relayer, requirements, amount) {
   };
 }
 
-// src/http.ts
+// src/http/client.ts
 import { x402Client } from "@x402/core/client";
 import { x402HTTPClient } from "@x402/core/http";
 import { isAddress } from "viem";
@@ -141,6 +141,13 @@ function createX402zClient(config) {
     if (!batcherAddress) {
       throw new Error("Missing confidential.batcherAddress in payment requirements");
     }
+    if (debugEnabled) {
+      console.debug("[x402z-client] encrypt input", {
+        tokenAddress: requirements.asset,
+        batcherAddress,
+        amount: requirements.amount
+      });
+    }
     const encrypted = await createEncryptedAmountInput2(
       config.relayer,
       requirements.asset,
@@ -153,7 +160,7 @@ function createX402zClient(config) {
     };
   };
   const client = new x402Client();
-  registerConfidentialEvmScheme(client, {
+  registerX402zEvmClientScheme(client, {
     ...registerConfig,
     buildPayment
   });
@@ -203,10 +210,10 @@ import {
   x402HTTPClient as x402HTTPClient2
 } from "@x402/core/client";
 export {
-  ConfidentialEvmScheme,
-  buildPaymentInputFromRelayer,
+  X402zEvmClientScheme,
+  buildPaymentInput,
   createX402zClient,
-  registerConfidentialEvmScheme,
+  registerX402zEvmClientScheme,
   x402Client2 as x402Client,
   x402HTTPClient2 as x402HTTPClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402z-client",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -12,18 +12,13 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.js"
-    },
-    "./web": {
-      "types": "./dist/web.d.ts",
-      "import": "./dist/web.mjs",
-      "require": "./dist/web.js"
     }
   },
   "dependencies": {
     "@x402/core": "^2.0.0",
     "@x402/evm": "^2.0.0",
     "viem": "^2.39.3",
-    "x402z-shared": "0.0.8"
+    "x402z-shared": "0.0.9"
   },
   "devDependencies": {
     "jest": "^29.7.0",
@@ -31,7 +26,7 @@
     "@types/jest": "^29.5.12"
   },
   "scripts": {
-    "build": "tsup src/index.ts src/web.ts --format cjs,esm --dts",
+    "build": "tsup src/index.ts --format cjs,esm --dts",
     "test": "jest"
   }
 }