@faremeter/payment-evm 0.10.3 → 0.11.1

package/dist/src/exact/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAWhC,UAAU,gBAAgB;IACxB,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE;QACP,aAAa,EAAE,CAAC,MAAM,EAAE;YACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/B,WAAW,EAAE,MAAM,CAAC;YACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAClC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;KACpB,CAAC;CACH;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,uBAAuB,CAAC;CACjC,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,gBAAgB,EACxB,IAAI,GAAE,wBAA6B,GAClC,cAAc,CAkGhB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAYhC,UAAU,gBAAgB;IACxB,KAAK,EAAE;QACL,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE;QACP,aAAa,EAAE,CAAC,MAAM,EAAE;YACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/B,WAAW,EAAE,MAAM,CAAC;YACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAClC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;KACpB,CAAC;CACH;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,uBAAuB,CAAC;CACjC,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,gBAAgB,EACxB,IAAI,GAAE,wBAA6B,GAClC,cAAc,CAqGhB"}

package/dist/src/exact/client.js

@@ -2,15 +2,17 @@ import { randomBytes } from "crypto";
 import { lookupX402Network, findAssetInfo, } from "@faremeter/info/evm";
 import { isAddress } from "viem";
 import { type } from "arktype";
-import { X402_EXACT_SCHEME, EIP712_TYPES, eip712Domain, } from "./constants.js";
+import { EIP712_TYPES, eip712Domain, } from "./constants.js";
+import { generateMatcher } from "./common.js";
 export function createPaymentHandler(wallet, opts = {}) {
     const x402Network = lookupX402Network(wallet.chain.id);
     const assetInfo = findAssetInfo(x402Network, opts.asset ?? "USDC");
     if (!assetInfo) {
         throw new Error(`Couldn't look up USDC information on network '${x402Network}'`);
     }
+    const { isMatchingRequirement } = generateMatcher(x402Network, assetInfo.address);
     return async function handlePayment(context, accepts) {
-        const compatibleRequirements = accepts.filter((req) => req.scheme === X402_EXACT_SCHEME && req.network === x402Network);
+        const compatibleRequirements = accepts.filter(isMatchingRequirement);
         return compatibleRequirements.map((requirements) => ({
             requirements,
             exec: async () => {

package/dist/src/exact/common.d.ts

@@ -15,4 +15,16 @@ export declare function generateForwarderDomain(chainId: number, domainInfo: {
     name: string;
     verifyingContract: `0x${string}`;
 };
+export declare function generateMatcher(network: string, asset: string): {
+    matchTuple: import("arktype/internal/methods/object.ts").ObjectType<{
+        scheme: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
+        network: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
+        asset: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
+    }, {}>;
+    isMatchingRequirement: (req: {
+        scheme: string;
+        network: string;
+        asset: string;
+    }) => boolean;
+};
 //# sourceMappingURL=common.d.ts.map

package/dist/src/exact/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/exact/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAI9C,wBAAsB,cAAc,CAClC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,GAAG;;;;;GA8BX;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,KAAK,MAAM,EAAE,CAAC;CAClC;;aAHU,MAAM;UACT,MAAM;uBACO,KAAK,MAAM,EAAE;EAOnC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/exact/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAQ9C,wBAAsB,cAAc,CAClC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,GAAG;;;;;GA8BX;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,KAAK,MAAM,EAAE,CAAC;CAClC;;aAHU,MAAM;UACT,MAAM;uBACO,KAAK,MAAM,EAAE;EAOnC;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;EAE7D"}

package/dist/src/exact/common.js

@@ -1,4 +1,5 @@
-import { TRANSFER_WITH_AUTHORIZATION_ABI } from "./constants.js";
+import { generateRequirementsMatcher } from "@faremeter/types/x402";
+import { TRANSFER_WITH_AUTHORIZATION_ABI, X402_EXACT_SCHEME, } from "./constants.js";
 export async function generateDomain(publicClient, chainId, asset) {
     // Read domain parameters from chain
     let tokenName;
@@ -34,3 +35,6 @@ export function generateForwarderDomain(chainId, domainInfo) {
         chainId,
     };
 }
+export function generateMatcher(network, asset) {
+    return generateRequirementsMatcher([X402_EXACT_SCHEME], [network], [asset]);
+}

package/dist/src/exact/facilitator.d.ts

@@ -1,10 +1,11 @@
+import { type ChainInfo } from "@faremeter/types/evm";
 import { type FacilitatorHandler } from "@faremeter/types/facilitator";
-import type { Chain, Transport } from "viem";
+import type { Transport } from "viem";
 import { type KnownX402Network, type AssetNameOrContractInfo } from "@faremeter/info/evm";
 type CreateFacilitatorHandlerOpts = {
     network?: KnownX402Network;
     transport?: Transport;
 };
-export declare function createFacilitatorHandler(chain: Chain, privateKey: string, assetNameOrInfo: AssetNameOrContractInfo, opts?: CreateFacilitatorHandlerOpts): Promise<FacilitatorHandler>;
+export declare function createFacilitatorHandler(chain: ChainInfo, privateKey: string, assetNameOrInfo: AssetNameOrContractInfo, opts?: CreateFacilitatorHandlerOpts): Promise<FacilitatorHandler>;
 export {};
 //# sourceMappingURL=facilitator.d.ts.map

package/dist/src/exact/facilitator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,KAAK,EAAgB,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAY3D,OAAO,EAEL,KAAK,gBAAgB,EAErB,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AA8B7B,KAAK,4BAA4B,GAAG;IAClC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AACF,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,uBAAuB,EACxC,IAAI,GAAE,4BAAiC,GACtC,OAAO,CAAC,kBAAkB,CAAC,CA+S7B"}
+{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,MAAM,CAAC;AAYpD,OAAO,EAEL,KAAK,gBAAgB,EAErB,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAgC7B,KAAK,4BAA4B,GAAG;IAClC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AACF,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,uBAAuB,EACxC,IAAI,GAAE,4BAAiC,GACtC,OAAO,CAAC,kBAAkB,CAAC,CA0R7B"}

package/dist/src/exact/facilitator.js

@@ -1,4 +1,3 @@
-import { isValidationError, caseInsensitiveLiteral } from "@faremeter/types";
 import { isPrivateKey } from "@faremeter/types/evm";
 import {} from "@faremeter/types/facilitator";
 import { type } from "arktype";
@@ -6,7 +5,7 @@ import { createPublicClient, createWalletClient, http, verifyTypedData, encodeFu
 import { privateKeyToAccount } from "viem/accounts";
 import { lookupX402Network, findAssetInfo, } from "@faremeter/info/evm";
 import { X402_EXACT_SCHEME, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, } from "./constants.js";
-import { generateDomain, generateForwarderDomain } from "./common.js";
+import { generateMatcher, generateDomain, generateForwarderDomain, } from "./common.js";
 function errorResponse(msg) {
     return {
         success: false,
@@ -15,7 +14,6 @@ function errorResponse(msg) {
         networkId: null,
     };
 }
-const usedNonces = new Set();
 function parseSignature(signature) {
     const sig = signature.slice(2); // Remove 0x
     const r = `0x${sig.slice(0, 64)}`;
@@ -38,12 +36,10 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
     const transport = opts.transport ?? http(chain.rpcUrls.default.http[0]);
     const account = privateKeyToAccount(privateKey);
     const publicClient = createPublicClient({
-        chain,
         transport,
     });
     const walletClient = createWalletClient({
         account,
-        chain,
         transport,
     });
     let domain;
@@ -69,13 +65,7 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
             throw new Error(`On chain contract name (${domain.name}) doesn't match configured asset name (${assetInfo.contractName})`);
         }
     }
-    const checkTuple = type({
-        scheme: caseInsensitiveLiteral(X402_EXACT_SCHEME),
-        network: caseInsensitiveLiteral(network),
-    });
-    const checkTupleAndAsset = checkTuple.and({
-        asset: caseInsensitiveLiteral(asset),
-    });
+    const { isMatchingRequirement } = generateMatcher(network, asset);
     const getSupported = () => {
         return [
             Promise.resolve({
@@ -86,9 +76,7 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
         ];
     };
     const getRequirements = async (req) => {
-        return req
-            .filter((x) => !isValidationError(checkTupleAndAsset(x)))
-            .map((x) => ({
+        return req.filter(isMatchingRequirement).map((x) => ({
             ...x,
             asset,
             maxTimeoutSeconds: 300,
@@ -102,8 +90,7 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
         }));
     };
     const handleSettle = async (requirements, payment) => {
-        const tupleMatches = checkTuple(payment);
-        if (isValidationError(tupleMatches)) {
+        if (!isMatchingRequirement(requirements)) {
             return null; // Not for us, let another handler try
         }
         // For the exact scheme with EIP-3009, validate the authorization payload
@@ -134,11 +121,6 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
         if (!isAddress(authorization.from)) {
             return errorResponse("Invalid from address");
         }
-        // Check nonce hasn't been used (local check)
-        const nonceKey = `${authorization.from}-${authorization.nonce}`;
-        if (usedNonces.has(nonceKey)) {
-            return errorResponse("Nonce already used");
-        }
         // Check on-chain nonce status
         let onChainUsed;
         try {
@@ -235,7 +217,7 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
                 to: useForwarder ? domain.verifyingContract : asset,
                 data,
                 account: acct,
-                chain: undefined,
+                chain: null,
             });
             const serializedTransaction = await walletClient.signTransaction(request);
             const txHash = await publicClient.sendRawTransaction({
@@ -247,7 +229,6 @@ export async function createFacilitatorHandler(chain, privateKey, assetNameOrInf
             if (receipt.status !== "success") {
                 return errorResponse("Transaction failed");
             }
-            usedNonces.add(nonceKey);
             return {
                 success: true,
                 error: null,