@x402r/evm 0.0.1 → 0.0.2

package/src/escrow/server/index.ts

@@ -6,62 +6,125 @@
  * on an x402ResourceServer via server.register('eip155:84532', new EscrowServerScheme()).
  */
 
-import type { EscrowExtra } from "../../shared/types.js";
+import type {
+  AssetAmount,
+  MoneyParser,
+  Network,
+  PaymentRequirements,
+  Price,
+  SchemeNetworkServer,
+} from "@x402/core/types";
+import { x402ResourceServer } from "@x402/core/server";
 
 /**
- * x402 PaymentRequirements (matches @x402/core/types PaymentRequirements)
+ * Asset info including EIP-712 domain parameters per network
  */
-export interface PaymentRequirements {
-  scheme: string;
-  network: string;
-  amount: string;
-  asset: string;
-  payTo: string;
-  maxTimeoutSeconds: number;
-  extra: Record<string, unknown>;
-}
-
-export interface SupportedKind {
-  x402Version: number;
-  scheme: string;
-  network: string;
-  extra?: Record<string, unknown>;
-}
+const ASSET_INFO: Record<
+  string,
+  { address: string; name: string; version: string; decimals: number }
+> = {
+  // Base Sepolia
+  "eip155:84532": {
+    address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+    name: "USDC",
+    version: "2",
+    decimals: 6,
+  },
+  // Base mainnet
+  "eip155:8453": {
+    address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    name: "USD Coin",
+    version: "2",
+    decimals: 6,
+  },
+  // Ethereum Sepolia
+  "eip155:11155111": {
+    address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
+    name: "USDC",
+    version: "2",
+    decimals: 6,
+  },
+  // Ethereum mainnet
+  "eip155:1": {
+    address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    name: "USD Coin",
+    version: "2",
+    decimals: 6,
+  },
+  // Polygon
+  "eip155:137": {
+    address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+    name: "USD Coin",
+    version: "2",
+    decimals: 6,
+  },
+  // Arbitrum
+  "eip155:42161": {
+    address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+    name: "USD Coin",
+    version: "2",
+    decimals: 6,
+  },
+  // Celo
+  "eip155:42220": {
+    address: "0xcebA9300f2b948710d2653dD7B07f33A8B32118C",
+    name: "USD Coin",
+    version: "2",
+    decimals: 6,
+  },
+  // Monad
+  "eip155:143": {
+    address: "0x754704Bc059F8C67012fEd69BC8A327a5aafb603",
+    name: "USDC",
+    version: "2",
+    decimals: 6,
+  },
+  // Avalanche
+  "eip155:43114": {
+    address: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+    name: "USD Coin",
+    version: "2",
+    decimals: 6,
+  },
+};
 
 /**
- * x402 AssetAmount (matches @x402/core/types AssetAmount)
+ * Convert decimal amount to token units using string-based conversion
+ * (e.g., 0.10 -> 100000 for 6-decimal tokens)
+ * Avoids floating-point precision issues from BigInt(Math.round(...))
  */
