@faremeter/payment-evm 0.7.0 → 0.8.0

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

@@ -1,7 +1,10 @@
 import type { PaymentHandler } from "@faremeter/types/client";
 import type { Hex } from "viem";
 interface WalletForPayment {
-    network: string;
+    chain: {
+        id: number;
+        name: string;
+    };
     address: Hex;
     account: {
         signTypedData: (params: {

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;AAOjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAWhC,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,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,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,GAAG,cAAc,CA+G7E"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,yBAAyB,CAAC;AAGjC,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,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,GAAG,cAAc,CAkG7E"}

package/dist/src/exact/client.js

@@ -1,22 +1,16 @@
 import { randomBytes } from "crypto";
-import { isKnownNetwork, lookupKnownNetwork, lookupKnownAsset, } from "@faremeter/info/evm";
+import { lookupX402Network, lookupKnownAsset } from "@faremeter/info/evm";
 import { isAddress } from "viem";
 import { type } from "arktype";
 import { X402_EXACT_SCHEME, EIP712_TYPES, eip712Domain, } from "./constants.js";
 export function createPaymentHandler(wallet) {
-    if (!isKnownNetwork(wallet.network)) {
-        throw new Error(`Wallet was created for unsupported network '${wallet.network}'`);
-    }
-    const networkInfo = lookupKnownNetwork(wallet.network);
-    if (!networkInfo) {
-        throw new Error(`Couldn't look up network info for network '${wallet.network}'`);
-    }
-    const assetInfo = lookupKnownAsset(wallet.network, "USDC");
+    const x402Network = lookupX402Network(wallet.chain.id);
+    const assetInfo = lookupKnownAsset(wallet.chain.id, "USDC");
     if (!assetInfo) {
-        throw new Error(`Couldn't look up USDC information on network '${wallet.network}'`);
+        throw new Error(`Couldn't look up USDC information on network '${x402Network}'`);
     }
     return async function handlePayment(context, accepts) {
-        const compatibleRequirements = accepts.filter((req) => req.scheme === X402_EXACT_SCHEME && req.network === wallet.network);
+        const compatibleRequirements = accepts.filter((req) => req.scheme === X402_EXACT_SCHEME && req.network === x402Network);
         return compatibleRequirements.map((requirements) => ({
             requirements,
             exec: async () => {
@@ -43,19 +37,17 @@ export function createPaymentHandler(wallet) {
                 if (extraResult instanceof type.errors) {
                     throw new Error(`Invalid EIP-712 domain parameters: ${extraResult.summary}`);
                 }
+                const verifyingContract = extraResult.verifyingContract ??
+                    requirements.asset ??
+                    assetInfo.address;
+                if (!isAddress(verifyingContract)) {
+                    throw new Error(`Invalid verifying contract: ${verifyingContract}`);
+                }
                 const domain = {
                     name: extraResult.name ?? assetInfo.contractName,
                     version: extraResult.version ?? "2",
-                    chainId: extraResult.chainId ?? networkInfo.chainId,
-                    verifyingContract: (() => {
-                        const asset = extraResult.verifyingContract ??
-                            requirements.asset ??
-                            assetInfo.address;
-                        if (!isAddress(asset)) {
-                            throw new Error(`Invalid asset address: ${asset}`);
-                        }
-                        return asset;
-                    })(),
+                    chainId: extraResult.chainId ?? wallet.chain.id,
+                    verifyingContract,
                 };
                 const types = EIP712_TYPES;
                 // Message for EIP-712 signing (using BigInt for signing)

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

@@ -5,4 +5,14 @@ export declare function generateDomain(publicClient: PublicClient, chainId: numb
     chainId: number;
     verifyingContract: `0x${string}`;
 }>;
+export declare function generateForwarderDomain(chainId: number, domainInfo: {
+    version: string;
+    name: string;
+    verifyingContract: `0x${string}`;
+}): {
+    chainId: number;
+    version: string;
+    name: string;
+    verifyingContract: `0x${string}`;
+};
 //# 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"}
+{"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"}

package/dist/src/exact/common.js

@@ -28,3 +28,9 @@ export async function generateDomain(publicClient, chainId, asset) {
     };
     return domain;
 }
+export function generateForwarderDomain(chainId, domainInfo) {
+    return {
+        ...domainInfo,
+        chainId,
+    };
+}

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

@@ -1,4 +1,10 @@
 import { type FacilitatorHandler } from "@faremeter/types/facilitator";
-import type { PublicClient, WalletClient } from "viem";
-export declare function createFacilitatorHandler(network: string, publicClient: PublicClient, walletClient: WalletClient, assetName: string): Promise<FacilitatorHandler>;
+import type { Chain, Transport } from "viem";
+import { type KnownNetwork, type ContractInfo } from "@faremeter/info/evm";
+type CreateFacilitatorHandlerOpts = {
+    network?: KnownNetwork;
+    transport?: Transport;
+};
+export declare function createFacilitatorHandler(chain: Chain, privateKey: string, assetNameOrInfo: string | ContractInfo, 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":"AAOA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAO,YAAY,EAAW,MAAM,MAAM,CAAC;AAqCrE,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,kBAAkB,CAAC,CAiP7B"}
+{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,KAAK,EAAgB,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAY3D,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AA8B7B,KAAK,4BAA4B,GAAG;IAClC,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AACF,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,GAAG,YAAY,EACtC,IAAI,GAAE,4BAAiC,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAsT7B"}

package/dist/src/exact/facilitator.js

@@ -1,10 +1,12 @@
 import { isValidationError, caseInsensitiveLiteral } from "@faremeter/types";
+import { isPrivateKey } from "@faremeter/types/evm";
 import {} from "@faremeter/types/facilitator";
 import { type } from "arktype";
-import { verifyTypedData, encodeFunctionData, isAddress } from "viem";
-import { isKnownAsset, isKnownNetwork, lookupKnownAsset, lookupKnownNetwork, } from "@faremeter/info/evm";
+import { createPublicClient, createWalletClient, http, verifyTypedData, encodeFunctionData, isAddress, } from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+import { isKnownAsset, lookupKnownAsset, lookupX402Network, } from "@faremeter/info/evm";
 import { X402_EXACT_SCHEME, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, } from "./constants.js";
-import { generateDomain } from "./common.js";
+import { generateDomain, generateForwarderDomain } from "./common.js";
 function errorResponse(msg) {
     return {
         success: false,
@@ -21,28 +23,61 @@ function parseSignature(signature) {
     const v = parseInt(sig.slice(128, 130), 16);
     return { v, r, s };
 }
-export async function createFacilitatorHandler(network, publicClient, walletClient, assetName) {
-    if (!isKnownNetwork(network)) {
-        throw new Error(`Unknown network ${network}`);
+export async function createFacilitatorHandler(chain, privateKey, assetNameOrInfo, opts = {}) {
+    if (!isPrivateKey(privateKey)) {
+        throw new Error(`Invalid private key: ${privateKey}`);
     }
-    const networkInfo = lookupKnownNetwork(network);
-    if (!networkInfo) {
-        throw new Error(`Couldn't look up information for ${network}`);
-    }
-    const { chainId } = networkInfo;
-    if (!isKnownAsset(assetName)) {
-        throw new Error(`Unknown asset: ${assetName}`);
+    const network = opts.network ?? lookupX402Network(chain.id);
+    const chainId = chain.id;
+    let assetInfo;
+    if (typeof assetNameOrInfo == "string") {
+        if (!isKnownAsset(assetNameOrInfo)) {
+            throw new Error(`Unknown asset: ${assetNameOrInfo}`);
+        }
+        const t = lookupKnownAsset(network, assetNameOrInfo);
+        if (!t) {
+            throw new Error(`Couldn't look up asset ${assetNameOrInfo} on ${network}`);
+        }
+        assetInfo = t;
     }
-    const assetInfo = lookupKnownAsset(network, assetName);
-    if (!assetInfo) {
-        throw new Error(`Couldn't look up asset ${assetName} on ${network}`);
+    else {
+        assetInfo = assetNameOrInfo;
     }
     const asset = assetInfo.address;
+    const useForwarder = assetInfo.forwarder !== undefined && assetInfo.forwarderName !== undefined;
     if (!isAddress(asset)) {
         throw new Error(`Invalid asset address: ${asset}`);
     }
-    {
-        const domain = await generateDomain(publicClient, chainId, asset);
+    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;
+    if (useForwarder) {
+        if (!assetInfo.forwarder) {
+            throw new Error("Missing Forwarding Contract");
+        }
+        if (!assetInfo.forwarderVersion) {
+            throw new Error("Missing Forwarding Version");
+        }
+        if (!assetInfo.forwarderName) {
+            throw new Error("Missing Forwarding Name");
+        }
+        domain = generateForwarderDomain(chainId, {
+            version: assetInfo.forwarderVersion,
+            name: assetInfo.forwarderName,
+            verifyingContract: assetInfo.forwarder,
+        });
+    }
+    else {
+        domain = await generateDomain(publicClient, chainId, asset);
         if (domain.name != assetInfo.contractName) {
             throw new Error(`On chain contract name (${domain.name}) doesn't match configured asset name (${assetInfo.contractName})`);
         }
@@ -63,10 +98,10 @@ export async function createFacilitatorHandler(network, publicClient, walletClie
             maxTimeoutSeconds: 300,
             // Provide EIP-712 domain parameters for client signing
             extra: {
-                name: assetInfo.contractName,
-                version: "2",
+                name: useForwarder ? assetInfo.forwarderName : assetInfo.contractName,
+                version: useForwarder ? assetInfo.forwarderVersion : "2",
                 chainId,
-                verifyingContract: asset,
+                verifyingContract: useForwarder ? assetInfo.forwarder : asset,
             },
         }));
     };
@@ -112,7 +147,7 @@ export async function createFacilitatorHandler(network, publicClient, walletClie
         let onChainUsed;
         try {
             onChainUsed = await publicClient.readContract({
-                address: asset,
+                address: assetInfo.forwarder ?? asset,
                 abi: TRANSFER_WITH_AUTHORIZATION_ABI,
                 functionName: "authorizationState",
                 args: [authorization.from, authorization.nonce],
@@ -124,7 +159,22 @@ export async function createFacilitatorHandler(network, publicClient, walletClie
         if (onChainUsed) {
             return errorResponse("Authorization already used on-chain");
         }
-        const domain = await generateDomain(publicClient, chainId, asset);
+        let domain;
+        if (useForwarder) {
+            if (!assetInfo.forwarderVersion ||
+                !assetInfo.forwarderName ||
+                !assetInfo.forwarder) {
+                throw new Error("Secondary Forwardign Information Missing");
+            }
+            domain = generateForwarderDomain(chainId, {
+                version: assetInfo.forwarderVersion,
+                name: assetInfo.forwarderName,
+                verifyingContract: assetInfo.forwarder,
+            });
+        }
+        else {
+            domain = await generateDomain(publicClient, chainId, asset);
+        }
         const types = EIP712_TYPES;
         const message = {
             from: authorization.from,
@@ -155,7 +205,7 @@ export async function createFacilitatorHandler(network, publicClient, walletClie
         // Verify contract supports EIP-712
         try {
             await publicClient.readContract({
-                address: asset,
+                address: useForwarder ? domain.verifyingContract : asset,
                 abi: TRANSFER_WITH_AUTHORIZATION_ABI,
                 functionName: "DOMAIN_SEPARATOR",
             });
@@ -186,7 +236,7 @@ export async function createFacilitatorHandler(network, publicClient, walletClie
         // Build and send the transaction
         try {
             const request = await walletClient.prepareTransactionRequest({
-                to: asset,
+                to: useForwarder ? domain.verifyingContract : asset,
                 data,
                 account: acct,
                 chain: undefined,