@x402r/evm 0.0.1 → 0.0.2

package/README.md

@@ -13,25 +13,38 @@ npm install @x402r/evm
 ### Client — Create payment payloads
 
 ```typescript
-import { createPaymentPayload } from "@x402r/evm/escrow/client";
+import { EscrowEvmScheme, registerEscrowScheme } from "@x402r/evm/escrow/client";
+import { x402Client } from "@x402/core/client";
 
-const payload = await createPaymentPayload(requirements, walletClient);
+const client = new x402Client();
+registerEscrowScheme(client, { signer, networks: "eip155:84532" });
 ```
 
 ### Server — Register with x402 resource server
 
 ```typescript
-import { EscrowServerScheme } from "@x402r/evm/escrow/server";
+import { EscrowServerScheme, registerEscrowServerScheme } from "@x402r/evm/escrow/server";
+import { x402ResourceServer } from "@x402/core/server";
 
-const scheme = new EscrowServerScheme();
-server.register("eip155:84532", scheme);
+const server = new x402ResourceServer(facilitatorConfig);
+registerEscrowServerScheme(server, { networks: "eip155:84532" });
+```
+
+### Facilitator — Verify and settle payments
+
+```typescript
+import { EscrowFacilitatorScheme, registerEscrowScheme } from "@x402r/evm/escrow/facilitator";
+import { x402Facilitator } from "@x402/core/facilitator";
+
+const facilitator = new x402Facilitator();
+registerEscrowScheme(facilitator, { signer, networks: "eip155:84532" });
 ```
 
 ## Exports
 
-- `@x402r/evm/escrow/client` — `createPaymentPayload()`, `EscrowScheme`
-- `@x402r/evm/escrow/server` — `EscrowServerScheme`
-- `@x402r/evm/escrow/facilitator` — Settlement and verification
+- `@x402r/evm/escrow/client` — `EscrowEvmScheme`, `registerEscrowScheme()`
+- `@x402r/evm/escrow/server` — `EscrowServerScheme`, `registerEscrowServerScheme()`
+- `@x402r/evm/escrow/facilitator` — `EscrowFacilitatorScheme`, `registerEscrowScheme()`
 - `@x402r/evm/escrow/types` — `EscrowExtra`, `EscrowPayload`
 
 ## Links

package/dist/escrow/client/index.d.ts

@@ -1,24 +1,40 @@
 /**
  * Escrow Scheme - Client
- * Creates payment payloads for escrow payments
+ * Creates payment payloads for escrow payments.
+ *
+ * Implements x402's SchemeNetworkClient interface so it can be registered
+ * on an x402Client via client.register('eip155:84532', new EscrowEvmScheme(signer)).
  */
