x402z-facilitator 0.0.11 → 0.1.0

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
@@ -514,6 +546,7 @@ function startFacilitatorService(config) {
 // src/service/bootstrap.ts
 var import_facilitator = require("@x402/core/facilitator");
 var import_evm = require("@x402/evm");
+var import_facilitator2 = require("@x402/evm/exact/facilitator");
 var import_viem2 = require("viem");
 var import_accounts = require("viem/accounts");
 function requireEnv(key) {
@@ -526,18 +559,26 @@ function requireEnv(key) {
 function createFacilitatorFromEnv() {
   const privateKey = requireEnv("FACILITATOR_EVM_PRIVATE_KEY");
   const chainId = Number(process.env.FACILITATOR_EVM_CHAIN_ID ?? "11155111");
-  const rpcUrl = requireEnv("FACILITATOR_EVM_RPC_URL");
+  const rpcUrl = process.env.FACILITATOR_EVM_RPC_URL ?? process.env.RPC_URL;
+  if (!rpcUrl) {
+    throw new Error("Missing required env var: RPC_URL or FACILITATOR_EVM_RPC_URL");
+  }
   const networks = (process.env.FACILITATOR_NETWORKS ?? "eip155:11155111").split(",").map((network) => network.trim()).filter(Boolean);
   const waitForReceipt = (process.env.FACILITATOR_WAIT_FOR_RECEIPT ?? "true") === "true";
   const batcherAddress = process.env.FACILITATOR_BATCHER_ADDRESS;
   if (!batcherAddress) {
     throw new Error("FACILITATOR_BATCHER_ADDRESS is required");
   }
+  const confidentialAsset = process.env.FACILITATOR_CONFIDENTIAL_ASSET;
+  const confidentialEip712Name = process.env.FACILITATOR_CONFIDENTIAL_EIP712_NAME;
+  const confidentialEip712Version = process.env.FACILITATOR_CONFIDENTIAL_EIP712_VERSION;
+  const confidentialDecimals = process.env.FACILITATOR_CONFIDENTIAL_DECIMALS ? Number(process.env.FACILITATOR_CONFIDENTIAL_DECIMALS) : void 0;
   const batchIntervalMs = process.env.FACILITATOR_BATCH_INTERVAL_MS ? Number(process.env.FACILITATOR_BATCH_INTERVAL_MS) : void 0;
   const receiptTimeoutMs = process.env.FACILITATOR_RECEIPT_TIMEOUT_MS ? Number(process.env.FACILITATOR_RECEIPT_TIMEOUT_MS) : void 0;
   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) {
@@ -548,6 +589,7 @@ function createFacilitatorFromEnv() {
       waitForReceipt,
       batcherAddress,
       gasMultiplier,
+      feeMultiplier,
       batchIntervalMs,
       receipt: {
         confirmations: receiptConfirmations,
@@ -577,6 +619,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({
@@ -594,17 +638,59 @@ 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)
   });
@@ -621,6 +707,10 @@ function createFacilitatorFromEnv() {
     }
   };
   const facilitator = new import_facilitator.x402Facilitator();
+  (0, import_facilitator2.registerExactEvmScheme)(facilitator, {
+    signer: baseSigner,
+    networks
+  });
   for (const network of networks) {
     facilitator.register(
       network,
@@ -637,6 +727,34 @@ function createFacilitatorFromEnv() {
       })
     );
   }
+  const supportedConfidential = confidentialAsset && confidentialEip712Name && confidentialEip712Version && batcherAddress ? {
+    asset: confidentialAsset,
+    eip712: {
+      name: confidentialEip712Name,
+      version: confidentialEip712Version
+    },
+    decimals: confidentialDecimals ?? 6,
+    batcherAddress
+  } : null;
+  if (supportedConfidential) {
+    const originalGetSupported = facilitator.getSupported.bind(facilitator);
+    facilitator.getSupported = () => {
+      const supported = originalGetSupported();
+      return {
+        ...supported,
+        kinds: supported.kinds.map((kind) => {
+          if (kind.scheme !== "erc7984-mind-v1") {
+            return kind;
+          }
+          const extra = {
+            ...kind.extra,
+            confidential: supportedConfidential
+          };
+          return { ...kind, extra };
+        })
+      };
+    };
+  }
   return facilitator;
 }
 function startFacilitator() {

package/dist/index.mjs

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

package/dist/service/bootstrap.js

@@ -26,6 +26,7 @@ __export(bootstrap_exports, {
 module.exports = __toCommonJS(bootstrap_exports);
 var import_facilitator = require("@x402/core/facilitator");
 var import_evm = require("@x402/evm");
+var import_facilitator2 = require("@x402/evm/exact/facilitator");
 var import_viem2 = require("viem");
 var import_accounts = require("viem/accounts");
 
@@ -262,6 +263,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
@@ -507,18 +540,26 @@ function requireEnv(key) {
 function createFacilitatorFromEnv() {
   const privateKey = requireEnv("FACILITATOR_EVM_PRIVATE_KEY");
   const chainId = Number(process.env.FACILITATOR_EVM_CHAIN_ID ?? "11155111");
-  const rpcUrl = requireEnv("FACILITATOR_EVM_RPC_URL");
+  const rpcUrl = process.env.FACILITATOR_EVM_RPC_URL ?? process.env.RPC_URL;
+  if (!rpcUrl) {
+    throw new Error("Missing required env var: RPC_URL or FACILITATOR_EVM_RPC_URL");
+  }
   const networks = (process.env.FACILITATOR_NETWORKS ?? "eip155:11155111").split(",").map((network) => network.trim()).filter(Boolean);
   const waitForReceipt = (process.env.FACILITATOR_WAIT_FOR_RECEIPT ?? "true") === "true";
   const batcherAddress = process.env.FACILITATOR_BATCHER_ADDRESS;
   if (!batcherAddress) {
     throw new Error("FACILITATOR_BATCHER_ADDRESS is required");
   }
+  const confidentialAsset = process.env.FACILITATOR_CONFIDENTIAL_ASSET;
+  const confidentialEip712Name = process.env.FACILITATOR_CONFIDENTIAL_EIP712_NAME;
+  const confidentialEip712Version = process.env.FACILITATOR_CONFIDENTIAL_EIP712_VERSION;
+  const confidentialDecimals = process.env.FACILITATOR_CONFIDENTIAL_DECIMALS ? Number(process.env.FACILITATOR_CONFIDENTIAL_DECIMALS) : void 0;
   const batchIntervalMs = process.env.FACILITATOR_BATCH_INTERVAL_MS ? Number(process.env.FACILITATOR_BATCH_INTERVAL_MS) : void 0;
   const receiptTimeoutMs = process.env.FACILITATOR_RECEIPT_TIMEOUT_MS ? Number(process.env.FACILITATOR_RECEIPT_TIMEOUT_MS) : void 0;
   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) {
@@ -529,6 +570,7 @@ function createFacilitatorFromEnv() {
       waitForReceipt,
       batcherAddress,
       gasMultiplier,
+      feeMultiplier,
       batchIntervalMs,
       receipt: {
         confirmations: receiptConfirmations,
@@ -558,6 +600,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({
@@ -575,17 +619,59 @@ 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)
   });
@@ -602,6 +688,10 @@ function createFacilitatorFromEnv() {
     }
   };
   const facilitator = new import_facilitator.x402Facilitator();
+  (0, import_facilitator2.registerExactEvmScheme)(facilitator, {
+    signer: baseSigner,
+    networks
+  });
   for (const network of networks) {
     facilitator.register(
       network,
@@ -618,6 +708,34 @@ function createFacilitatorFromEnv() {
       })
     );
   }
+  const supportedConfidential = confidentialAsset && confidentialEip712Name && confidentialEip712Version && batcherAddress ? {
+    asset: confidentialAsset,
+    eip712: {
+      name: confidentialEip712Name,
+      version: confidentialEip712Version
+    },
+    decimals: confidentialDecimals ?? 6,
+    batcherAddress
+  } : null;
+  if (supportedConfidential) {
+    const originalGetSupported = facilitator.getSupported.bind(facilitator);
+    facilitator.getSupported = () => {
+      const supported = originalGetSupported();
+      return {
+        ...supported,
+        kinds: supported.kinds.map((kind) => {
+          if (kind.scheme !== "erc7984-mind-v1") {
+            return kind;
+          }
+          const extra = {
+            ...kind.extra,
+            confidential: supportedConfidential
+          };
+          return { ...kind, extra };
+        })
+      };
+    };
+  }
   return facilitator;
 }
 function startFacilitator() {

package/dist/service/bootstrap.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402z-facilitator",
-  "version": "0.0.11",
+  "version": "0.1.0",
   "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.19"
+    "x402z-shared": "0.1.0"
   },
   "devDependencies": {
     "jest": "^29.7.0",