accounts 0.6.4 → 0.6.6

package/dist/server/internal/handlers/utils.d.ts

@@ -1,4 +1,4 @@
-import { RpcRequest } from 'ox';
+import { RpcRequest, RpcResponse } from 'ox';
 import { Transaction as core_Transaction } from 'ox/tempo';
 import { type Client } from 'viem';
 import * as z from 'zod/mini';
@@ -6,6 +6,24 @@ export declare function resolveChainId(value: unknown): number | undefined;
 export declare function formatFillTransactionRequest(client: Client, value: Record<string, unknown>): Record<string, unknown>;
 export declare function normalizeFillTransactionRequest(value: Record<string, unknown>): Record<string, unknown>;
 export declare function normalizeTempoTransaction(value: Record<string, unknown> | undefined): core_Transaction.Transaction<false, bigint, number>;
+/** Returns a raw JSON-RPC error response object (not wrapped in a `Response`). */
+export declare function rpcErrorJson(request: RpcRequest.RpcRequest, error: unknown): {
+    readonly error: RpcResponse.InvalidParamsError;
+    readonly id: number;
+    readonly jsonrpc: "2.0";
+} | {
+    readonly error: RpcResponse.MethodNotSupportedError;
+    readonly id: number;
+    readonly jsonrpc: "2.0";
+} | {
+    readonly error: {
+        readonly data?: {};
+        readonly code: number;
+        readonly message: string;
+    };
+    readonly id: number;
+    readonly jsonrpc: "2.0";
+};
 export declare function rpcError(request: RpcRequest.RpcRequest, error: unknown): Response;
 export declare function rpcResult(request: RpcRequest.RpcRequest, result: unknown): Response;
 export declare const parseParams: z.ZodMiniReadonly<z.ZodMiniTuple<readonly [z.ZodMiniRecord<z.ZodMiniString<string>, z.ZodMiniUnknown>], null>>;

package/dist/server/internal/handlers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/server/internal/handlers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,UAAU,EAAe,MAAM,IAAI,CAAA;AACjD,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,MAAM,CAAA;AAC7C,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAE7B,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,sBAK5C;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,2BAI1F;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,2BAW7E;AAOD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,uDAGnF;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,YA+BtE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,YAExE;AAED,eAAO,MAAM,WAAW,gHAA2D,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/server/internal/handlers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,CAAA;AACjD,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,MAAM,CAAA;AAC7C,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAE7B,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,sBAK5C;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,2BAI1F;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,2BAW7E;AAOD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,uDAGnF;AAED,kFAAkF;AAClF,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO;;;;;;;;;;;;;;;;EA2B1E;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,YAEtE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,YAExE;AAED,eAAO,MAAM,WAAW,gHAA2D,CAAA"}

package/dist/server/internal/handlers/utils.js

@@ -41,24 +41,28 @@ export function normalizeTempoTransaction(value) {
         throw new Error('Expected `tx` in eth_fillTransaction response.');
     return core_Transaction.fromRpc({ type: '0x76', ...value });
 }
