@faremeter/payment-evm 0.6.0 → 0.7.0

package/dist/src/exact/client.js

@@ -44,7 +44,7 @@ export function createPaymentHandler(wallet) {
                     throw new Error(`Invalid EIP-712 domain parameters: ${extraResult.summary}`);
                 }
                 const domain = {
-                    name: extraResult.name ?? assetInfo.name,
+                    name: extraResult.name ?? assetInfo.contractName,
                     version: extraResult.version ?? "2",
                     chainId: extraResult.chainId ?? networkInfo.chainId,
                     verifyingContract: (() => {

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

@@ -0,0 +1,8 @@
+import type { PublicClient, Hex } from "viem";
+export declare function generateDomain(publicClient: PublicClient, chainId: number, asset: Hex): Promise<{
+    name: string;
+    version: string;
+    chainId: number;
+    verifyingContract: `0x${string}`;
+}>;
+//# sourceMappingURL=common.d.ts.map

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

@@ -0,0 +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"}

package/dist/src/exact/common.js

@@ -0,0 +1,30 @@
+import { TRANSFER_WITH_AUTHORIZATION_ABI } from "./constants.js";
+export async function generateDomain(publicClient, chainId, asset) {
+    // Read domain parameters from chain
+    let tokenName;
+    let tokenVersion;
+    try {
+        [tokenName, tokenVersion] = await Promise.all([
+            publicClient.readContract({
+                address: asset,
+                abi: TRANSFER_WITH_AUTHORIZATION_ABI,
+                functionName: "name",
+            }),
+            publicClient.readContract({
+                address: asset,
+                abi: TRANSFER_WITH_AUTHORIZATION_ABI,
+                functionName: "version",
+            }),
+        ]);
+    }
+    catch (cause) {
+        throw new Error("Failed to read contract parameters", { cause });
+    }
+    const domain = {
+        name: tokenName,
+        version: tokenVersion,
+        chainId,
+        verifyingContract: asset,
+    };
+    return domain;
+}

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

@@ -1,5 +1,4 @@
 export declare const X402_EXACT_SCHEME = "exact";
-export declare const BASE_SEPOLIA_NETWORK = "base-sepolia";
 export declare const TRANSFER_WITH_AUTHORIZATION_ABI: readonly [{
     readonly name: "transferWithAuthorization";
     readonly type: "function";

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/exact/constants.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,eAAO,MAAM,oBAAoB,iBAAiB,CAAC;AAEnD,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiDlC,CAAC;AAEX,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;CASf,CAAC;AAEX,eAAO,MAAM,gBAAgB;;;;;;;;;;MAU3B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,KAAK,CAAC;AAC7D,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;AAErE,eAAO,MAAM,YAAY;;;;;MAKvB,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,KAAK,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/exact/constants.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,iBAAiB,UAAU,CAAC;AAEzC,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiDlC,CAAC;AAEX,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;CASf,CAAC;AAEX,eAAO,MAAM,gBAAgB;;;;;;;;;;MAU3B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,KAAK,CAAC;AAC7D,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;AAErE,eAAO,MAAM,YAAY;;;;;MAKvB,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,KAAK,CAAC"}

package/dist/src/exact/constants.js

@@ -7,7 +7,6 @@ const prefixedHexString = type("string").pipe.try((x) => {
     return toHex(x);
 });
 export const X402_EXACT_SCHEME = "exact";
-export const BASE_SEPOLIA_NETWORK = "base-sepolia";
 export const TRANSFER_WITH_AUTHORIZATION_ABI = [
     {
         name: "transferWithAuthorization",

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

@@ -1,4 +1,4 @@
 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): FacilitatorHandler;
+export declare function createFacilitatorHandler(network: string, publicClient: PublicClient, walletClient: WalletClient, assetName: string): Promise<FacilitatorHandler>;
 //# 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;AAoCrE,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,kBAAkB,CAmQpB"}
+{"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"}

package/dist/src/exact/facilitator.js

@@ -2,9 +2,9 @@ import { isValidationError, caseInsensitiveLiteral } from "@faremeter/types";
 import {} from "@faremeter/types/facilitator";
 import { type } from "arktype";
 import { verifyTypedData, encodeFunctionData, isAddress } from "viem";
-import { baseSepolia } from "viem/chains";
-import { isKnownAsset, lookupKnownAsset, lookupKnownNetwork, } from "@faremeter/info/evm";
-import { X402_EXACT_SCHEME, BASE_SEPOLIA_NETWORK, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, } from "./constants.js";
+import { isKnownAsset, isKnownNetwork, lookupKnownAsset, lookupKnownNetwork, } from "@faremeter/info/evm";
+import { X402_EXACT_SCHEME, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, } from "./constants.js";
+import { generateDomain } from "./common.js";
 function errorResponse(msg) {
     return {
         success: false,
@@ -21,14 +21,15 @@ function parseSignature(signature) {
     const v = parseInt(sig.slice(128, 130), 16);
     return { v, r, s };
 }
-export function createFacilitatorHandler(network, publicClient, walletClient, assetName) {
-    if (network !== BASE_SEPOLIA_NETWORK) {
-        throw new Error(`Unsupported network: ${network}. Only base-sepolia is supported.`);
+export async function createFacilitatorHandler(network, publicClient, walletClient, assetName) {
+    if (!isKnownNetwork(network)) {
+        throw new Error(`Unknown network ${network}`);
     }
     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}`);
     }
@@ -40,6 +41,12 @@ export function createFacilitatorHandler(network, publicClient, walletClient, as
     if (!isAddress(asset)) {
         throw new Error(`Invalid asset address: ${asset}`);
     }
+    {
+        const 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})`);
+        }
+    }
     const checkTuple = type({
         scheme: caseInsensitiveLiteral(X402_EXACT_SCHEME),
         network: caseInsensitiveLiteral(network),
@@ -56,9 +63,9 @@ export function createFacilitatorHandler(network, publicClient, walletClient, as
             maxTimeoutSeconds: 300,
             // Provide EIP-712 domain parameters for client signing
             extra: {
-                name: assetName,
+                name: assetInfo.contractName,
                 version: "2",
-                chainId: networkInfo.chainId,
+                chainId,
                 verifyingContract: asset,
             },
         }));
@@ -117,34 +124,7 @@ export function createFacilitatorHandler(network, publicClient, walletClient, as
         if (onChainUsed) {
             return errorResponse("Authorization already used on-chain");
         }
-        // Read domain parameters from chain
-        let tokenName;
-        let tokenVersion;
-        let chainId;
-        try {
-            [tokenName, tokenVersion, chainId] = await Promise.all([
-                publicClient.readContract({
-                    address: asset,
-                    abi: TRANSFER_WITH_AUTHORIZATION_ABI,
-                    functionName: "name",
-                }),
-                publicClient.readContract({
-                    address: asset,
-                    abi: TRANSFER_WITH_AUTHORIZATION_ABI,
-                    functionName: "version",
-                }),
-                publicClient.getChainId(),
-            ]);
-        }
-        catch (cause) {
-            throw new Error("Failed to read contract parameters", { cause });
-        }
-        const domain = {
-            name: tokenName,
-            version: tokenVersion ?? "2",
-            chainId,
-            verifyingContract: asset,
-        };
+        const domain = await generateDomain(publicClient, chainId, asset);
         const types = EIP712_TYPES;
         const message = {
             from: authorization.from,
@@ -209,7 +189,7 @@ export function createFacilitatorHandler(network, publicClient, walletClient, as
                 to: asset,
                 data,
                 account: acct,
-                chain: baseSepolia,
+                chain: undefined,
             });
             const serializedTransaction = await walletClient.signTransaction(request);
             const txHash = await publicClient.sendRawTransaction({
@@ -226,7 +206,7 @@ export function createFacilitatorHandler(network, publicClient, walletClient, as
                 success: true,
                 error: null,
                 txHash,
-                networkId: networkInfo.chainId.toString(),
+                networkId: chainId.toString(),
             };
         }
         catch (cause) {

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

@@ -1,4 +1,4 @@
 export { createPaymentHandler } from "./client.js";
 export { createFacilitatorHandler } from "./facilitator.js";
-export { X402_EXACT_SCHEME, BASE_SEPOLIA_NETWORK, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, eip712Domain, } from "./constants.js";
+export { X402_EXACT_SCHEME, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, eip712Domain, } from "./constants.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exact/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,+BAA+B,EAC/B,YAAY,EACZ,gBAAgB,EAChB,YAAY,GACb,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exact/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EACL,iBAAiB,EACjB,+BAA+B,EAC/B,YAAY,EACZ,gBAAgB,EAChB,YAAY,GACb,MAAM,gBAAgB,CAAC"}

package/dist/src/exact/index.js

@@ -1,3 +1,3 @@
 export { createPaymentHandler } from "./client.js";
 export { createFacilitatorHandler } from "./facilitator.js";
-export { X402_EXACT_SCHEME, BASE_SEPOLIA_NETWORK, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, eip712Domain, } from "./constants.js";
+export { X402_EXACT_SCHEME, TRANSFER_WITH_AUTHORIZATION_ABI, EIP712_TYPES, x402ExactPayload, eip712Domain, } from "./constants.js";