-import type { WalletClient } from "viem";
-import type { EscrowExtra, EscrowPayload } from "../../shared/types.js";
-export interface PaymentRequirements {
-    scheme: string;
-    network: string;
-    amount: string;
-    asset: `0x${string}`;
-    payTo: `0x${string}`;
-    extra: EscrowExtra;
+import type { Network, PaymentPayload, PaymentRequirements, SchemeNetworkClient } from "@x402/core/types";
+import type { ClientEvmSigner } from "@x402/evm";
+import { x402Client } from "@x402/core/client";
+/**
+ * Escrow Client Scheme - implements x402's SchemeNetworkClient
+ */
+export declare class EscrowEvmScheme implements SchemeNetworkClient {
+    private readonly signer;
+    readonly scheme = "escrow";
+    constructor(signer: ClientEvmSigner);
+    createPaymentPayload(x402Version: number, requirements: PaymentRequirements): Promise<Pick<PaymentPayload, "x402Version" | "payload">>;
 }
 /**
- * Create an escrow payment payload from payment requirements
+ * Register escrow client scheme with x402Client
+ *
+ * @example
+ * ```typescript
+ * const client = new x402Client();
+ * registerEscrowScheme(client, { signer, networks: "eip155:84532" });
+ * ```
+ */
+export declare function registerEscrowScheme(client: x402Client, config: {
+    signer: ClientEvmSigner;
+    networks: Network | Network[];
+}): x402Client;
+/**
+ * @deprecated Use `new EscrowEvmScheme(signer)` directly
  */
-export declare function createPaymentPayload(requirements: PaymentRequirements, wallet: WalletClient): Promise<EscrowPayload>;
 export declare const EscrowScheme: {
     scheme: "escrow";
-    createPaymentPayload: typeof createPaymentPayload;
 };
 export type { EscrowExtra, EscrowPayload } from "../../shared/types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/escrow/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/escrow/client/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAOzC,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAExE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;IACrB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;IACrB,KAAK,EAAE,WAAW,CAAC;CACpB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,aAAa,CAAC,CAmDxB;AAED,eAAO,MAAM,YAAY;;;CAGxB,CAAC;AAEF,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/escrow/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA0B/C;;GAEG;AACH,qBAAa,eAAgB,YAAW,mBAAmB;IAG7C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,QAAQ,CAAC,MAAM,YAAY;gBAEE,MAAM,EAAE,eAAe;IAE9C,oBAAoB,CACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,SAAS,CAAC,CAAC;CA4E5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,EAAE,CAAA;CAAE,GACjE,UAAU,CASZ;AAED;;GAEG;AACH,eAAO,MAAM,YAAY;;CAExB,CAAC;AAEF,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/escrow/client/index.js

@@ -1,45 +1,104 @@
 /**
  * Escrow Scheme - Client
- * Creates payment payloads for escrow payments
+ * Creates payment payloads for escrow payments.
+ *
+ * Implements x402's SchemeNetworkClient interface so it can be registered
+ * on an x402Client via client.register('eip155:84532', new EscrowEvmScheme(signer)).
  */
 import { computeEscrowNonce, signERC3009, generateSalt, } from "../../shared/nonce.js";
 import { MAX_UINT48 } from "../../shared/constants.js";
 /**
- * Create an escrow payment payload from payment requirements
+ * Parse chainId from CAIP-2 network identifier
  */
-export async function createPaymentPayload(requirements, wallet) {
-    const { escrowAddress, operatorAddress, tokenCollector, minFeeBps = 0, maxFeeBps = 0, feeReceiver, preApprovalExpirySeconds, refundExpirySeconds, authorizationExpirySeconds, } = requirements.extra;
-    const chainId = await wallet.getChainId();
-    const maxAmount = requirements.amount;
-    const paymentInfo = {
-        operator: operatorAddress,
-        receiver: requirements.payTo,
-        token: requirements.asset,
-        maxAmount,
-        preApprovalExpiry: preApprovalExpirySeconds ?? MAX_UINT48,
-        authorizationExpiry: authorizationExpirySeconds ?? MAX_UINT48,
-        refundExpiry: refundExpirySeconds ?? MAX_UINT48,
-        minFeeBps,
-        maxFeeBps,
-        feeReceiver: feeReceiver ?? operatorAddress,
-        salt: generateSalt(),
-    };
-    const nonce = computeEscrowNonce(chainId, escrowAddress, paymentInfo);
-    // ERC-3009 authorization - validBefore MUST match what contract passes to receiveWithAuthorization
-    // The contract uses paymentInfo.preApprovalExpiry as validBefore
-    const authorization = {
-        from: wallet.account.address,
-        to: tokenCollector,
-        value: maxAmount,
-        validAfter: "0",
-        validBefore: String(paymentInfo.preApprovalExpiry),
-        nonce,
-    };
-    const signature = await signERC3009(wallet, authorization, requirements.extra, requirements.asset);
-    return { authorization, signature, paymentInfo };
+function parseChainId(network) {
+    const parts = network.split(":");
+    if (parts.length !== 2 || parts[0] !== "eip155") {
+        throw new Error(`Invalid network format: ${network}. Expected 'eip155:<chainId>'`);
+    }
+    const chainId = parseInt(parts[1], 10);
+    if (isNaN(chainId)) {
+        throw new Error(`Invalid chainId in network: ${network}`);
+    }
+    return chainId;
 }
+/**
+ * Escrow Client Scheme - implements x402's SchemeNetworkClient
+ */
+export class EscrowEvmScheme {
+    signer;
+    scheme = "escrow";
+    constructor(signer) {
+        this.signer = signer;
+    }
+    async createPaymentPayload(x402Version, requirements) {
+        if (x402Version !== 2) {
+            throw new Error(`Unsupported x402Version: ${x402Version}. Only version 2 is supported.`);
+        }
+        const extra = requirements.extra;
+        // Validate required EIP-712 domain parameters (M3, M10)
+        if (!extra.name) {
+            throw new Error(`EIP-712 domain parameter 'name' is required in payment requirements for asset ${requirements.asset}`);
+        }
+        if (!extra.version) {
+            throw new Error(`EIP-712 domain parameter 'version' is required in payment requirements for asset ${requirements.asset}`);
+        }
+        const { escrowAddress, operatorAddress, tokenCollector, minFeeBps = 0, maxFeeBps = 0, feeReceiver, preApprovalExpirySeconds, refundExpirySeconds, authorizationExpirySeconds, } = extra;
+        const chainId = parseChainId(requirements.network);
+        const maxAmount = requirements.amount;
+        const paymentInfo = {
+            operator: operatorAddress,
+            receiver: requirements.payTo,
+            token: requirements.asset,
+            maxAmount,
+            preApprovalExpiry: preApprovalExpirySeconds ?? MAX_UINT48,
+            authorizationExpiry: authorizationExpirySeconds ?? MAX_UINT48,
+            refundExpiry: refundExpirySeconds ?? MAX_UINT48,
+            minFeeBps,
+            maxFeeBps,
+            feeReceiver: feeReceiver ?? operatorAddress,
+            salt: generateSalt(),
+        };
+        const nonce = computeEscrowNonce(chainId, escrowAddress, paymentInfo);
+        // ERC-3009 authorization - validBefore MUST match what contract passes to receiveWithAuthorization
+        // The contract uses paymentInfo.preApprovalExpiry as validBefore
+        const authorization = {
+            from: this.signer.address,
+            to: tokenCollector,
+            value: maxAmount,
+            validAfter: "0",
+            validBefore: String(paymentInfo.preApprovalExpiry),
+            nonce,
+        };
+        const signature = await signERC3009(this.signer, authorization, extra, requirements.asset, chainId);
+        return {
+            x402Version,
+            payload: { authorization, signature, paymentInfo },
+        };
+    }
+}
+/**
+ * Register escrow client scheme with x402Client
+ *
+ * @example
+ * ```typescript
+ * const client = new x402Client();
+ * registerEscrowScheme(client, { signer, networks: "eip155:84532" });
+ * ```
+ */
+export function registerEscrowScheme(client, config) {
+    const scheme = new EscrowEvmScheme(config.signer);
+    const networks = Array.isArray(config.networks)
+        ? config.networks
+        : [config.networks];
+    for (const network of networks) {
+        client.register(network, scheme);
+    }
+    return client;
+}
+/**
+ * @deprecated Use `new EscrowEvmScheme(signer)` directly
+ */
 export const EscrowScheme = {
     scheme: "escrow",
-    createPaymentPayload,
 };
 //# sourceMappingURL=index.js.map

package/dist/escrow/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/escrow/client/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,YAAY,GACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAYvD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,YAAiC,EACjC,MAAoB;IAEpB,MAAM,EACJ,aAAa,EACb,eAAe,EACf,cAAc,EACd,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,WAAW,EACX,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,GAC3B,GAAG,YAAY,CAAC,KAAK,CAAC;IAEvB,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;IAEtC,MAAM,WAAW,GAAG;QAClB,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,YAAY,CAAC,KAAK;QAC5B,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,SAAS;QACT,iBAAiB,EAAE,wBAAwB,IAAI,UAAU;QACzD,mBAAmB,EAAE,0BAA0B,IAAI,UAAU;QAC7D,YAAY,EAAE,mBAAmB,IAAI,UAAU;QAC/C,SAAS;QACT,SAAS;QACT,WAAW,EAAE,WAAW,IAAI,eAAe;QAC3C,IAAI,EAAE,YAAY,EAAE;KACrB,CAAC;IAEF,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAEtE,mGAAmG;IACnG,iEAAiE;IACjE,MAAM,aAAa,GAAG;QACpB,IAAI,EAAE,MAAM,CAAC,OAAQ,CAAC,OAAO;QAC7B,EAAE,EAAE,cAAc;QAClB,KAAK,EAAE,SAAS;QAChB,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;QAClD,KAAK;KACN,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,WAAW,CACjC,MAAM,EACN,aAAa,EACb,YAAY,CAAC,KAAK,EAClB,YAAY,CAAC,KAAK,CACnB,CAAC;IAEF,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAE,QAAiB;IACzB,oBAAoB;CACrB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/escrow/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAUH,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,YAAY,GACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD;;GAEG;AACH,SAAS,YAAY,CAAC,OAAe;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,+BAA+B,CAClE,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,eAAe;IAGG;IAFpB,MAAM,GAAG,QAAQ,CAAC;IAE3B,YAA6B,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;IAAG,CAAC;IAExD,KAAK,CAAC,oBAAoB,CACxB,WAAmB,EACnB,YAAiC;QAEjC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,4BAA4B,WAAW,gCAAgC,CACxE,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,YAAY,CAAC,KAA+B,CAAC;QAE3D,wDAAwD;QACxD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,iFAAiF,YAAY,CAAC,KAAK,EAAE,CACtG,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,oFAAoF,YAAY,CAAC,KAAK,EAAE,CACzG,CAAC;QACJ,CAAC;QAED,MAAM,EACJ,aAAa,EACb,eAAe,EACf,cAAc,EACd,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,CAAC,EACb,WAAW,EACX,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,GAC3B,GAAG,KAAK,CAAC;QAEV,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;QAEtC,MAAM,WAAW,GAAG;YAClB,QAAQ,EAAE,eAAe;YACzB,QAAQ,EAAE,YAAY,CAAC,KAAsB;YAC7C,KAAK,EAAE,YAAY,CAAC,KAAsB;YAC1C,SAAS;YACT,iBAAiB,EAAE,wBAAwB,IAAI,UAAU;YACzD,mBAAmB,EAAE,0BAA0B,IAAI,UAAU;YAC7D,YAAY,EAAE,mBAAmB,IAAI,UAAU;YAC/C,SAAS;YACT,SAAS;YACT,WAAW,EAAE,WAAW,IAAI,eAAe;YAC3C,IAAI,EAAE,YAAY,EAAE;SACrB,CAAC;QAEF,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAEtE,mGAAmG;QACnG,iEAAiE;QACjE,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YACzB,EAAE,EAAE,cAAc;YAClB,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;YAClD,KAAK;SACN,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,WAAW,CACjC,IAAI,CAAC,MAAM,EACX,aAAa,EACb,KAAK,EACL,YAAY,CAAC,KAAsB,EACnC,OAAO,CACR,CAAC;QAEF,OAAO;YACL,WAAW;YACX,OAAO,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE;SACnD,CAAC;IACJ,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAkB,EAClB,MAAkE;IAElE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC,QAAQ;QACjB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM,EAAE,QAAiB;CAC1B,CAAC"}

package/dist/escrow/facilitator/index.d.ts

@@ -21,7 +21,7 @@ export declare class EscrowFacilitatorScheme implements SchemeNetworkFacilitator
     readonly caipFamily = "eip155:*";
     constructor(signer: FacilitatorEvmSigner);
     getSigners(_network: string): string[];
-    getExtra(_network: string): Record<string, unknown>;
+    getExtra(_network: string): Record<string, unknown> | undefined;
     verify(payload: PaymentPayload, requirements: PaymentRequirements): Promise<VerifyResponse>;
     settle(payload: PaymentPayload, requirements: PaymentRequirements): Promise<SettleResponse>;
 }

package/dist/escrow/facilitator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/escrow/facilitator/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAwBzD;;;;;;GAMG;AACH,qBAAa,uBAAwB,YAAW,wBAAwB;IAI1D,OAAO,CAAC,MAAM;IAH1B,QAAQ,CAAC,MAAM,YAAY;IAC3B,QAAQ,CAAC,UAAU,cAAc;gBAEb,MAAM,EAAE,oBAAoB;IAEhD,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAItC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAI7C,MAAM,CACV,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,cAAc,CAAC;IAgDpB,MAAM,CACV,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,cAAc,CAAC;CAuD3B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,eAAe,EAC5B,MAAM,EAAE;IACN,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;CAC/B,GACA,eAAe,CAMjB;AAED,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/escrow/facilitator/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,wBAAwB,EACxB,cAAc,EACd,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAwEzD;;;;;;GAMG;AACH,qBAAa,uBAAwB,YAAW,wBAAwB;IAI1D,OAAO,CAAC,MAAM;IAH1B,QAAQ,CAAC,MAAM,YAAY;IAC3B,QAAQ,CAAC,UAAU,cAAc;gBAEb,MAAM,EAAE,oBAAoB;IAEhD,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAMtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;IAIzD,MAAM,CACV,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,cAAc,CAAC;IAmJpB,MAAM,CACV,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,cAAc,CAAC;CA0F3B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,eAAe,EAC5B,MAAM,EAAE;IACN,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;CAC/B,GACA,eAAe,CAMjB;AAED,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/escrow/facilitator/index.js

@@ -5,8 +5,9 @@
  * Implements x402's SchemeNetworkFacilitator interface so the escrow scheme
  * is a drop-in for the x402 facilitator, just like ExactEvmScheme.
  */
-import { OPERATOR_ABI } from "../../shared/constants.js";
+import { OPERATOR_ABI, ERC20_BALANCE_OF_ABI, ERC6492_MAGIC_VALUE, } from "../../shared/constants.js";
 import { verifyERC3009Signature } from "../../shared/nonce.js";
+import { isEscrowPayload, isEscrowExtra, } from "../../shared/types.js";
 /**
  * Parse chainId from CAIP-2 network identifier
  * @param network - CAIP-2 network identifier (e.g., 'eip155:84532')
@@ -23,6 +24,39 @@ function parseChainId(network) {
     }
     return chainId;
 }
+/**
+ * Extract inner signature from an EIP-6492 wrapped signature.
+ * If the signature is not EIP-6492 wrapped, returns it unchanged.
+ *
+ * EIP-6492 format: abi.encode(address, bytes, bytes) ++ MAGIC_VALUE
+ * The inner signature is the third ABI-encoded bytes field.
+ */
+function unwrapERC6492Signature(signature) {
+    // EIP-6492 magic is 32 bytes (64 hex chars) at the end
+    if (signature.length <= 66)
+        return signature; // Too short to be wrapped
+    const magicSuffix = `0x${signature.slice(-64)}`;
+    if (magicSuffix !== ERC6492_MAGIC_VALUE)
+        return signature; // Not wrapped
+    // Strip the magic suffix and ABI-decode: (address prepareTarget, bytes prepareData, bytes innerSignature)
+    // The wrapped data (without magic) is: 0x + ABI-encoded (address, bytes, bytes)
+    const wrappedHex = signature.slice(2, -64); // hex without 0x prefix and magic
+    // ABI layout for (address, bytes, bytes):
+    // word 0 (0-64): address (padded to 32 bytes)
+    // word 1 (64-128): offset to prepareData bytes
+    // word 2 (128-192): offset to innerSignature bytes
+    // Then the dynamic data follows
+    if (wrappedHex.length < 192)
+        return signature; // Malformed
+    const innerSigOffset = parseInt(wrappedHex.slice(128, 192), 16) * 2; // byte offset → hex offset
+    if (innerSigOffset + 64 > wrappedHex.length)
+        return signature; // Malformed
+    const innerSigLength = parseInt(wrappedHex.slice(innerSigOffset, innerSigOffset + 64), 16) * 2; // bytes → hex chars
+    const innerSigStart = innerSigOffset + 64;
+    if (innerSigStart + innerSigLength > wrappedHex.length)
+        return signature; // Malformed
+    return `0x${wrappedHex.slice(innerSigStart, innerSigStart + innerSigLength)}`;
+}
 /**
  * Escrow Facilitator Scheme - implements x402's SchemeNetworkFacilitator
  *
@@ -40,39 +74,143 @@ export class EscrowFacilitatorScheme {
     getSigners(_network) {
         return [...this.signer.getAddresses()];
     }
+    // C4: name/version now come from server's parsePrice() via AssetAmount.extra.
+    // The facilitator should not hardcode token-specific metadata.
     getExtra(_network) {
-        return { name: "USDC", version: "2" };
+        return undefined;
     }
     async verify(payload, requirements) {
+        // M5: Type guard instead of double cast
+        if (!isEscrowPayload(payload.payload)) {
+            return {
+                isValid: false,
+                invalidReason: "invalid_payload_format",
+            };
+        }
         const escrowPayload = payload.payload;
+        const payer = escrowPayload.authorization.from;
+        // Validate scheme
+        if (requirements.scheme !== "escrow") {
+            return {
+                isValid: false,
+                invalidReason: "unsupported_scheme",
+                payer,
+            };
+        }
+        // Validate network format
+        const networkParts = requirements.network.split(":");
+        if (networkParts.length !== 2 || networkParts[0] !== "eip155") {
+            return {
+                isValid: false,
+                invalidReason: "invalid_network",
+                payer,
+            };
+        }
+        // M5: Type guard for extra
+        if (!isEscrowExtra(requirements.extra)) {
+            return {
+                isValid: false,
+                invalidReason: "invalid_escrow_extra",
+                payer,
+            };
+        }
         const extra = requirements.extra;
         const chainId = parseChainId(requirements.network);
+        // Time window validation
+        const now = Math.floor(Date.now() / 1000);
+        const validBefore = Number(escrowPayload.authorization.validBefore);
+        const validAfter = Number(escrowPayload.authorization.validAfter);
+        if (validBefore <= now + 6) {
+            return {
+                isValid: false,
+                invalidReason: "authorization_expired",
+                payer,
+            };
+        }
+        if (validAfter > now) {
+            return {
+                isValid: false,
+                invalidReason: "authorization_not_yet_valid",
+                payer,
+            };
+        }
+        // M4: Extract inner signature for verification if EIP-6492 wrapped.
+        // The contract's ERC6492SignatureHandler handles deployment; the facilitator
+        // only needs the inner ECDSA signature for ecrecover verification.
+        const signatureForVerify = unwrapERC6492Signature(escrowPayload.signature);
         // Verify ERC-3009 signature
-        const isValidSignature = await verifyERC3009Signature(this.signer, escrowPayload.authorization, escrowPayload.signature, { ...extra, chainId }, requirements.asset);
+        const isValidSignature = await verifyERC3009Signature(this.signer, escrowPayload.authorization, signatureForVerify, { ...extra, chainId }, requirements.asset);
         if (!isValidSignature) {
-            return { isValid: false, invalidReason: "Invalid ERC-3009 signature" };
+            return {
+                isValid: false,
+                invalidReason: "invalid_escrow_signature",
+                payer,
+            };
         }
         // Verify amount meets requirements
         if (BigInt(escrowPayload.authorization.value) <
             BigInt(requirements.amount)) {
-            return { isValid: false, invalidReason: "Insufficient payment amount" };
+            return {
+                isValid: false,
+                invalidReason: "insufficient_amount",
+                payer,
+            };
         }
         // Verify token matches
         if (escrowPayload.paymentInfo.token.toLowerCase() !==
             requirements.asset.toLowerCase()) {
-            return { isValid: false, invalidReason: "Token mismatch" };
+            return {
+                isValid: false,
+                invalidReason: "token_mismatch",
+                payer,
+            };
         }
         // Verify receiver matches
         if (escrowPayload.paymentInfo.receiver.toLowerCase() !==
             requirements.payTo.toLowerCase()) {
-            return { isValid: false, invalidReason: "Receiver mismatch" };
+            return {
+                isValid: false,
+                invalidReason: "receiver_mismatch",
+                payer,
+            };
+        }
+        // H4: Balance check — verify payer has sufficient token balance
+        try {
+            const balance = await this.signer.readContract({
+                address: requirements.asset,
+                abi: ERC20_BALANCE_OF_ABI,
+                functionName: "balanceOf",
+                args: [payer],
+            });
+            if (BigInt(balance) < BigInt(requirements.amount)) {
+                return {
+                    isValid: false,
+                    invalidReason: "insufficient_balance",
+                    payer,
+                };
+            }
+        }
+        catch {
+            // If balance check fails (e.g., non-standard token), skip it.
+            // The on-chain transaction will fail anyway if balance is insufficient.
         }
         return {
             isValid: true,
-            payer: escrowPayload.authorization.from,
+            payer,
         };
     }
     async settle(payload, requirements) {
+        // H2: Re-verify before settling to catch expired/invalid payloads
+        const verification = await this.verify(payload, requirements);
+        if (!verification.isValid) {
+            return {
+                success: false,
+                errorReason: verification.invalidReason ?? "verification_failed",
+                transaction: "",
+                network: requirements.network,
+                payer: verification.payer,
+            };
+        }
         const escrowPayload = payload.payload;
         const extra = requirements.extra;
         const { authorizeAddress, operatorAddress, tokenCollector } = extra;
@@ -90,7 +228,8 @@ export class EscrowFacilitatorScheme {
             feeReceiver: escrowPayload.paymentInfo.feeReceiver,
             salt: BigInt(escrowPayload.paymentInfo.salt),
         };
-        // Pass raw signature - ERC3009PaymentCollector expects raw bytes, not ABI-encoded
+        // Pass raw signature — ERC3009PaymentCollector/ERC6492SignatureHandler
+        // handles EIP-6492 unwrapping and wallet deployment on-chain
         const collectorData = escrowPayload.signature;
         const target = authorizeAddress ?? operatorAddress;
         try {
@@ -105,6 +244,21 @@ export class EscrowFacilitatorScheme {
                     collectorData,
                 ],
             });
+            // Wait for transaction confirmation with 60s timeout to avoid hanging on stuck txs
+            const receiptPromise = this.signer.waitForTransactionReceipt({
+                hash: txHash,
+            });
+            const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error("Transaction receipt timeout after 60s")), 60_000));
+            const receipt = await Promise.race([receiptPromise, timeoutPromise]);
+            if (receipt.status !== "success") {
+                return {
+                    success: false,
+                    errorReason: "transaction_reverted",
+                    transaction: txHash,
+                    network: requirements.network,
+                    payer: escrowPayload.authorization.from,
+                };
+            }
             return {
                 success: true,
                 transaction: txHash,

package/dist/escrow/facilitator/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/escrow/facilitator/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/escrow/facilitator/index.ts"],"names":[],"mappings":"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"}

package/dist/escrow/server/index.d.ts

@@ -5,47 +5,26 @@
  * Implements x402's SchemeNetworkServer interface so it can be registered
  * on an x402ResourceServer via server.register('eip155:84532', new EscrowServerScheme()).
  */
-/**
- * x402 PaymentRequirements (matches @x402/core/types PaymentRequirements)
- */
-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>;
-}
-/**
- * x402 AssetAmount (matches @x402/core/types AssetAmount)
- */
-export interface AssetAmount {
-    asset: string;
-    amount: string;
-    extra?: Record<string, unknown>;
-}
-/**
- * x402 Price type (matches @x402/core/types Price)
- */
-export type Price = string | number | AssetAmount;
-export type Network = `${string}:${string}`;
+import type { AssetAmount, MoneyParser, Network, PaymentRequirements, Price, SchemeNetworkServer } from "@x402/core/types";
+import { x402ResourceServer } from "@x402/core/server";
 /**
  * Server scheme - handles price parsing and requirement enhancement.
  * Implements x402's SchemeNetworkServer interface.
  */