-export interface AssetAmount {
-  asset: string;
-  amount: string;
-  extra?: Record<string, unknown>;
+function convertToTokenAmount(decimalAmount: string, decimals: number): string {
+  const amount = parseFloat(decimalAmount);
+  if (isNaN(amount)) {
+    throw new Error(`Invalid amount: ${decimalAmount}`);
+  }
+  const [intPart, decPart = ""] = String(amount).split(".");
+  const paddedDec = decPart.padEnd(decimals, "0").slice(0, decimals);
+  const tokenAmount = (intPart + paddedDec).replace(/^0+/, "") || "0";
+  return tokenAmount;
 }
 
-/**
- * x402 Price type (matches @x402/core/types Price)
- */
-export type Price = string | number | AssetAmount;
-
-export type Network = `${string}:${string}`;
-
-/**
- * Known USDC addresses per network
- */
-const USDC_ADDRESSES: Record<string, string> = {
-  "eip155:84532": "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-  "eip155:8453": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-};
-
 /**
  * Server scheme - handles price parsing and requirement enhancement.
  * Implements x402's SchemeNetworkServer interface.
  */
-export class EscrowServerScheme {
+export class EscrowServerScheme implements SchemeNetworkServer {
   readonly scheme = "escrow";
-  private readonly decimals: number;
+  private moneyParsers: MoneyParser[] = [];
 
-  constructor(config?: { decimals?: number }) {
-    this.decimals = config?.decimals ?? 6; // USDC default
+  /**
+   * Register a custom money parser in the parser chain.
+   * Multiple parsers can be registered — they will be tried in registration order.
+   * Each parser receives a decimal amount (e.g., 1.50 for $1.50).
+   * If a parser returns null, the next parser in the chain will be tried.
+   * The default parser (USDC) is always the final fallback.
+   *
+   * @param parser - Custom function to convert amount to AssetAmount (or null to skip)
+   * @returns The server instance for chaining
+   */
+  registerMoneyParser(parser: MoneyParser): EscrowServerScheme {
+    this.moneyParsers.push(parser);
+    return this;
   }
 
   /**
@@ -73,38 +136,75 @@ export class EscrowServerScheme {
    * - AssetAmount: { asset: "0x...", amount: "10000" }
    */
   async parsePrice(price: Price, network: Network): Promise<AssetAmount> {
-    // If already an AssetAmount, pass through
+    // If already an AssetAmount, pass through with validation
     if (
       typeof price === "object" &&
       price !== null &&
-      "amount" in price &&
-      "asset" in price
+      "amount" in price
     ) {
-      return price as AssetAmount;
+      if (!price.asset) {
+        throw new Error(
+          `Asset address must be specified for AssetAmount on network ${network}`,
+        );
+      }
+      return {
+        amount: price.amount,
+        asset: price.asset,
+        extra: price.extra || {},
+      };
     }
 
-    // Convert to number for calculation
-    let numericAmount: number;
-    if (typeof price === "number") {
-      numericAmount = price;
-    } else {
-      const cleaned = String(price).replace(/[$,]/g, "").trim();
-      numericAmount = parseFloat(cleaned);
+    // Parse Money to decimal number
+    const numericAmount = this.parseMoneyToDecimal(price);
+
+    // Try each custom money parser in order
+    for (const parser of this.moneyParsers) {
+      const result = await parser(numericAmount, network);
+      if (result !== null) {
+        return result;
+      }
     }
 
-    if (isNaN(numericAmount)) {
-      throw new Error(`Cannot parse price: ${price}`);
+    // All custom parsers returned null (or none registered), use default conversion
+    return this.defaultMoneyConversion(numericAmount, network);
+  }
+
+  /**
+   * Parse Money (string | number) to a decimal number.
+   */
+  private parseMoneyToDecimal(money: string | number): number {
+    if (typeof money === "number") {
+      return money;
+    }
+    const cleaned = String(money).replace(/[$,]/g, "").trim();
+    const amount = parseFloat(cleaned);
+    if (isNaN(amount)) {
+      throw new Error(`Cannot parse price: ${money}`);
     }
+    return amount;
+  }
 
-    const rawAmount = BigInt(Math.round(numericAmount * 10 ** this.decimals));
-    const asset = USDC_ADDRESSES[network];
-    if (!asset) {
+  /**
+   * Default money conversion — converts decimal amount to the default stablecoin on the network.
+   */
+  private defaultMoneyConversion(amount: number, network: Network): AssetAmount {
+    const assetInfo = ASSET_INFO[network];
+    if (!assetInfo) {
       throw new Error(`No USDC address configured for network: ${network}`);
     }
 
+    const tokenAmount = convertToTokenAmount(
+      String(amount),
+      assetInfo.decimals,
+    );
+
     return {
-      asset,
-      amount: rawAmount.toString(),
+      asset: assetInfo.address,
+      amount: tokenAmount,
+      extra: {
+        name: assetInfo.name,
+        version: assetInfo.version,
+      },
     };
   }
 
@@ -117,7 +217,12 @@ export class EscrowServerScheme {
    */
   async enhancePaymentRequirements(
     requirements: PaymentRequirements,
-    supportedKind: SupportedKind,
+    supportedKind: {
+      x402Version: number;
+      scheme: string;
+      network: Network;
+      extra?: Record<string, unknown>;
+    },
     _facilitatorExtensions: string[],
   ): Promise<PaymentRequirements> {
     return {
@@ -130,4 +235,27 @@ export class EscrowServerScheme {
   }
 }
 
+/**
+ * Register escrow server scheme with x402ResourceServer
+ *
+ * @example
+ * ```typescript
+ * const server = new x402ResourceServer(facilitatorConfig);
+ * registerEscrowServerScheme(server, { networks: "eip155:84532" });
+ * ```
+ */
+export function registerEscrowServerScheme(
+  server: x402ResourceServer,
+  config: { networks: Network | Network[] },
+): x402ResourceServer {
+  const scheme = new EscrowServerScheme();
+  const networks = Array.isArray(config.networks)
+    ? config.networks
+    : [config.networks];
+  for (const network of networks) {
+    server.register(network, scheme);
+  }
+  return server;
+}
+
 export type { EscrowExtra, EscrowPayload } from "../../shared/types.js";

package/src/shared/constants.ts

@@ -41,3 +41,18 @@ export const OPERATOR_ABI = [
 // ERC-3009 TransferWithAuthorization type hash
 export const TRANSFER_WITH_AUTHORIZATION_TYPEHASH =
   "0x7c7c6cdb67a18743f49ec6fa9b35f50d52ed05cbed4cc592e13b44501c1a2267" as const;
+
+// EIP-6492 magic suffix (32 bytes) — appended to signatures from counterfactual smart wallets
+export const ERC6492_MAGIC_VALUE =
+  "0x6492649264926492649264926492649264926492649264926492649264926492" as const;
+
+// ERC-20 balanceOf ABI for balance checks
+export const ERC20_BALANCE_OF_ABI = [
+  {
+    name: "balanceOf",
+    type: "function",
+    stateMutability: "view",
+    inputs: [{ name: "account", type: "address" }],
+    outputs: [{ name: "balance", type: "uint256" }],
+  },
+] as const;

package/src/shared/nonce.ts

@@ -3,7 +3,8 @@
  * Adapted from @agentokratia/x402-escrow (MIT)
  */
 
-import { encodeAbiParameters, keccak256, type WalletClient } from "viem";
+import { encodeAbiParameters, keccak256 } from "viem";
+import type { ClientEvmSigner } from "@x402/evm";
 import { ZERO_ADDRESS, PAYMENT_INFO_COMPONENTS } from "./constants.js";
 import type { EscrowExtra, EscrowPayload } from "./types.js";
 
@@ -78,17 +79,18 @@ export function computeEscrowNonce(
  * Note: receiveWithAuthorization uses a different primary type than transferWithAuthorization
  */
 export async function signERC3009(
-  wallet: WalletClient,
+  signer: ClientEvmSigner,
   authorization: EscrowPayload["authorization"],
   extra: EscrowExtra,
   tokenAddress: `0x${string}`,
+  chainId: number,
 ): Promise<`0x${string}`> {
   // EIP-712 domain - name must match the token's EIP-712 domain
   // (e.g., "USDC" for Base USDC, not "USD Coin")
   const domain = {
     name: extra.name,
     version: extra.version ?? "2",
-    chainId: await wallet.getChainId(),
+    chainId,
     verifyingContract: tokenAddress,
   };
 
@@ -113,8 +115,7 @@ export async function signERC3009(
     nonce: authorization.nonce,
   };
 
-  return wallet.signTypedData({
-    account: wallet.account!,
+  return signer.signTypedData({
     domain,
     types,
     primaryType: "ReceiveWithAuthorization",

package/src/shared/types.ts

@@ -1,3 +1,29 @@
+/**
+ * Type guard for EscrowPayload
+ */
+export function isEscrowPayload(value: unknown): value is EscrowPayload {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "authorization" in value &&
+    "signature" in value &&
+    "paymentInfo" in value
+  );
+}
+
+/**
+ * Type guard for EscrowExtra
+ */
+export function isEscrowExtra(value: unknown): value is EscrowExtra {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "escrowAddress" in value &&
+    "operatorAddress" in value &&
+    "tokenCollector" in value
+  );
+}
+
 // EscrowExtra - fields in PaymentRequirements.extra
 export interface EscrowExtra {
   escrowAddress: `0x${string}`;