x402z-facilitator 0.0.10 → 0.0.11

package/dist/index.js

@@ -263,7 +263,7 @@ var X402zEvmFacilitator = class {
     }
   }
   async flushBatch(tokenAddress, entries) {
-    const requests = entries.map((entry) => {
+    const buildRequests = (batchEntries2) => batchEntries2.map(({ entry }) => {
       const confidentialPayload = entry.payload.payload;
       return {
         p: confidentialPayload.authorization,
@@ -272,7 +272,10 @@ var X402zEvmFacilitator = class {
         sig: confidentialPayload.signature
       };
     });
-    const txRequest = {
+    const originalEntries = entries.map((entry, index) => ({ entry, index }));
+    let batchEntries = originalEntries;
+    let requests = buildRequests(batchEntries);
+    let txRequest = {
       address: this.batcherAddress,
       abi: batcherAbi,
       functionName: "batchConfidentialTransferWithAuthorization",
@@ -287,11 +290,57 @@ var X402zEvmFacilitator = class {
         size: requests.length
       });
     }
+    try {
+      const [successes, transferredHandles] = await this.config.signer.simulateContract(txRequest);
+      if (successes.length === batchEntries.length && transferredHandles.length === batchEntries.length) {
+        const filtered = [];
+        batchEntries.forEach((item, index) => {
+          if (successes[index]) {
+            filtered.push(item);
+            return;
+          }
+          const confidentialPayload = item.entry.payload.payload;
+          item.entry.resolve({
+            success: false,
+            errorReason: "preflight_failed",
+            payer: confidentialPayload.authorization.holder,
+            transaction: "",
+            network: item.entry.requirements.network,
+            batch: { index: item.index, success: false, transferredHandle: transferredHandles[index] }
+          });
+        });
+        if (filtered.length === 0) {
+          return;
+        }
+        batchEntries = filtered;
+        requests = buildRequests(batchEntries);
+        txRequest = {
+          ...txRequest,
+          args: [tokenAddress, requests]
+        };
+      }
+    } catch (error) {
+      if (process.env.X402Z_DEBUG === "1") {
+        console.error("[x402z-facilitator] settle tx error", error);
+      }
+      for (const entry of entries) {
+        const confidentialPayload = entry.payload.payload;
+        entry.resolve({
+          success: false,
+          errorReason: "preflight_failed",
+          payer: confidentialPayload.authorization.holder,
+          transaction: "",
+          network: entry.requirements.network
+        });
+      }
+      return;
+    }
+    const settleEntries = batchEntries.map((item) => item.entry);
     let txHash;
     try {
       txHash = await this.config.signer.writeContract(txRequest);
     } catch (error) {
-      for (const entry of entries) {
+      for (const entry of settleEntries) {
         const confidentialPayload = entry.payload.payload;
         entry.resolve({
           success: false,
@@ -313,7 +362,7 @@ var X402zEvmFacilitator = class {
         console.debug("[x402z-facilitator] tx receipt", receipt);
       }
       if (receipt.status !== "success") {
-        for (const entry of entries) {
+        for (const entry of settleEntries) {
           const confidentialPayload = entry.payload.payload;
           entry.resolve({
             success: false,
@@ -327,7 +376,7 @@ var X402zEvmFacilitator = class {
       }
     }
     if (!this.waitForReceipt) {
-      entries.forEach((entry) => {
+      settleEntries.forEach((entry) => {
         const confidentialPayload = entry.payload.payload;
         entry.resolve({
           success: true,
@@ -370,31 +419,27 @@ var X402zEvmFacilitator = class {
         }
       }
     }
-    entries.forEach((entry, index) => {
+    settleEntries.forEach((entry, index) => {
       const confidentialPayload = entry.payload.payload;
       const batchResult = batchResults.get(index);
       if (!batchResult || !batchResult.success) {
-        entry.resolve(
-          {
-            success: false,
-            errorReason: "settlement_failed",
-            payer: confidentialPayload.authorization.holder,
-            transaction: txHash,
-            network: entry.requirements.network,
-            ...batchResult ? { batch: { index, ...batchResult } } : {}
-          }
-        );
-        return;
-      }
-      entry.resolve(
-        {
-          success: true,
+        entry.resolve({
+          success: false,
+          errorReason: "settlement_failed",
           payer: confidentialPayload.authorization.holder,
           transaction: txHash,
           network: entry.requirements.network,
-          batch: { index, ...batchResult }
-        }
-      );
+          ...batchResult ? { batch: { index, ...batchResult } } : {}
+        });
+        return;
+      }
+      entry.resolve({
+        success: true,
+        payer: confidentialPayload.authorization.holder,
+        transaction: txHash,
+        network: entry.requirements.network,
+        batch: { index, ...batchResult }
+      });
     });
   }
 };
@@ -522,7 +567,7 @@ function createFacilitatorFromEnv() {
     },
     transport: (0, import_viem2.http)(rpcUrl)
   }).extend(import_viem2.publicActions);
-  const signer = (0, import_evm.toFacilitatorEvmSigner)({
+  const baseSigner = (0, import_evm.toFacilitatorEvmSigner)({
     address: account.address,
     readContract: (args) => client.readContract({
       ...args,
@@ -563,6 +608,18 @@ function createFacilitatorFromEnv() {
     waitForTransactionReceipt: (args) => client.waitForTransactionReceipt(args),
     getCode: (args) => client.getCode(args)
   });
+  const signer = {
+    ...baseSigner,
+    simulateContract: async (args) => {
+      const result = await client.simulateContract({
+        ...args,
+        args: args.args || [],
+        account
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      });
+      return result.result;
+    }
+  };
   const facilitator = new import_facilitator.x402Facilitator();
   for (const network of networks) {
     facilitator.register(

package/dist/index.mjs

@@ -3,7 +3,7 @@ import {
   createFacilitatorService,
   startFacilitator,
   startFacilitatorService
-} from "./chunk-3XCMVK47.mjs";
+} from "./chunk-3E55KK5J.mjs";
 
 // src/scheme/register.ts
 function registerX402zEvmFacilitatorScheme(facilitator, config) {

package/dist/service/bootstrap.js

@@ -315,7 +315,7 @@ var X402zEvmFacilitator = class {
     }
   }
   async flushBatch(tokenAddress, entries) {
-    const requests = entries.map((entry) => {
+    const buildRequests = (batchEntries2) => batchEntries2.map(({ entry }) => {
       const confidentialPayload = entry.payload.payload;
       return {
         p: confidentialPayload.authorization,
@@ -324,7 +324,10 @@ var X402zEvmFacilitator = class {
         sig: confidentialPayload.signature
       };
     });
-    const txRequest = {
+    const originalEntries = entries.map((entry, index) => ({ entry, index }));
+    let batchEntries = originalEntries;
+    let requests = buildRequests(batchEntries);
+    let txRequest = {
       address: this.batcherAddress,
       abi: batcherAbi,
       functionName: "batchConfidentialTransferWithAuthorization",
@@ -339,11 +342,57 @@ var X402zEvmFacilitator = class {
         size: requests.length
       });
     }
+    try {
+      const [successes, transferredHandles] = await this.config.signer.simulateContract(txRequest);
+      if (successes.length === batchEntries.length && transferredHandles.length === batchEntries.length) {
+        const filtered = [];
+        batchEntries.forEach((item, index) => {
+          if (successes[index]) {
+            filtered.push(item);
+            return;
+          }
+          const confidentialPayload = item.entry.payload.payload;
+          item.entry.resolve({
+            success: false,
+            errorReason: "preflight_failed",
+            payer: confidentialPayload.authorization.holder,
+            transaction: "",
+            network: item.entry.requirements.network,
+            batch: { index: item.index, success: false, transferredHandle: transferredHandles[index] }
+          });
+        });
+        if (filtered.length === 0) {
+          return;
+        }
+        batchEntries = filtered;
+        requests = buildRequests(batchEntries);
+        txRequest = {
+          ...txRequest,
+          args: [tokenAddress, requests]
+        };
+      }
+    } catch (error) {
+      if (process.env.X402Z_DEBUG === "1") {
+        console.error("[x402z-facilitator] settle tx error", error);
+      }
+      for (const entry of entries) {
+        const confidentialPayload = entry.payload.payload;
+        entry.resolve({
+          success: false,
+          errorReason: "preflight_failed",
+          payer: confidentialPayload.authorization.holder,
+          transaction: "",
+          network: entry.requirements.network
+        });
+      }
+      return;
+    }
+    const settleEntries = batchEntries.map((item) => item.entry);
     let txHash;
     try {
       txHash = await this.config.signer.writeContract(txRequest);
     } catch (error) {
-      for (const entry of entries) {
+      for (const entry of settleEntries) {
         const confidentialPayload = entry.payload.payload;
         entry.resolve({
           success: false,
@@ -365,7 +414,7 @@ var X402zEvmFacilitator = class {
         console.debug("[x402z-facilitator] tx receipt", receipt);
       }
       if (receipt.status !== "success") {
-        for (const entry of entries) {
+        for (const entry of settleEntries) {
           const confidentialPayload = entry.payload.payload;
           entry.resolve({
             success: false,
@@ -379,7 +428,7 @@ var X402zEvmFacilitator = class {
       }
     }
     if (!this.waitForReceipt) {
-      entries.forEach((entry) => {
+      settleEntries.forEach((entry) => {
         const confidentialPayload = entry.payload.payload;
         entry.resolve({
           success: true,
@@ -422,31 +471,27 @@ var X402zEvmFacilitator = class {
         }
       }
     }
-    entries.forEach((entry, index) => {
+    settleEntries.forEach((entry, index) => {
       const confidentialPayload = entry.payload.payload;
       const batchResult = batchResults.get(index);
       if (!batchResult || !batchResult.success) {
-        entry.resolve(
-          {
-            success: false,
-            errorReason: "settlement_failed",
-            payer: confidentialPayload.authorization.holder,
-            transaction: txHash,
-            network: entry.requirements.network,
-            ...batchResult ? { batch: { index, ...batchResult } } : {}
-          }
-        );
-        return;
-      }
-      entry.resolve(
-        {
-          success: true,
+        entry.resolve({
+          success: false,
+          errorReason: "settlement_failed",
           payer: confidentialPayload.authorization.holder,
           transaction: txHash,
           network: entry.requirements.network,
-          batch: { index, ...batchResult }
-        }
-      );
+          ...batchResult ? { batch: { index, ...batchResult } } : {}
+        });
+        return;
+      }
+      entry.resolve({
+        success: true,
+        payer: confidentialPayload.authorization.holder,
+        transaction: txHash,
+        network: entry.requirements.network,
+        batch: { index, ...batchResult }
+      });
     });
   }
 };
@@ -503,7 +548,7 @@ function createFacilitatorFromEnv() {
     },
     transport: (0, import_viem2.http)(rpcUrl)
   }).extend(import_viem2.publicActions);
-  const signer = (0, import_evm.toFacilitatorEvmSigner)({
+  const baseSigner = (0, import_evm.toFacilitatorEvmSigner)({
     address: account.address,
     readContract: (args) => client.readContract({
       ...args,
@@ -544,6 +589,18 @@ function createFacilitatorFromEnv() {
     waitForTransactionReceipt: (args) => client.waitForTransactionReceipt(args),
     getCode: (args) => client.getCode(args)
   });
+  const signer = {
+    ...baseSigner,
+    simulateContract: async (args) => {
+      const result = await client.simulateContract({
+        ...args,
+        args: args.args || [],
+        account
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      });
+      return result.result;
+    }
+  };
   const facilitator = new import_facilitator.x402Facilitator();
   for (const network of networks) {
     facilitator.register(

package/dist/service/bootstrap.mjs

@@ -1,7 +1,7 @@
 import {
   createFacilitatorFromEnv,
   startFacilitator
-} from "../chunk-3XCMVK47.mjs";
+} from "../chunk-3E55KK5J.mjs";
 export {
   createFacilitatorFromEnv,
   startFacilitator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402z-facilitator",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -11,7 +11,7 @@
     "@x402/core": "^2.0.0",
     "@x402/evm": "^2.0.0",
     "viem": "^2.39.3",
-    "x402z-shared": "0.0.10"
+    "x402z-shared": "0.0.19"
   },
   "devDependencies": {
     "jest": "^29.7.0",