@ic402/client 0.1.4 → 1.0.0

package/dist/client.d.ts

@@ -1,12 +1,12 @@
-import type { ContentDelivery, PaymentReceipt } from './types.js';
-import { type VoucherSigner } from './voucher.js';
-export interface BudgetConfig {
-    maxPerRequest?: bigint;
-    maxPerDay?: bigint;
-    maxTotal?: bigint;
-    maxSessionDeposit?: bigint;
-    alertThreshold?: bigint;
+/** Minimal identity interface — any ICP identity that can provide a principal. */
+export interface Ic402Identity {
+    getPrincipal(): {
+        toText(): string;
+    };
 }
+import type { ContentDelivery, Job, PaymentReceipt, ServiceDefinition } from './types.js';
+import { type VoucherSigner } from './voucher.js';
+import { type FetchX402Result } from './evm.js';
 export interface SessionPreferences {
     preferSession?: boolean;
     maxDeposit?: bigint;
@@ -22,26 +22,40 @@ export interface SessionPreferences {
     evmToken?: string;
     /** For EVM sessions: the canister's EVM address (settlement recipient). */
     evmRecipient?: string;
+    /** For EVM sessions: the EIP-3009 authorization (signed by the payer). */
+    authorization?: {
+        from: string;
+        to: string;
+        value: number | bigint;
+        validAfter: number | bigint;
+        validBefore: number | bigint;
+        nonce: number[];
+        v: number;
+        r: number[];
+        s: number[];
+    };
 }
 export interface Ic402ClientConfig {
+    /** Target canister ID. Required for all operations. */
+    canisterId: string;
+    /** Factory to create actors for canister calls. Required for all operations. */
+    actorFactory: (canisterId: string) => any;
     /** ICP identity for signing payments */
-    identity: unknown;
-    /** CAIP-2 network identifier */
+    identity: Ic402Identity | null;
+    /** CAIP-2 network identifier (e.g., "icp:1" for ICP, "eip155:84532" for Base Sepolia) */
     network: string;
-    /** Automatically handle 402 responses */
+    /** Automatically handle 402 responses (ICP: ICRC-2 approve + retry) */
     autoPayment?: boolean;
-    /** Budget limits */
-    budget?: BudgetConfig;
     /** Session preferences */
     sessions?: SessionPreferences;
-    /** Callback when budget alert threshold is hit */
-    onBudgetAlert?: (spent: bigint, limit: bigint) => Promise<void>;
-    /** Ledger canister ID for ICRC-2 auto-approval */
+    /** Ledger canister ID for ICRC-2 auto-approval (ICP payments) */
     ledger?: string;
-    /** Default target canister ID (spender for ICRC-2 approval) */
-    canisterId?: string;
-    /** Factory to create a ledger actor for ICRC-2 calls. Required for autoPayment. */
+    /** Factory for ledger actors. Required for ICP auto-payment. */
     ledgerActorFactory?: (ledgerCanisterId: string) => any;
+    /** Custom EVM RPC URL. If omitted, uses a public RPC for the chain. */
+    evmRpcUrl?: string;
+    /** Fee buffer added to ICRC-2 approval amount (default: 100_000). */
+    approvalFeeBuffer?: bigint;
 }
 export interface SessionHandle {
     id: string;
@@ -60,20 +74,19 @@ export interface SessionHandle {
  */
 export declare class Ic402Client {
     private config;
-    private totalSpent;
     constructor(config: Ic402ClientConfig);
     /**
      * Call a canister method, auto-handling 402 payment if needed.
      *
      * Flow: call method → if #paymentRequired → icrc2_approve → create sig → retry
      */
-    call(canisterId: string, method: string, args: unknown[], actorFactory?: (canisterId: string) => any): Promise<unknown>;
+    call(method: string, args: unknown[], canisterId?: string): Promise<unknown>;
     /**
      * Open a streaming session with escrow deposit.
      *
      * Flow: requestSession → calculate deposit → icrc2_approve → openSession → SessionHandle
      */
-    openSession(canisterId: string, config?: Partial<SessionPreferences>, actorFactory?: (canisterId: string) => any, signer?: VoucherSigner): Promise<SessionHandle>;
+    openSession(sessionConfig?: Partial<SessionPreferences>, signer?: VoucherSigner, canisterId?: string): Promise<SessionHandle>;
     /**
      * Fetch content from a ContentDelivery response.
      * Handles all delivery methods: inline, httpUrl, canisterQuery, assetCanister.
@@ -82,6 +95,67 @@ export declare class Ic402Client {
         canisterId?: string;
         actorFactory?: (canisterId: string) => any;
     }): Promise<Uint8Array>;
+    /**
+     * Fetch from an x402-gated URL. The full flow:
+     * 1. Client probes the URL → gets 402 with payment requirements
+     * 2. Client calls canister signX402Payment → gets signed EIP-3009 header
+     * 3. Client retries the URL with the signed X-Payment header
+     *
+     * @param url - The x402-gated URL to fetch
+     * @param actorFactory - Factory to create canister actor
+     */
+    fetchX402(url: string, options?: {
+        init?: RequestInit;
+        chainId?: number;
+    }): Promise<FetchX402Result>;
+    /**
+     * Register the canister as an agent on the ERC-8004 IdentityRegistry.
+     * Full flow: get chain state → canister signs → client broadcasts → poll receipt.
+     *
+     * @param actorFactory - Factory to create canister actor
+     * @param rpcUrl - Optional custom RPC URL for the target chain
+     */
+    registerAgent(rpcUrl?: string, chainId?: number): Promise<{
+        tokenId: bigint | null;
+        txHash: string;
+    }>;
+    /**
+     * Sign and broadcast an ERC-20 transfer.
+     * Client fetches chain state, canister signs, client broadcasts.
+     */
+    sendErc20Transfer(tokenAddress: string, recipient: string, amount: bigint, rpcUrl?: string): Promise<{
+        txHash: string;
+    }>;
+    /**
+     * Sign and broadcast a native ETH transfer.
+     */
+    sendEthTransfer(recipient: string, amountWei: bigint, rpcUrl?: string): Promise<{
+        txHash: string;
+    }>;
+    /** Extract numeric chain ID from CAIP-2 network string, or null if not EVM. */
+    private tryExtractChainId;
+    /** Extract chain ID or throw. */
+    private extractChainId;
+    /**
+     * List available services from the canister.
+     */
+    listServices(): Promise<ServiceDefinition[]>;
+    /**
+     * Submit a paid service request. Handles x402 payment automatically.
+     * Returns the job ID for polling.
+     */
+    submitServiceRequest(serviceId: string, params: Uint8Array): Promise<{
+        jobId: string;
+    }>;
+    /**
+     * Poll for a job result until completed or max attempts reached.
+     * Returns the full job record when done.
+     */
+    pollJobResult(jobId: string, maxAttempts?: number, intervalMs?: number): Promise<Job>;
+    /**
+     * Dispute a job result (for BuyerConfirm verification).
+     */
+    disputeJob(jobId: string, reason: string): Promise<void>;
     /**
      * Discover agents via ERC-8004 registries.
      *

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,YAAY,IAAI;QAAE,MAAM,IAAI,MAAM,CAAA;KAAE,CAAC;CACtC;AAQD,OAAO,KAAK,EACV,eAAe,EACf,GAAG,EACH,cAAc,EACd,iBAAiB,EAMlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EASL,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6FAA6F;IAC7F,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,aAAa,CAAC,EAAE;QACd,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;QACvB,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;QAC5B,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;QAC7B,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,EAAE,CAAC;QACZ,CAAC,EAAE,MAAM,EAAE,CAAC;KACb,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAEhF,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,GAAG,CAAC;IAC1C,wCAAwC;IACxC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IAC/B,yFAAyF;IACzF,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAEhE,kBAAkB,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,KAAK,GAAG,CAAC;IACvD,uEAAuE;IACvE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAC1E,KAAK,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;CAClC;AAED;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IAIrC;;;;OAIG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgElF;;;;OAIG;IACG,WAAW,CACf,aAAa,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAC3C,MAAM,CAAC,EAAE,aAAa,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,aAAa,CAAC;IA0LzB;;;OAGG;IACG,YAAY,CAChB,QAAQ,EAAE,eAAe,EACzB,OAAO,CAAC,EAAE;QACR,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,GAAG,CAAC;KAC5C,GACA,OAAO,CAAC,UAAU,CAAC;IA8DtB;;;;;;;;OAQG;IACG,SAAS,CACb,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GACjD,OAAO,CAAC,eAAe,CAAC;IAgE3B;;;;;;OAMG;IACG,aAAa,CACjB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA4BtD;;;OAGG;IACG,iBAAiB,CACrB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAwB9B;;OAEG;IACG,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAwB9B,+EAA+E;IAC/E,OAAO,CAAC,iBAAiB;IAKzB,iCAAiC;IACjC,OAAO,CAAC,cAAc;IAYtB;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAKlD;;;OAGG;IACG,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IA8E7F;;;OAGG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,SAAK,EAAE,UAAU,SAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IA8BrF;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D;;;;;;;OAOG;IACG,cAAc,CAAC,MAAM,EAAE;QAC3B,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAG5F"}

package/dist/client.js

@@ -1,4 +1,10 @@
+import { Principal } from '@icp-sdk/core/principal';
+/** JSON.stringify that handles BigInt values. */
+function safeStringify(value) {
+    return JSON.stringify(value, (_key, val) => typeof val === 'bigint' ? val.toString() : val);
+}
 import { signVoucher } from './voucher.js';
+import { Ic402Error, classifyNetworkError, probeX402 as probeX402Url, createEvmClient, getEvmNonce, getFeeData, broadcastTransaction as broadcastTx, registerAgent as registerAgentFlow, } from './evm.js';
 /**
  * ic402 TypeScript client SDK.
  *
@@ -7,7 +13,6 @@ import { signVoucher } from './voucher.js';
  */
 export class Ic402Client {
     config;
-    totalSpent = 0n;
     constructor(config) {
         this.config = config;
     }
@@ -16,13 +21,9 @@ export class Ic402Client {
      *
      * Flow: call method → if #paymentRequired → icrc2_approve → create sig → retry
      */
-    async call(canisterId, method, args, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    actorFactory) {
-        if (!actorFactory) {
-            throw new Error('actorFactory required: provide a function that creates an actor for the canister');
-        }
-        const actor = actorFactory(canisterId);
+    async call(method, args, canisterId) {
+        const cid = canisterId ?? this.config.canisterId;
+        const actor = this.config.actorFactory(cid);
         const result = await actor[method](...args);
         // Check for payment required response
         if (result && typeof result === 'object' && 'paymentRequired' in result) {
@@ -30,23 +31,14 @@ export class Ic402Client {
                 throw new Error('Payment required but autoPayment is disabled');
             }
             const requirement = result.paymentRequired;
-            // Check budget limits
-            if (this.config.budget?.maxPerRequest &&
-                requirement.amount > this.config.budget.maxPerRequest) {
-                throw new Error(`Amount ${requirement.amount} exceeds maxPerRequest ${this.config.budget.maxPerRequest}`);
-            }
-            if (this.config.budget?.maxTotal &&
-                this.totalSpent + requirement.amount > this.config.budget.maxTotal) {
-                throw new Error('Total budget exceeded');
-            }
             if (!this.config.ledger || !this.config.ledgerActorFactory) {
                 throw new Error('Auto-approval requires ledger and ledgerActorFactory in config');
             }
-            // ICRC-2 approve: allow the target canister to spend the required amount
+            // ICRC-2 approve: allow the target canister to spend amount + fee buffer
             const ledgerActor = this.config.ledgerActorFactory(this.config.ledger);
             const approveResult = await ledgerActor.icrc2_approve({
-                spender: { owner: canisterId, subaccount: [] },
-                amount: requirement.amount,
+                spender: { owner: Principal.fromText(cid), subaccount: [] },
+                amount: requirement.amount + (this.config.approvalFeeBuffer ?? 100000n),
                 fee: [],
                 memo: [],
                 from_subaccount: [],
@@ -55,16 +47,16 @@ export class Ic402Client {
                 expires_at: [],
             });
             if (approveResult && typeof approveResult === 'object' && 'Err' in approveResult) {
-                throw new Error(`ICRC-2 approve failed: ${JSON.stringify(approveResult.Err)}`);
+                throw new Error(`ICRC-2 approve failed: ${safeStringify(approveResult.Err)}`);
             }
-            this.totalSpent += requirement.amount;
             // Construct PaymentSignature from the requirement's nonce and retry
+            const sender = this.config.identity?.getPrincipal().toText() ?? '';
             const sig = {
                 scheme: 'exact',
                 network: this.config.network,
                 signature: requirement.nonce,
                 publicKey: [],
-                sender: '',
+                sender,
                 nonce: requirement.nonce,
                 authorization: [],
             };
@@ -87,13 +79,10 @@ export class Ic402Client {
      *
      * Flow: requestSession → calculate deposit → icrc2_approve → openSession → SessionHandle
      */
-    async openSession(canisterId, config, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    actorFactory, signer) {
-        if (!actorFactory) {
-            throw new Error('actorFactory required');
-        }
-        const actor = actorFactory(canisterId);
+    async openSession(sessionConfig, signer, canisterId) {
+        const cid = canisterId ?? this.config.canisterId;
+        const config = sessionConfig;
+        const actor = this.config.actorFactory(cid);
         let intent = await actor.requestSession();
         // For EVM sessions, override the intent's network, token, and recipient
         if (config?.evmNetwork) {
@@ -107,19 +96,14 @@ export class Ic402Client {
         const maxDeposit = config?.maxDeposit ?? this.config.sessions?.maxDeposit ?? intent.suggestedDeposit;
         const autoClose = config?.autoClose ?? this.config.sessions?.autoClose ?? true;
         const idleTimeout = config?.idleTimeout ?? this.config.sessions?.idleTimeout;
-        // Check budget
-        if (this.config.budget?.maxSessionDeposit &&
-            maxDeposit > this.config.budget.maxSessionDeposit) {
-            throw new Error(`Deposit ${maxDeposit} exceeds maxSessionDeposit ${this.config.budget.maxSessionDeposit}`);
-        }
         const isEvm = !!config?.evmTxHash;
         const network = config?.evmNetwork ?? this.config.network;
         // ICRC-2 approve deposit amount (ICP sessions only)
         if (!isEvm && this.config.autoPayment && this.config.ledger && this.config.ledgerActorFactory) {
             const ledgerActor = this.config.ledgerActorFactory(this.config.ledger);
             const approveResult = await ledgerActor.icrc2_approve({
-                spender: { owner: canisterId, subaccount: [] },
-                amount: maxDeposit,
+                spender: { owner: Principal.fromText(cid), subaccount: [] },
+                amount: maxDeposit + (this.config.approvalFeeBuffer ?? 100000n),
                 fee: [],
                 memo: [],
                 from_subaccount: [],
@@ -128,10 +112,10 @@ export class Ic402Client {
                 expires_at: [],
             });
             if (approveResult && typeof approveResult === 'object' && 'Err' in approveResult) {
-                throw new Error(`ICRC-2 approve failed: ${JSON.stringify(approveResult.Err)}`);
+                throw new Error(`ICRC-2 approve failed: ${safeStringify(approveResult.Err)}`);
             }
         }
-        const sessionConfig = {
+        const openConfig = {
             maxDeposit,
             autoClose,
             idleTimeout: idleTimeout ? [idleTimeout] : [],
@@ -144,18 +128,37 @@ export class Ic402Client {
         if (signer) {
             pubKey = new Uint8Array(await signer.getPublicKey());
         }
+        const evmAuth = config?.authorization;
         const sig = {
             scheme: 'exact',
             network,
             signature: isEvm
                 ? Array.from(new TextEncoder().encode(config.evmTxHash))
                 : new Uint8Array(0),
-            publicKey: [Array.from(pubKey)],
+            publicKey: [pubKey],
             sender: config?.evmSender ?? '',
             nonce: new Uint8Array(32),
-            authorization: [],
+            authorization: evmAuth
+                ? [
+                    {
+                        from: evmAuth.from,
+                        to: evmAuth.to,
+                        value: typeof evmAuth.value === 'bigint' ? evmAuth.value : BigInt(evmAuth.value),
+                        validAfter: typeof evmAuth.validAfter === 'bigint'
+                            ? evmAuth.validAfter
+                            : BigInt(evmAuth.validAfter),
+                        validBefore: typeof evmAuth.validBefore === 'bigint'
+                            ? evmAuth.validBefore
+                            : BigInt(evmAuth.validBefore),
+                        nonce: evmAuth.nonce,
+                        v: evmAuth.v,
+                        r: evmAuth.r,
+                        s: evmAuth.s,
+                    },
+                ]
+                : [],
         };
-        const result = await actor.openSession(sessionConfig, sig);
+        const result = await actor.openSession(openConfig, sig);
         if ('err' in result) {
             throw new Error(`Failed to open session: ${result.err}`);
         }
@@ -230,7 +233,7 @@ export class Ic402Client {
                 if ('ok' in closeResult) {
                     return closeResult.ok;
                 }
-                throw new Error(`Failed to close session: ${JSON.stringify(closeResult)}`);
+                throw new Error(`Failed to close session: ${safeStringify(closeResult)}`);
             },
         };
         return handle;
@@ -294,6 +297,255 @@ export class Ic402Client {
         }
         throw new Error('Unknown delivery method');
     }
+    // ── EVM Remote Signing ──
+    /**
+     * Fetch from an x402-gated URL. The full flow:
+     * 1. Client probes the URL → gets 402 with payment requirements
+     * 2. Client calls canister signX402Payment → gets signed EIP-3009 header
+     * 3. Client retries the URL with the signed X-Payment header
+     *
+     * @param url - The x402-gated URL to fetch
+     * @param actorFactory - Factory to create canister actor
+     */
+    async fetchX402(url, options) {
+        const { init, chainId } = options ?? {};
+        const cid = chainId ?? this.tryExtractChainId();
+        if (!cid) {
+            return {
+                status: 'error',
+                error: new Ic402Error('config_error', 'EVM chain ID required: set config.network to "eip155:<chainId>" or pass chainId to fetchX402'),
+            };
+        }
+        const actor = this.config.actorFactory(this.config.canisterId);
+        // 1. Probe
+        const probeResult = await probeX402Url(url, cid, init);
+        if (probeResult.status === 'free')
+            return probeResult;
+        if (probeResult.status === 'error')
+            return probeResult;
+        const { paymentOption } = probeResult;
+        // 2. Sign via canister
+        let signed;
+        try {
+            // Extract chain ID from payment option's network (e.g., "eip155:8453" → 8453)
+            const optionChainId = parseInt(paymentOption.network.replace('eip155:', ''), 10) || cid;
+            const result = await actor.signX402Payment(optionChainId, paymentOption.asset, paymentOption.recipient, paymentOption.amount, paymentOption.tokenName, paymentOption.tokenVersion);
+            if ('err' in result) {
+                return { status: 'error', error: new Ic402Error('sign_failed', result.err) };
+            }
+            signed = result.ok;
+        }
+        catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            return { status: 'error', error: new Ic402Error('sign_failed', msg, e) };
+        }
+        // 3. Retry with payment header
+        let response;
+        try {
+            const headers = new Headers(init?.headers);
+            headers.set('X-Payment', signed.header);
+            headers.set('Payment-Signature', signed.header);
+            response = await fetch(url, { ...init, headers });
+        }
+        catch (e) {
+            return { status: 'error', error: classifyNetworkError(e) };
+        }
+        const body = await response.text();
+        if (response.ok)
+            return { status: 'ok', code: response.status, body, paidAmount: signed.paidAmount };
+        if (response.status === 402)
+            return { status: 'error', error: new Ic402Error('settlement_failed', body.slice(0, 200)) };
+        return {
+            status: 'error',
+            error: new Ic402Error('http_error', `HTTP ${response.status}: ${body.slice(0, 200)}`),
+        };
+    }
+    /**
+     * Register the canister as an agent on the ERC-8004 IdentityRegistry.
+     * Full flow: get chain state → canister signs → client broadcasts → poll receipt.
+     *
+     * @param actorFactory - Factory to create canister actor
+     * @param rpcUrl - Optional custom RPC URL for the target chain
+     */
+    async registerAgent(rpcUrl, chainId) {
+        const cid = chainId ?? this.extractChainId();
+        const actor = this.config.actorFactory(this.config.canisterId);
+        const evmAddress = await actor.getEvmAddress();
+        const rpc = rpcUrl ?? this.config.evmRpcUrl;
+        const result = await registerAgentFlow(async (nonce, maxFee, priorityFee) => {
+            const r = await actor.signAgentRegistration(nonce, maxFee, priorityFee);
+            if ('err' in r)
+                throw new Ic402Error('sign_failed', r.err);
+            return r.ok;
+        }, evmAddress, cid, rpc);
+        if (result.tokenId != null) {
+            try {
+                await actor.setAgentId?.(result.tokenId);
+            }
+            catch {
+                /* optional */
+            }
+        }
+        return { tokenId: result.tokenId, txHash: result.txHash };
+    }
+    /**
+     * Sign and broadcast an ERC-20 transfer.
+     * Client fetches chain state, canister signs, client broadcasts.
+     */
+    async sendErc20Transfer(tokenAddress, recipient, amount, rpcUrl) {
+        const chainId = this.extractChainId();
+        const actor = this.config.actorFactory(this.config.canisterId);
+        const evmAddress = await actor.getEvmAddress();
+        const rpc = rpcUrl ?? this.config.evmRpcUrl;
+        const client = createEvmClient(chainId, rpc);
+        const [nonce, fees] = await Promise.all([getEvmNonce(client, evmAddress), getFeeData(client)]);
+        const result = await actor.signErc20Transfer(chainId, tokenAddress, recipient, amount, nonce, fees.maxFeePerGas, fees.maxPriorityFeePerGas);
+        if ('err' in result)
+            throw new Ic402Error('sign_failed', result.err);
+        const txHash = await broadcastTx(client, result.ok.rawTx);
+        return { txHash };
+    }
+    /**
+     * Sign and broadcast a native ETH transfer.
+     */
+    async sendEthTransfer(recipient, amountWei, rpcUrl) {
+        const chainId = this.extractChainId();
+        const actor = this.config.actorFactory(this.config.canisterId);
+        const evmAddress = await actor.getEvmAddress();
+        const rpc = rpcUrl ?? this.config.evmRpcUrl;
+        const client = createEvmClient(chainId, rpc);
+        const [nonce, fees] = await Promise.all([getEvmNonce(client, evmAddress), getFeeData(client)]);
+        const result = await actor.signEthTransfer(chainId, recipient, amountWei, 21000, nonce, fees.maxFeePerGas, fees.maxPriorityFeePerGas);
+        if ('err' in result)
+            throw new Ic402Error('sign_failed', result.err);
+        const txHash = await broadcastTx(client, result.ok.rawTx);
+        return { txHash };
+    }
+    /** Extract numeric chain ID from CAIP-2 network string, or null if not EVM. */
+    tryExtractChainId() {
+        const match = this.config.network.match(/^eip155:(\d+)$/);
+        return match ? parseInt(match[1], 10) : null;
+    }
+    /** Extract chain ID or throw. */
+    extractChainId() {
+        const id = this.tryExtractChainId();
+        if (id == null)
+            throw new Ic402Error('config_error', `Expected EVM network (eip155:*), got: ${this.config.network}`);
+        return id;
+    }
+    // ── Service Marketplace ──
+    /**
+     * List available services from the canister.
+     */
+    async listServices() {
+        const actor = this.config.actorFactory(this.config.canisterId);
+        return actor.listServices();
+    }
+    /**
+     * Submit a paid service request. Handles x402 payment automatically.
+     * Returns the job ID for polling.
+     */
+    async submitServiceRequest(serviceId, params) {
+        const actor = this.config.actorFactory(this.config.canisterId);
+        const result = await actor.submitServiceRequest(serviceId, Array.from(params), []);
+        if (result && typeof result === 'object' && 'paymentRequired' in result) {
+            if (!this.config.autoPayment) {
+                throw new Ic402Error('config_error', 'Payment required but autoPayment is disabled');
+            }
+            if (!this.config.ledger || !this.config.ledgerActorFactory) {
+                throw new Ic402Error('config_error', 'Auto-approval requires ledger and ledgerActorFactory');
+            }
+            const requirement = result.paymentRequired;
+            const amount = Array.isArray(requirement) && requirement.length > 0 ? requirement[0].amount : 0n;
+            // Approve amount + fee buffer (ICRC-2 transfer_from deducts fee from allowance)
+            const approveAmount = amount + (this.config.approvalFeeBuffer ?? 100000n);
+            const ledgerActor = this.config.ledgerActorFactory(this.config.ledger);
+            const approveResult = await ledgerActor.icrc2_approve({
+                spender: { owner: Principal.fromText(this.config.canisterId), subaccount: [] },
+                amount: approveAmount,
+                fee: [],
+                memo: [],
+                from_subaccount: [],
+                created_at_time: [],
+                expected_allowance: [],
+                expires_at: [],
+            });
+            if (approveResult && typeof approveResult === 'object' && 'Err' in approveResult) {
+                throw new Ic402Error('sign_failed', `ICRC-2 approve failed: ${safeStringify(approveResult.Err)}`);
+            }
+            // Convert nonce to proper array — Candid may decode vec nat8 as Uint8Array or indexed object
+            const rawNonce = requirement[0]?.nonce ?? new Uint8Array(32);
+            const nonce = rawNonce instanceof Uint8Array
+                ? Array.from(rawNonce)
+                : Array.isArray(rawNonce)
+                    ? rawNonce
+                    : Object.values(rawNonce);
+            // Sender must be the caller's principal — derive from identity if available
+            const sender = this.config.identity?.getPrincipal().toText() ?? '';
+            const sig = {
+                scheme: 'exact',
+                network: this.config.network,
+                signature: nonce,
+                publicKey: [],
+                sender,
+                nonce,
+                authorization: [],
+            };
+            const retryResult = await actor.submitServiceRequest(serviceId, Array.from(params), [sig]);
+            if (retryResult && typeof retryResult === 'object' && 'ok' in retryResult) {
+                return retryResult.ok;
+            }
+            if (retryResult && typeof retryResult === 'object' && 'error' in retryResult) {
+                throw new Ic402Error('sign_failed', retryResult.error);
+            }
+            throw new Ic402Error('unknown', `Unexpected result: ${safeStringify(retryResult)}`);
+        }
+        if (result && typeof result === 'object' && 'ok' in result) {
+            return result.ok;
+        }
+        if (result && typeof result === 'object' && 'error' in result) {
+            throw new Ic402Error('sign_failed', result.error);
+        }
+        throw new Ic402Error('unknown', `Unexpected result: ${safeStringify(result)}`);
+    }
+    /**
+     * Poll for a job result until completed or max attempts reached.
+     * Returns the full job record when done.
+     */
+    async pollJobResult(jobId, maxAttempts = 30, intervalMs = 2000) {
+        const actor = this.config.actorFactory(this.config.canisterId);
+        for (let i = 0; i < maxAttempts; i++) {
+            const job = await actor.getJob(jobId);
+            // Candid opt returns [job] or []
+            const j = Array.isArray(job) && job.length > 0 ? job[0] : job;
+            if (!j)
+                throw new Ic402Error('unknown', `Job not found: ${jobId}`);
+            const status = j.status;
+            if ('Settled' in status || 'Verified' in status || 'Submitted' in status) {
+                return j;
+            }
+            if ('Disputed' in status) {
+                throw new Ic402Error('sign_failed', `Job disputed: ${jobId}`);
+            }
+            if ('Expired' in status || 'Refunded' in status) {
+                throw new Ic402Error('not_confirmed', `Job expired or refunded: ${jobId}`);
+            }
+            if (i < maxAttempts - 1) {
+                await new Promise((r) => setTimeout(r, intervalMs));
+            }
+        }
+        throw new Ic402Error('not_confirmed', `Job ${jobId} not completed within ${maxAttempts} attempts`);
+    }
+    /**
+     * Dispute a job result (for BuyerConfirm verification).
+     */
+    async disputeJob(jobId, reason) {
+        const actor = this.config.actorFactory(this.config.canisterId);
+        const result = await actor.disputeJob(jobId, reason);
+        if (result && typeof result === 'object' && 'err' in result) {
+            throw new Ic402Error('unknown', result.err);
+        }
+    }
     /**
      * Discover agents via ERC-8004 registries.
      *