-export declare class EscrowServerScheme {
+export declare class EscrowServerScheme implements SchemeNetworkServer {
     readonly scheme = "escrow";
-    private readonly decimals;
-    constructor(config?: {
-        decimals?: number;
-    });
+    private moneyParsers;
+    /**
+     * 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;
     /**
      * Parse a price into an x402 AssetAmount.
      *
@@ -55,6 +34,14 @@ export declare class EscrowServerScheme {
      * - AssetAmount: { asset: "0x...", amount: "10000" }
      */
     parsePrice(price: Price, network: Network): Promise<AssetAmount>;
+    /**
+     * Parse Money (string | number) to a decimal number.
+     */
+    private parseMoneyToDecimal;
+    /**
+     * Default money conversion — converts decimal amount to the default stablecoin on the network.
+     */
+    private defaultMoneyConversion;
     /**
      * Enhance payment requirements with facilitator's extra fields.
      *
@@ -62,7 +49,24 @@ export declare class EscrowServerScheme {
      * the requirements, so escrow addresses flow from facilitator → merchant
      * requirements automatically.
      */
-    enhancePaymentRequirements(requirements: PaymentRequirements, supportedKind: SupportedKind, _facilitatorExtensions: string[]): Promise<PaymentRequirements>;
+    enhancePaymentRequirements(requirements: PaymentRequirements, supportedKind: {
+        x402Version: number;
+        scheme: string;
+        network: Network;
+        extra?: Record<string, unknown>;
+    }, _facilitatorExtensions: string[]): Promise<PaymentRequirements>;
 }
+/**
+ * Register escrow server scheme with x402ResourceServer
+ *
+ * @example
+ * ```typescript
+ * const server = new x402ResourceServer(facilitatorConfig);
+ * registerEscrowServerScheme(server, { networks: "eip155:84532" });
+ * ```
+ */
+export declare function registerEscrowServerScheme(server: x402ResourceServer, config: {
+    networks: Network | Network[];
+}): x402ResourceServer;
 export type { EscrowExtra, EscrowPayload } from "../../shared/types.js";
 //# sourceMappingURL=index.d.ts.map