-export function rpcError(request, error) {
+/** Returns a raw JSON-RPC error response object (not wrapped in a `Response`). */
+export function rpcErrorJson(request, error) {
     if (error instanceof RpcResponse.InvalidParamsError)
-        return Response.json(RpcResponse.from({ error }, { request }));
+        return RpcResponse.from({ error }, { request });
     if (error instanceof RpcResponse.MethodNotSupportedError)
-        return Response.json(RpcResponse.from({ error }, { request }));
+        return RpcResponse.from({ error }, { request });
     if (error.name === 'ZodError')
-        return Response.json(RpcResponse.from({
+        return RpcResponse.from({
             error: new RpcResponse.InvalidParamsError({
                 message: error.message,
             }),
-        }, { request }));
+        }, { request });
     const inner = resolveError(error);
     const message = inner.message ?? error.message;
     const code = inner.code ?? -32603;
     const data = inner.data;
-    return Response.json(RpcResponse.from({
+    return RpcResponse.from({
         error: { code, message, ...(data ? { data } : {}) },
-    }, { request }));
+    }, { request });
+}
+export function rpcError(request, error) {
+    return Response.json(rpcErrorJson(request, error));
 }
 export function rpcResult(request, result) {
     return Response.json(RpcResponse.from({ result }, { request }));

package/dist/server/internal/handlers/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/server/internal/handlers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,CAAA;AACjD,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC1D,OAAO,EAAe,SAAS,EAAE,MAAM,MAAM,CAAA;AAC7C,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAE7B,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;IACnD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAChF,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,MAAc,EAAE,KAA8B;IACzF,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAA;IACnE,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IACzB,OAAO,MAAM,CAAC,EAAE,GAAG,KAAK,EAAW,EAAE,iBAAiB,CAA4B,CAAA;AACpF,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAA8B;IAC5E,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,WAAW,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,KAAK,CAAA;IACtF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACzE,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAuC,CAAA;IAC5D,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAA;IACnC,OAAO;QACL,GAAG,IAAI;QACP,GAAG,CAAC,OAAO,IAAI,EAAE,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,GAAG,CAAC,OAAO,IAAI,EAAE,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzF,CAAA;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAA;IACtE,OAAO,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAA0C;IAClF,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;IAC7E,OAAO,gBAAgB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,EAA0B,CAAE,CAAA;AACtF,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,OAA8B,EAAE,KAAc;IACrE,IAAI,KAAK,YAAY,WAAW,CAAC,kBAAkB;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAEhE,IAAI,KAAK,YAAY,WAAW,CAAC,uBAAuB;QACtD,OAAO,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAEhE,IAAK,KAAuC,CAAC,IAAI,KAAK,UAAU;QAC9D,OAAO,QAAQ,CAAC,IAAI,CAClB,WAAW,CAAC,IAAI,CACd;YACE,KAAK,EAAE,IAAI,WAAW,CAAC,kBAAkB,CAAC;gBACxC,OAAO,EAAG,KAAe,CAAC,OAAO;aAClC,CAAC;SACH,EACD,EAAE,OAAO,EAAE,CACZ,CACF,CAAA;IAEH,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAK,KAAe,CAAC,OAAO,CAAA;IACzD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAA;IACjC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;IACvB,OAAO,QAAQ,CAAC,IAAI,CAClB,WAAW,CAAC,IAAI,CACd;QACE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;KACpD,EACD,EAAE,OAAO,EAAE,CACZ,CACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAA8B,EAAE,MAAe;IACvE,OAAO,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;AACjE,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;AAEnF,SAAS,YAAY,CAAC,KAAc;IAKlC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAA;IAClD,MAAM,CAAC,GAAG,KAAgC,CAAA;IAC1C,qEAAqE;IACrE,IAAI,KAAK,YAAY,SAAS,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,OAAQ,CAA6B,CAAC,IAAI,KAAK,QAAQ,CAC7B,CAAA;QACnC,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;YAC9E,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAA;IACzE,CAAC;IACD,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;QAC7D,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;IAC3D,OAAO,EAAE,CAAA;AACX,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/server/internal/handlers/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "accounts",
   "description": "Tempo Accounts SDK",
   "type": "module",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "dependencies": {
     "hono": "^4.12.12",
     "idb-keyval": "^6.2.2",

package/src/core/zod/rpc.ts

@@ -148,7 +148,7 @@ export namespace eth_fillTransaction {
     method: z.literal('eth_fillTransaction'),
     params: z.readonly(z.tuple([transactionRequest])),
     returns: z.object({
-      meta: z.object({
+      capabilities: z.object({
         balanceDiffs: z.optional(z.record(u.address(), z.readonly(z.array(balanceDiff)))),
         fee: z.nullable(
           z.object({

package/src/server/internal/handlers/relay.test.ts

@@ -73,6 +73,26 @@ describe('behavior: without feePayer', () => {
     const chainId = await client.request({ method: 'eth_chainId' })
     expect(Number(chainId)).toMatchInlineSnapshot(`${chain.id}`)
   })
+
+  test('behavior: handles JSON-RPC batch requests', async () => {
+    const response = await fetch(server.url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify([
+        { jsonrpc: '2.0', id: 1, method: 'eth_chainId', params: [] },
+        { jsonrpc: '2.0', id: 2, method: 'eth_chainId', params: [] },
+      ]),
+    })
+
+    expect(response.status).toBe(200)
+    const body = (await response.json()) as { id: number; result: string }[]
+    expect(Array.isArray(body)).toBe(true)
+    expect(body).toHaveLength(2)
+    expect(body[0]!.id).toBe(1)
+    expect(body[1]!.id).toBe(2)
+    expect(Number(body[0]!.result)).toBe(chain.id)
+    expect(Number(body[1]!.result)).toBe(chain.id)
+  })
 })
 
 describe('behavior: capabilities', () => {
@@ -831,6 +851,6 @@ describe('behavior: fee token resolution', () => {
       ],
     })
 
-    expect(transaction.feeToken).toBe('0x20c0000000000000000000000000000000000000')
+    expect(transaction.feeToken).toBeUndefined()
   })
 })

package/src/server/internal/handlers/relay.ts

@@ -1,4 +1,4 @@
-import { AbiEvent, Hex, RpcRequest } from 'ox'
+import { AbiEvent, Hex, RpcRequest, RpcResponse } from 'ox'
 import { Transaction as core_Transaction } from 'ox/tempo'
 import {
   type Address,
@@ -18,6 +18,7 @@ import { simulateCalls } from 'viem/actions'
 import { tempo, tempoLocalnet, tempoMainnet, tempoModerato } from 'viem/chains'
 import { Abis, Actions, Addresses, Capabilities, Transaction } from 'viem/tempo'
 
+import * as Schema from '../../../core/Schema.js'
 import { type Handler, from } from '../../Handler.js'
 import * as FeePayer from './feePayer.js'
 import * as Utils from './utils.js'
@@ -98,213 +99,166 @@ export function relay(options: relay.Options = {}): Handler {
     return clients.get(chains[0]!.id)!
   }
 
-  const router = from(rest)
-
-  router.post(path, async (c) => {
-    const request = RpcRequest.from((await c.req.raw.json()) as never)
-
-    try {
-      await onRequest?.(request)
-
-      const method = request.method as string
-
-      // Resolve chainId + client from the first param object (if present).
-      const params = Array.isArray(request.params) ? request.params : []
-      const firstParam =
-        typeof params[0] === 'object' && params[0]
-          ? (params[0] as Record<string, unknown>)
-          : undefined
-      const chainId = Utils.resolveChainId(firstParam?.chainId) ?? chains[0]!.id
-      const client = getClient(chainId)
-
-      // Proxy non-fill methods directly to the RPC node.
-      if (method !== 'eth_fillTransaction') {
-        const result = await client.request({
-          method: method as never,
-          params: params as never,
-        })
-        return Utils.rpcResult(request, result)
-      }
+  async function handleRequest(request: RpcRequest.RpcRequest<Schema.Ox>) {
+    await onRequest?.(request)
 
-      const [parameters] = Utils.parseParams.parse(request.params) as [Record<string, unknown>]
-      const sender = typeof parameters.from === 'string' ? (parameters.from as Address) : undefined
-
-      // 1. Resolve fee token.
-      const feeToken = await resolveFeeToken(client, {
-        feeToken: parameters.feeToken as Address | undefined,
-        account: sender,
-        tokens: resolveTokens(chainId),
-      })
-
-      // 2. Fill transaction via RPC node (with AMM resolution on InsufficientBalance).
-      const normalized = Utils.normalizeFillTransactionRequest(parameters)
-      const withOverrides = {
-        ...normalized,
-        ...(typeof chainId !== 'undefined' ? { chainId } : {}),
-        ...(feePayerOptions ? { feePayer: true } : {}),
-        ...(feeToken ? { feeToken } : {}),
-      }
-      let filled = await fill(client, { autoSwap, feeToken, transaction: withOverrides })
-
-      // 3. Check if the fee payer approves this transaction.
-      const sponsored =
-        feePayerOptions &&
-        (!feePayerOptions.validate ||
-          // @ts-expect-error - TODO: Convert to `TransactionRequest` properly.
-          (await feePayerOptions.validate({
-            ...filled.transaction,
-            from: sender,
-          } as Transaction.TransactionRequest)))
-
-      // Re-fill without feePayer when sponsorship is rejected so the
-      // gas estimate and nonce are correct for a self-paid transaction.
-      if (feePayerOptions && !sponsored) {
-        const { feePayer: _, ...withoutFeePayer } = withOverrides
-        filled = await fill(client, { autoSwap, feeToken, transaction: withoutFeePayer })
-      }
-
-      const { transaction, swap } = filled
-
-      // 4. Simulate and compute balance diffs + fee.
-      const calls = extractCalls(transaction)
-      const { balanceDiffs, fee } = await simulateAndParseDiffs(client, {
-        account: sender,
-        calls,
-        swap,
-        feeToken: (transaction as { feeToken?: Address | undefined }).feeToken,
-        gas: (transaction as { gas?: bigint | undefined }).gas,
-        maxFeePerGas: (transaction as { maxFeePerGas?: bigint | undefined }).maxFeePerGas,
-      })
-
-      // 5. Sign as fee payer (when approved).
-      const tx = sponsored
-        ? await FeePayer.sign({
-            account: feePayerOptions.account,
-            transaction,
-            sender,
+    // Resolve chainId + client from the first param object (if present).
+    const params = 'params' in request && Array.isArray(request.params) ? request.params : []
+    const first =
+      typeof params[0] === 'object' && params[0]
+        ? (params[0] as Record<string, unknown>)
+        : undefined
+    const chainId = Utils.resolveChainId(first?.chainId) ?? chains[0]!.id
+    const client = getClient(chainId)
+
+    switch (request.method) {
+      case 'eth_fillTransaction': {
+        try {
+          const parameters = request.params[0]
+
+          // 1. Resolve fee token.
+          const feeToken = await resolveFeeToken(client, {
+            account: parameters.from,
+            feeToken: parameters.feeToken,
+            tokens: resolveTokens(chainId),
           })
-        : transaction
 
-      const sponsor = sponsored
-        ? {
-            address: feePayerOptions.account.address,
-            ...(feePayerOptions.name ? { name: feePayerOptions.name } : {}),
-            ...(feePayerOptions.url ? { url: feePayerOptions.url } : {}),
+          // 2. Fill transaction via RPC node (with AMM resolution on InsufficientBalance).
+          const normalized = Utils.normalizeFillTransactionRequest(parameters)
+          const transaction = {
+            ...normalized,
+            ...(typeof chainId !== 'undefined' ? { chainId } : {}),
+            ...(feePayerOptions ? { feePayer: true } : {}),
+            ...(feeToken ? { feeToken } : {}),
           }
-        : undefined
+          let filled = await fill(client, { autoSwap, feeToken, transaction })
+
+          // 3. Check if the fee payer approves this transaction.
+          const sponsored =
+            feePayerOptions &&
+            (!feePayerOptions.validate ||
+              // @ts-expect-error - TODO: Convert to `TransactionRequest` properly.
+              (await feePayerOptions.validate({
+                ...filled.transaction,
+                from: parameters.from,
+              } as Transaction.TransactionRequest)))
+
+          // Re-fill without feePayer when sponsorship is rejected so the
+          // gas estimate and nonce are correct for a self-paid transaction.
+          if (feePayerOptions && !sponsored) {
+            const { feePayer: _, ...tx } = transaction
+            filled = await fill(client, { autoSwap, feeToken, transaction: tx })
+          }
+
+          const { transaction: transaction_filled, swap } = filled
+
+          // 4. Simulate and compute balance diffs + fee.
+          const calls = extractCalls(transaction_filled)
+          const { balanceDiffs, fee } = await simulateAndParseDiffs(client, {
+            account: parameters.from,
+            calls,
+            swap,
+            feeToken: transaction_filled.feeToken,
+            gas: transaction_filled.gas,
+            maxFeePerGas: transaction_filled.maxFeePerGas,
+          })
 
-      // 6. Resolve autoSwap metadata (when AMM path was taken).
-      const autoSwap_ = await (async () => {
-        if (!swap) return undefined
-        const [inMeta, outMeta] = await Promise.all([
-          resolveTokenMetadata(client, swap.tokenIn).catch(() => undefined),
-          resolveTokenMetadata(client, swap.tokenOut).catch(() => undefined),
-        ])
-        if (!inMeta || !outMeta) return undefined
-        return {
-          calls: swap.calls.map((c) => ({ to: c.to, data: c.data })),
-          slippage: autoSwap!.slippage,
-          maxIn: {
-            token: swap.tokenIn,
-            value: Hex.fromNumber(swap.maxAmountIn) as `0x${string}`,
-            formatted: formatUnits(swap.maxAmountIn, inMeta.decimals),
-            decimals: inMeta.decimals,
-            symbol: inMeta.symbol,
-            name: inMeta.name,
-          },
-          minOut: {
-            token: swap.tokenOut,
-            value: Hex.fromNumber(swap.amountOut) as `0x${string}`,
-            formatted: formatUnits(swap.amountOut, outMeta.decimals),
-            decimals: outMeta.decimals,
-            symbol: outMeta.symbol,
-            name: outMeta.name,
-          },
+          // 5. Sign as fee payer (if sponsored).
+          const transaction_final = await (async () => {
+            if (!sponsored) return transaction_filled
+            return await FeePayer.sign({
+              account: feePayerOptions.account,
+              sender: parameters.from,
+              transaction: transaction_filled,
+            })
+          })()
+
+          const sponsor = (() => {
+            if (!sponsored) return undefined
+            return {
+              address: feePayerOptions.account.address,
+              ...(feePayerOptions.name ? { name: feePayerOptions.name } : {}),
+              ...(feePayerOptions.url ? { url: feePayerOptions.url } : {}),
+            }
+          })()
+
+          // 6. Resolve autoSwap metadata (when AMM path was taken).
+          const autoSwap_ = await (async () => {
+            if (!swap) return undefined
+            const [inMeta, outMeta] = await Promise.all([
+              resolveTokenMetadata(client, swap.tokenIn).catch(() => undefined),
+              resolveTokenMetadata(client, swap.tokenOut).catch(() => undefined),
+            ])
+            if (!inMeta || !outMeta) return undefined
+            return {
+              calls: swap.calls.map((c) => ({ to: c.to, data: c.data })),
+              slippage: autoSwap!.slippage,
+              maxIn: {
+                token: swap.tokenIn,
+                value: Hex.fromNumber(swap.maxAmountIn) as `0x${string}`,
+                formatted: formatUnits(swap.maxAmountIn, inMeta.decimals),
+                decimals: inMeta.decimals,
+                symbol: inMeta.symbol,
+                name: inMeta.name,
+              },
+              minOut: {
+                token: swap.tokenOut,
+                value: Hex.fromNumber(swap.amountOut) as `0x${string}`,
+                formatted: formatUnits(swap.amountOut, outMeta.decimals),
+                decimals: outMeta.decimals,
+                symbol: outMeta.symbol,
+                name: outMeta.name,
+              },
+            }
+          })()
+
+          return RpcResponse.from(
+            {
+              result: {
+                tx: core_Transaction.toRpc(transaction_final as core_Transaction.Transaction),
+                capabilities: {
+                  balanceDiffs,
+                  fee,
+                  sponsored: !!sponsor,
+                  ...(sponsor ? { sponsor } : {}),
+                  ...(autoSwap_ ? { autoSwap: autoSwap_ } : {}),
+                },
+              },
+            },
+            { request },
+          )
+        } catch (error) {
+          return Utils.rpcErrorJson(request, error)
         }
-      })()
-
-      return Utils.rpcResult(request, {
-        tx: core_Transaction.toRpc(tx as core_Transaction.Transaction),
-        capabilities: {
-          balanceDiffs,
-          fee,
-          sponsored: !!sponsor,
-          ...(sponsor ? { sponsor } : {}),
-          ...(autoSwap_ ? { autoSwap: autoSwap_ } : {}),
-        },
-      })
-    } catch (error) {
-      return Utils.rpcError(request, error)
+      }
+
+      default: {
+        const result = await client.request(request as never)
+        return RpcResponse.from({ result }, { request })
+      }
     }
-  })
+  }
 
-  return router
-}
+  const router = from(rest)
 
-async function fill(
-  client: Client,
-  options: {
-    autoSwap?: { slippage: number } | undefined
-    feeToken?: Address | undefined
-    transaction: Record<string, unknown>
-  },
-) {
-  const { autoSwap, feeToken, transaction: request } = options
+  router.post(path, async (c) => {
+    const body = await c.req.raw.json()
+    const isBatch = Array.isArray(body)
 
-  // Skip re-formatting if already in RPC format (e.g. from viem's fillTransaction).
-  const format = (value: Record<string, unknown>) =>
-    value.type === '0x76' ? value : Utils.formatFillTransactionRequest(client, value)
+    if (!isBatch) {
+      const request = RpcRequest.from(body) as RpcRequest.RpcRequest<Schema.Ox>
+      return Response.json(await handleRequest(request))
+    }
 
-  try {
-    const result = await client.request({
-      method: 'eth_fillTransaction',
-      params: [format(request) as never],
-    })
-    return { transaction: Utils.normalizeTempoTransaction(result.tx) }
-  } catch (error) {
-    if (!(error instanceof Error)) throw error
-    const parsed = parseInsufficientBalance(error)
-    if (!parsed || !feeToken || !autoSwap) throw error
-    if (parsed.token.toLowerCase() === feeToken.toLowerCase()) throw error
+    const responses = await Promise.all(
+      (body as unknown[]).map((item) =>
+        handleRequest(RpcRequest.from(item as never) as RpcRequest.RpcRequest<Schema.Ox>),
+      ),
+    )
+    return Response.json(responses)
+  })
 
-    const deficit = parsed.required - parsed.available
-    const maxAmountIn = deficit + (deficit * BigInt(Math.round(autoSwap.slippage * 1000))) / 1000n
-    const swapCalls = buildSwapCalls(feeToken, parsed.token, deficit, maxAmountIn)
-    const existingCalls = request.calls as Call[] | undefined
-    // If the request was normalized to top-level to/data/value (single call),
-    // convert back to a calls array so we can prepend swap calls.
-    const originalCalls: Call[] = existingCalls
-      ? [...existingCalls]
-      : request.to
-        ? [
-            {
-              to: request.to as Address,
-              data: request.data as `0x${string}`,
-              value: (request.value as bigint) ?? 0n,
-            },
-          ]
-        : []
-    const { to: _, data: __, value: ___, calls: ____, ...rest } = request
-    const result = await client.request({
-      method: 'eth_fillTransaction',
-      params: [
-        format({
-          ...rest,
-          calls: [...swapCalls, ...originalCalls],
-        }) as never,
-      ],
-    })
-    return {
-      transaction: Utils.normalizeTempoTransaction(result.tx),
-      swap: {
-        calls: swapCalls,
-        tokenIn: feeToken,
-        tokenOut: parsed.token,
-        amountOut: deficit,
-        maxAmountIn,
-      },
-    }
-  }
+  return router
 }
 
 export namespace relay {
@@ -381,6 +335,73 @@ export namespace relay {
   }
 }
 
+// TODO: cleanup
+async function fill(
+  client: Client,
+  options: {
+    autoSwap?: { slippage: number } | undefined
+    feeToken?: Address | undefined
+    transaction: Record<string, unknown>
+  },
+) {
+  const { autoSwap, feeToken, transaction: request } = options
+
+  // Skip re-formatting if already in RPC format (e.g. from viem's fillTransaction).
+  const format = (value: Record<string, unknown>) =>
+    value.type === '0x76' ? value : Utils.formatFillTransactionRequest(client, value)
+
+  try {
+    const result = await client.request({
+      method: 'eth_fillTransaction',
+      params: [format(request) as never],
+    })
+    return { transaction: Utils.normalizeTempoTransaction(result.tx) }
+  } catch (error) {
+    if (!(error instanceof Error)) throw error
+    const parsed = parseInsufficientBalance(error)
+    if (!parsed || !feeToken || !autoSwap) throw error
+    if (parsed.token.toLowerCase() === feeToken.toLowerCase()) throw error
+
+    const deficit = parsed.required - parsed.available
+    const maxAmountIn = deficit + (deficit * BigInt(Math.round(autoSwap.slippage * 1000))) / 1000n
+    const swapCalls = buildSwapCalls(feeToken, parsed.token, deficit, maxAmountIn)
+    const existingCalls = request.calls as Call[] | undefined
+    // If the request was normalized to top-level to/data/value (single call),
+    // convert back to a calls array so we can prepend swap calls.
+    const originalCalls: Call[] = existingCalls
+      ? [...existingCalls]
+      : request.to
+        ? [
+            {
+              to: request.to as Address,
+              data: request.data as `0x${string}`,
+              value: (request.value as bigint) ?? 0n,
+            },
+          ]
+        : []
+    const { to: _, data: __, value: ___, calls: ____, ...rest } = request
+    const result = await client.request({
+      method: 'eth_fillTransaction',
+      params: [
+        format({
+          ...rest,
+          calls: [...swapCalls, ...originalCalls],
+        }) as never,
+      ],
+    })
+    return {
+      transaction: Utils.normalizeTempoTransaction(result.tx),
+      swap: {
+        calls: swapCalls,
+        tokenIn: feeToken,
+        tokenOut: parsed.token,
+        amountOut: deficit,
+        maxAmountIn,
+      },
+    }
+  }
+}
+
 async function resolveFeeToken(
   client: Client,
   options: {
@@ -431,10 +452,9 @@ async function resolveFeeToken(
     if (!best || asset.balance > best.balance) best = asset
   }
   if (best) return best.address
-
-  return Addresses.pathUsd as Address
 }
 
+// TODO: cleanup/remove
 function extractCalls(transaction: Record<string, unknown>): readonly Call[] {
   const calls = transaction.calls as readonly Call[] | undefined
   if (calls && calls.length > 0)
@@ -452,6 +472,7 @@ function extractCalls(transaction: Record<string, unknown>): readonly Call[] {
   ] as readonly Call[]
 }
 
+// TODO: cleanup/remove
 async function simulate(
   client: Client,
   options: {