x402z-facilitator 0.0.10 → 0.0.12

package/dist/index.d.mts

@@ -5,8 +5,16 @@ import * as http from 'http';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { startFacilitator } from './service/bootstrap.mjs';
 
+type X402zFacilitatorSigner = FacilitatorEvmSigner & {
+    simulateContract: (args: {
+        address: `0x${string}`;
+        abi: readonly unknown[];
+        functionName: string;
+        args?: readonly unknown[];
+    }) => Promise<readonly [boolean[], `0x${string}`[]]>;
+};
 type X402zFacilitatorSchemeOptions = {
-    signer: FacilitatorEvmSigner;
+    signer: X402zFacilitatorSigner;
     batcherAddress: `0x${string}`;
     hashEncryptedAmountInput?: (encryptedAmountInput: `0x${string}`) => `0x${string}`;
     checkUsedNonces?: boolean;

package/dist/index.d.ts

@@ -5,8 +5,16 @@ import * as http from 'http';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { startFacilitator } from './service/bootstrap.js';
 
+type X402zFacilitatorSigner = FacilitatorEvmSigner & {
+    simulateContract: (args: {
+        address: `0x${string}`;
+        abi: readonly unknown[];
+        functionName: string;
+        args?: readonly unknown[];
+    }) => Promise<readonly [boolean[], `0x${string}`[]]>;
+};
 type X402zFacilitatorSchemeOptions = {
-    signer: FacilitatorEvmSigner;
+    signer: X402zFacilitatorSigner;
     batcherAddress: `0x${string}`;
     hashEncryptedAmountInput?: (encryptedAmountInput: `0x${string}`) => `0x${string}`;
     checkUsedNonces?: boolean;

package/dist/index.js

@@ -210,6 +210,38 @@ var X402zEvmFacilitator = class {
         };
       }
     }
+    try {
+      const txRequest = {
+        address: this.batcherAddress,
+        abi: batcherAbi,
+        functionName: "batchConfidentialTransferWithAuthorization",
+        args: [
+          (0, import_viem.getAddress)(requirements.asset),
+          [
+            {
+              p: confidentialPayload.authorization,
+              encryptedAmountInput: confidentialPayload.encryptedAmountInput,
+              inputProof: confidentialPayload.inputProof,
+              sig: confidentialPayload.signature
+            }
+          ]
+        ]
+      };
+      const [successes] = await this.config.signer.simulateContract(txRequest);
+      if (!successes[0]) {
+        return {
+          isValid: false,
+          invalidReason: "preflight_failed",
+          payer: confidentialPayload.authorization.holder
+        };
+      }
+    } catch {
+      return {
+        isValid: false,
+        invalidReason: "preflight_failed",
+        payer: confidentialPayload.authorization.holder
+      };
+    }
     return {
       isValid: true,
       payer: confidentialPayload.authorization.holder
@@ -263,7 +295,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 +304,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 +322,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 +394,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 +408,7 @@ var X402zEvmFacilitator = class {
       }
     }
     if (!this.waitForReceipt) {
-      entries.forEach((entry) => {
+      settleEntries.forEach((entry) => {
         const confidentialPayload = entry.payload.payload;
         entry.resolve({
           success: true,
@@ -370,31 +451,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 }
+      });
     });
   }
 };
