x402z-server 0.0.3 → 0.0.4

package/README.md

@@ -24,7 +24,7 @@ const server = await createX402zServer({
   asset: "0xToken",
   eip712: { name: "FHEToken Confidential", version: "1" },
   decimals: 6,
-  facilitatorAddress: "0xFacilitator",
+  batcherAddress: "0xBatcher",
   signer: { address, signTypedData },
   relayer,
   routes: {
@@ -51,7 +51,7 @@ server.listen(8080);
 
 - `createX402zServer(config)`
   - `facilitatorUrl` (required): HTTP facilitator endpoint
-  - `asset`, `eip712`, `decimals`, `facilitatorAddress`: scheme config
+- `asset`, `eip712`, `decimals`, `batcherAddress`: scheme config
   - `signer` (required): signer used to decrypt transfer amounts
   - `relayer` (required): FHEVM relayer instance used for decryption
   - `routes`: map of `METHOD /path` to payment requirements
@@ -60,4 +60,4 @@ server.listen(8080);
 ## Notes
 
 - Scheme name: `erc7984-mind-v1`
-- `confidential.facilitatorAddress` is included in requirements so clients can bind encrypted inputs.
+- `confidential.batcherAddress` is required in requirements; clients bind encrypted inputs to it.

package/dist/index.d.mts

@@ -14,7 +14,7 @@ type ConfidentialServerNetworkConfig = {
     };
     decimals?: number;
     resourceHash?: `0x${string}`;
-    facilitatorAddress?: `0x${string}`;
+    batcherAddress: `0x${string}`;
 };
 type ConfidentialServerConfig = ConfidentialServerNetworkConfig | {
     getNetworkConfig: (network: Network) => ConfidentialServerNetworkConfig;

package/dist/index.d.ts

@@ -14,7 +14,7 @@ type ConfidentialServerNetworkConfig = {
     };
     decimals?: number;
     resourceHash?: `0x${string}`;
-    facilitatorAddress?: `0x${string}`;
+    batcherAddress: `0x${string}`;
 };
 type ConfidentialServerConfig = ConfidentialServerNetworkConfig | {
     getNetworkConfig: (network: Network) => ConfidentialServerNetworkConfig;

package/dist/index.js

@@ -52,15 +52,16 @@ var ConfidentialEvmScheme = class {
     }
     const amount = this.parseMoneyToDecimal(price);
     const config = this.getConfig(network);
+    const tokenAmount = this.convertToTokenAmount(amount.toString(), config.decimals ?? 6);
     return {
-      amount: this.convertToTokenAmount(amount.toString(), config.decimals ?? 6),
+      amount: tokenAmount,
       asset: config.asset,
       extra: {
         eip712: config.eip712,
         confidential: {
-          maxClearAmount: amount.toString(),
+          maxClearAmount: tokenAmount,
           resourceHash: config.resourceHash,
-          facilitatorAddress: config.facilitatorAddress
+          batcherAddress: config.batcherAddress
         }
       }
     };
@@ -76,7 +77,7 @@ var ConfidentialEvmScheme = class {
       confidential: {
         maxClearAmount: extra?.confidential?.maxClearAmount ?? paymentRequirements.amount,
         resourceHash: extra?.confidential?.resourceHash ?? config.resourceHash,
-        facilitatorAddress: extra?.confidential?.facilitatorAddress ?? config.facilitatorAddress
+        batcherAddress: extra?.confidential?.batcherAddress ?? config.batcherAddress
       }
     };
     return {
@@ -217,18 +218,22 @@ async function createX402zServer(config) {
           console.log(`[server] ${method} ${path} -> 500 observer_required`);
           return;
         }
-        const transfers = await (0, import_x402z_shared.viewConfidentialTransferAmounts)({
-          rpcUrl,
-          tokenAddress: result.paymentRequirements.asset,
-          txHash: settle.transaction,
-          from: settle.payer,
-          to: result.paymentRequirements.payTo,
+        const batch = settle;
+        const transferredHandle = batch.batch?.transferredHandle;
+        if (!transferredHandle) {
+          res.writeHead(500, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "missing_transferred_handle" }));
+          console.log(`[server] ${method} ${path} -> 500 missing_transferred_handle`);
+          return;
+        }
+        const decryptedAmount = await (0, import_x402z_shared.userDecryptEuint64)(
           relayer,
-          signer: config.signer
-        });
+          transferredHandle,
+          result.paymentRequirements.asset,
+          config.signer
+        );
         const expected = BigInt(result.paymentRequirements.amount);
-        const matched = transfers.some((transfer) => transfer.amount === expected);
-        if (!matched) {
+        if (decryptedAmount !== expected) {
           res.writeHead(500, { "Content-Type": "application/json" });
           res.end(JSON.stringify({ error: "settlement_amount_mismatch" }));
           console.log(`[server] ${method} ${path} -> 500 settlement_amount_mismatch`);

package/dist/index.mjs

@@ -21,15 +21,16 @@ var ConfidentialEvmScheme = class {
     }
     const amount = this.parseMoneyToDecimal(price);
     const config = this.getConfig(network);
+    const tokenAmount = this.convertToTokenAmount(amount.toString(), config.decimals ?? 6);
     return {
-      amount: this.convertToTokenAmount(amount.toString(), config.decimals ?? 6),
+      amount: tokenAmount,
       asset: config.asset,
       extra: {
         eip712: config.eip712,
         confidential: {
-          maxClearAmount: amount.toString(),
+          maxClearAmount: tokenAmount,
           resourceHash: config.resourceHash,
-          facilitatorAddress: config.facilitatorAddress
+          batcherAddress: config.batcherAddress
         }
       }
     };
@@ -45,7 +46,7 @@ var ConfidentialEvmScheme = class {
       confidential: {
         maxClearAmount: extra?.confidential?.maxClearAmount ?? paymentRequirements.amount,
         resourceHash: extra?.confidential?.resourceHash ?? config.resourceHash,
-        facilitatorAddress: extra?.confidential?.facilitatorAddress ?? config.facilitatorAddress
+        batcherAddress: extra?.confidential?.batcherAddress ?? config.batcherAddress
       }
     };
     return {
@@ -93,7 +94,7 @@ import { URL } from "url";
 import { x402ResourceServer } from "@x402/core/server";
 import { x402HTTPResourceServer } from "@x402/core/http";
 import { HTTPFacilitatorClient } from "@x402/core/http";
-import { confidentialTokenAbi, viewConfidentialTransferAmounts } from "x402z-shared";
+import { confidentialTokenAbi, userDecryptEuint64 } from "x402z-shared";
 import { createPublicClient, getAddress, http, isAddressEqual } from "viem";
 function getRelayerRpcUrl(relayer) {
   const network = relayer.network;
@@ -186,18 +187,22 @@ async function createX402zServer(config) {
           console.log(`[server] ${method} ${path} -> 500 observer_required`);
           return;
         }
-        const transfers = await viewConfidentialTransferAmounts({
-          rpcUrl,
-          tokenAddress: result.paymentRequirements.asset,
-          txHash: settle.transaction,
-          from: settle.payer,
-          to: result.paymentRequirements.payTo,
+        const batch = settle;
+        const transferredHandle = batch.batch?.transferredHandle;
+        if (!transferredHandle) {
+          res.writeHead(500, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "missing_transferred_handle" }));
+          console.log(`[server] ${method} ${path} -> 500 missing_transferred_handle`);
+          return;
+        }
+        const decryptedAmount = await userDecryptEuint64(
           relayer,
-          signer: config.signer
-        });
+          transferredHandle,
+          result.paymentRequirements.asset,
+          config.signer
+        );
         const expected = BigInt(result.paymentRequirements.amount);
-        const matched = transfers.some((transfer) => transfer.amount === expected);
-        if (!matched) {
+        if (decryptedAmount !== expected) {
           res.writeHead(500, { "Content-Type": "application/json" });
           res.end(JSON.stringify({ error: "settlement_amount_mismatch" }));
           console.log(`[server] ${method} ${path} -> 500 settlement_amount_mismatch`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402z-server",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -10,7 +10,7 @@
   "dependencies": {
     "@x402/core": "^2.0.0",
     "viem": "^2.43.3",
-    "x402z-shared": "0.0.3"
+    "x402z-shared": "0.0.4"
   },
   "devDependencies": {
     "jest": "^29.7.0",