@@ -493,6 +570,7 @@ function createFacilitatorFromEnv() {
   const receiptConfirmations = process.env.FACILITATOR_RECEIPT_CONFIRMATIONS ? Number(process.env.FACILITATOR_RECEIPT_CONFIRMATIONS) : void 0;
   const receiptPollingIntervalMs = process.env.FACILITATOR_RECEIPT_POLLING_INTERVAL_MS ? Number(process.env.FACILITATOR_RECEIPT_POLLING_INTERVAL_MS) : void 0;
   const gasMultiplier = process.env.FACILITATOR_GAS_MULTIPLIER ? Number(process.env.FACILITATOR_GAS_MULTIPLIER) : void 0;
+  const feeMultiplier = process.env.FACILITATOR_FEE_MULTIPLIER ? Number(process.env.FACILITATOR_FEE_MULTIPLIER) : void 0;
   const debugEnabled = process.env.X402Z_DEBUG === "1";
   const account = (0, import_accounts.privateKeyToAccount)(privateKey);
   if (debugEnabled) {
@@ -503,6 +581,7 @@ function createFacilitatorFromEnv() {
       waitForReceipt,
       batcherAddress,
       gasMultiplier,
+      feeMultiplier,
       batchIntervalMs,
       receipt: {
         confirmations: receiptConfirmations,
@@ -522,7 +601,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,
@@ -532,6 +611,8 @@ function createFacilitatorFromEnv() {
     verifyTypedData: (args) => client.verifyTypedData(args),
     writeContract: async (args) => {
       let gas;
+      let maxFeePerGas;
+      let maxPriorityFeePerGas;
       if (gasMultiplier && gasMultiplier > 0) {
         try {
           const estimated = await client.estimateContractGas({
@@ -549,20 +630,74 @@ function createFacilitatorFromEnv() {
           }
         }
       }
+      if (feeMultiplier && feeMultiplier > 0) {
+        try {
+          const fees = await client.estimateFeesPerGas();
+          if (fees.maxFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxFeePerGas = fees.maxFeePerGas * scale / 1000n;
+          }
+          if (fees.maxPriorityFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxPriorityFeePerGas = fees.maxPriorityFeePerGas * scale / 1000n;
+          }
+        } catch (error) {
+          if (debugEnabled) {
+            console.debug("[x402z-facilitator] fee estimate failed", error);
+          }
+        }
+      }
       return client.writeContract({
         ...args,
         args: args.args || [],
-        ...gas ? { gas } : {}
+        ...gas ? { gas } : {},
+        ...maxFeePerGas ? { maxFeePerGas } : {},
+        ...maxPriorityFeePerGas ? { maxPriorityFeePerGas } : {}
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       });
     },
-    sendTransaction: (args) => (
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      client.sendTransaction({ to: args.to, data: args.data })
-    ),
+    sendTransaction: async (args) => {
+      let maxFeePerGas;
+      let maxPriorityFeePerGas;
+      if (feeMultiplier && feeMultiplier > 0) {
+        try {
+          const fees = await client.estimateFeesPerGas();
+          if (fees.maxFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxFeePerGas = fees.maxFeePerGas * scale / 1000n;
+          }
+          if (fees.maxPriorityFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxPriorityFeePerGas = fees.maxPriorityFeePerGas * scale / 1000n;
+          }
+        } catch (error) {
+          if (debugEnabled) {
+            console.debug("[x402z-facilitator] fee estimate failed", error);
+          }
+        }
+      }
+      return client.sendTransaction({
+        to: args.to,
+        data: args.data,
+        ...maxFeePerGas ? { maxFeePerGas } : {},
+        ...maxPriorityFeePerGas ? { maxPriorityFeePerGas } : {}
+      });
+    },
     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-TDT6WJI7.mjs";
 
 // src/scheme/register.ts
 function registerX402zEvmFacilitatorScheme(facilitator, config) {

package/dist/service/bootstrap.js

@@ -262,6 +262,38 @@ var X402zEvmFacilitator = class {
         };
       }
     }
+    try {
+      const txRequest = {
+        address: this.batcherAddress,
+        abi: batcherAbi,
+        functionName: "batchConfidentialTransferWithAuthorization",
+        args: [
+          (0, import_viem.getAddress)(requirements.asset),
+          [
+            {
+              p: confidentialPayload.authorization,
+              encryptedAmountInput: confidentialPayload.encryptedAmountInput,
+              inputProof: confidentialPayload.inputProof,
+              sig: confidentialPayload.signature
+            }
+          ]
+        ]
+      };
+      const [successes] = await this.config.signer.simulateContract(txRequest);
+      if (!successes[0]) {
+        return {
+          isValid: false,
+          invalidReason: "preflight_failed",
+          payer: confidentialPayload.authorization.holder
+        };
+      }
+    } catch {
+      return {
+        isValid: false,
+        invalidReason: "preflight_failed",
+        payer: confidentialPayload.authorization.holder
+      };
+    }
     return {
       isValid: true,
       payer: confidentialPayload.authorization.holder
@@ -315,7 +347,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 +356,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 +374,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 +446,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 +460,7 @@ var X402zEvmFacilitator = class {
       }
     }
     if (!this.waitForReceipt) {
-      entries.forEach((entry) => {
+      settleEntries.forEach((entry) => {
         const confidentialPayload = entry.payload.payload;
         entry.resolve({
           success: true,
@@ -422,31 +503,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 }
+      });
     });
   }
 };
@@ -474,6 +551,7 @@ function createFacilitatorFromEnv() {
   const receiptConfirmations = process.env.FACILITATOR_RECEIPT_CONFIRMATIONS ? Number(process.env.FACILITATOR_RECEIPT_CONFIRMATIONS) : void 0;
   const receiptPollingIntervalMs = process.env.FACILITATOR_RECEIPT_POLLING_INTERVAL_MS ? Number(process.env.FACILITATOR_RECEIPT_POLLING_INTERVAL_MS) : void 0;
   const gasMultiplier = process.env.FACILITATOR_GAS_MULTIPLIER ? Number(process.env.FACILITATOR_GAS_MULTIPLIER) : void 0;
+  const feeMultiplier = process.env.FACILITATOR_FEE_MULTIPLIER ? Number(process.env.FACILITATOR_FEE_MULTIPLIER) : void 0;
   const debugEnabled = process.env.X402Z_DEBUG === "1";
   const account = (0, import_accounts.privateKeyToAccount)(privateKey);
   if (debugEnabled) {
@@ -484,6 +562,7 @@ function createFacilitatorFromEnv() {
       waitForReceipt,
       batcherAddress,
       gasMultiplier,
+      feeMultiplier,
       batchIntervalMs,
       receipt: {
         confirmations: receiptConfirmations,
@@ -503,7 +582,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,
@@ -513,6 +592,8 @@ function createFacilitatorFromEnv() {
     verifyTypedData: (args) => client.verifyTypedData(args),
     writeContract: async (args) => {
       let gas;
+      let maxFeePerGas;
+      let maxPriorityFeePerGas;
       if (gasMultiplier && gasMultiplier > 0) {
         try {
           const estimated = await client.estimateContractGas({
@@ -530,20 +611,74 @@ function createFacilitatorFromEnv() {
           }
         }
       }
+      if (feeMultiplier && feeMultiplier > 0) {
+        try {
+          const fees = await client.estimateFeesPerGas();
+          if (fees.maxFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxFeePerGas = fees.maxFeePerGas * scale / 1000n;
+          }
+          if (fees.maxPriorityFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxPriorityFeePerGas = fees.maxPriorityFeePerGas * scale / 1000n;
+          }
+        } catch (error) {
+          if (debugEnabled) {
+            console.debug("[x402z-facilitator] fee estimate failed", error);
+          }
+        }
+      }
       return client.writeContract({
         ...args,
         args: args.args || [],
-        ...gas ? { gas } : {}
+        ...gas ? { gas } : {},
+        ...maxFeePerGas ? { maxFeePerGas } : {},
+        ...maxPriorityFeePerGas ? { maxPriorityFeePerGas } : {}
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       });
     },
-    sendTransaction: (args) => (
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      client.sendTransaction({ to: args.to, data: args.data })
-    ),
+    sendTransaction: async (args) => {
+      let maxFeePerGas;
+      let maxPriorityFeePerGas;
+      if (feeMultiplier && feeMultiplier > 0) {
+        try {
+          const fees = await client.estimateFeesPerGas();
+          if (fees.maxFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxFeePerGas = fees.maxFeePerGas * scale / 1000n;
+          }
+          if (fees.maxPriorityFeePerGas) {
+            const scale = BigInt(Math.round(feeMultiplier * 1e3));
+            maxPriorityFeePerGas = fees.maxPriorityFeePerGas * scale / 1000n;
+          }
+        } catch (error) {
+          if (debugEnabled) {
+            console.debug("[x402z-facilitator] fee estimate failed", error);
+          }
+        }
+      }
+      return client.sendTransaction({
+        to: args.to,
+        data: args.data,
+        ...maxFeePerGas ? { maxFeePerGas } : {},
+        ...maxPriorityFeePerGas ? { maxPriorityFeePerGas } : {}
+      });
+    },
     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-TDT6WJI7.mjs";
 export {
   createFacilitatorFromEnv,
   startFacilitator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402z-facilitator",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "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",