tapimo 0.14.0 → 0.15.0

package/dist/handlers/internal/sponsorship.js

@@ -71,7 +71,7 @@ export async function sign(options) {
     // broadcast anywhere (even directly to a node), so the commitment records as
     // an intent — no transaction hash until the sender signs.
     const feeToken = transaction['feeToken'];
-    await options.onSponsored?.({
+    const sponsorshipDetails = await options.onSponsored?.({
         chainId,
         ...(feeToken ? { feeToken } : {}),
         method: 'eth_fillTransaction',
@@ -79,7 +79,10 @@ export async function sign(options) {
         signPayload,
         transaction: TxEnvelopeTempo.serialize(envelope, { feePayerSignature }),
     });
-    return { ...prepared, feePayerSignature };
+    return {
+        ...(sponsorshipDetails ? { sponsorshipDetails } : {}),
+        transaction: { ...prepared, feePayerSignature },
+    };
 }
 /** Handles `eth_signRawTransaction` and broadcast methods for sponsored Tempo transactions. */
 export async function handleRawTransaction(options) {
@@ -122,7 +125,7 @@ export async function handleRawTransaction(options) {
     });
     // Awaited before any broadcast so a recording failure refuses sponsorship —
     // no sponsored transaction ever reaches the chain unrecorded.
-    await options.onSponsored?.({
+    const sponsorshipDetails = await options.onSponsored?.({
         chainId: transaction.chainId,
         ...(feeToken ? { feeToken } : {}),
         method,
@@ -132,11 +135,12 @@ export async function handleRawTransaction(options) {
         transactionHash: Hash.keccak256(serializedTransaction),
     });
     // Raw-sign requests stop after fee-payer signature is added; send methods broadcast it.
-    if (method === 'eth_signRawTransaction')
-        return serializedTransaction;
-    return await client.request({
-        method: method,
-        params: [serializedTransaction],
-    });
+    const result = method === 'eth_signRawTransaction'
+        ? serializedTransaction
+        : await client.request({
+            method: method,
+            params: [serializedTransaction],
+        });
+    return { result, ...(sponsorshipDetails ? { sponsorshipDetails } : {}) };
 }
 //# sourceMappingURL=sponsorship.js.map

package/dist/handlers/internal/sponsorship.js.map

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

package/dist/handlers/relay.d.ts

@@ -3,7 +3,6 @@ import { type Address, type Client } from 'viem';
 import type { LocalAccount } from 'viem/accounts';
 import { type Handler, from } from '../Handler.js';
 import * as Store from '../internal/Store.js';
-import * as Multisig from './internal/multisig.js';
 import * as Sponsorship from './internal/sponsorship.js';
 /**
  * Instantiates a relay handler that proxies `eth_fillTransaction`
@@ -12,7 +11,7 @@ import * as Sponsorship from './internal/sponsorship.js';
  *
  * @example
  * ```ts
- * import { Handler } from 'tapimo'
+ * import { Handler } from 'tapimo/server'
  *
  * const handler = Handler.relay({ apiKey: process.env.TEMPO_API_KEY })
  *
@@ -31,7 +30,7 @@ import * as Sponsorship from './internal/sponsorship.js';
  *
  * ```ts
  * import { privateKeyToAccount } from 'viem/accounts'
- * import { Handler } from 'tapimo'
+ * import { Handler } from 'tapimo/server'
  *
  * const handler = Handler.relay({
  *   feePayer: {
@@ -59,9 +58,8 @@ export declare namespace relay {
             slippage?: number | undefined;
         } | undefined;
         /**
-         * Resolves a viem client for a chain id. The handler resolves the client
-         * from the `chainId` in the incoming transaction (falling back to the
-         * client's default chain). Defaults to Tempo mainnet and testnet clients.
+         * Resolves a viem client from the request or stored multisig operation,
+         * falling back to the default chain. Defaults to Tempo mainnet and testnet clients.
          */
         getClient?: ((chainId?: number) => Client) | undefined;
         /**
@@ -87,12 +85,11 @@ export declare namespace relay {
             /** Sponsor URL returned from `eth_fillTransaction`. */
             url?: string | undefined;
         } | undefined;
-        /**
-         * Native multisig configuration. When provided, the relay collects owner
-         * approvals from multisig raw transaction submissions and broadcasts once
-         * collected owner weight meets the configured threshold.
-         */
-        multisig?: Multisig.Options | undefined;
+        /** Native multisig coordination. */
+        multisig?: {
+            /** Authoritative state shared by every relay instance. */
+            store: Store.State;
+        } | undefined;
         /**
          * Relay features.
          *

package/dist/handlers/relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relay.d.ts","sourceRoot":"","sources":["../../src/handlers/relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAe,MAAM,IAAI,CAAA;AAE3D,OAAO,EACL,KAAK,OAAO,EAEZ,KAAK,MAAM,EASZ,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAQjD,OAAO,EAAE,KAAK,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAA;AAKxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,KAAK,CAAC,OAAO,GAAE,KAAK,CAAC,OAAY,GAAG,OAAO,CA4lB1D;AA4DD,yBAAiB,KAAK,CAAC;IACrB,KAAY,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG;QACnC;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC3B;;WAEG;QACH,QAAQ,CAAC,EACL,KAAK,GACL;YACE,yDAAyD;YACzD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;SAC9B,GACD,SAAS,CAAA;QACb;;;;WAIG;QACH,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;QACtD;;;WAGG;QACH,QAAQ,CAAC,EACL;YACE,uCAAuC;YACvC,OAAO,EAAE,YAAY,CAAA;YACrB,4DAA4D;YAC5D,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;YAC9B;;eAEG;YACH,WAAW,CAAC,EAAE,WAAW,CAAC,oBAAoB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;YACrE;;;eAGG;YACH,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,GAAG,SAAS,CAAA;YAC3C,gEAAgE;YAChE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YACzB,uDAAuD;YACvD,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;SACzB,GACD,SAAS,CAAA;QACb;;;;WAIG;QACH,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,GAAG,SAAS,CAAA;QACvC;;;;;;WAMG;QACH,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;QAC5B;;;;WAIG;QACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;QAC9C;;;WAGG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,SAAS,CAAA;QAC/B,oDAAoD;QACpD,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAA;QAC3E,gDAAgD;QAChD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACzB;;;WAGG;QACH,aAAa,CAAC,EACV,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC,GACvE,SAAS,CAAA;KACd,CAAA;CACF"}
+{"version":3,"file":"relay.d.ts","sourceRoot":"","sources":["../../src/handlers/relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAe,MAAM,IAAI,CAAA;AAE3D,OAAO,EACL,KAAK,OAAO,EAEZ,KAAK,MAAM,EASZ,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAejD,OAAO,EAAE,KAAK,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAE7C,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAA;AAgBxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,KAAK,CAAC,OAAO,GAAE,KAAK,CAAC,OAAY,GAAG,OAAO,CA8lB1D;AA4DD,yBAAiB,KAAK,CAAC;IACrB,KAAY,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG;QACnC;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC3B;;WAEG;QACH,QAAQ,CAAC,EACL,KAAK,GACL;YACE,yDAAyD;YACzD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;SAC9B,GACD,SAAS,CAAA;QACb;;;WAGG;QACH,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;QACtD;;;WAGG;QACH,QAAQ,CAAC,EACL;YACE,uCAAuC;YACvC,OAAO,EAAE,YAAY,CAAA;YACrB,4DAA4D;YAC5D,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;YAC9B;;eAEG;YACH,WAAW,CAAC,EAAE,WAAW,CAAC,oBAAoB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;YACrE;;;eAGG;YACH,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,GAAG,SAAS,CAAA;YAC3C,gEAAgE;YAChE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YACzB,uDAAuD;YACvD,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;SACzB,GACD,SAAS,CAAA;QACb,oCAAoC;QACpC,QAAQ,CAAC,EACL;YACE,0DAA0D;YAC1D,KAAK,EAAE,KAAK,CAAC,KAAK,CAAA;SACnB,GACD,SAAS,CAAA;QACb;;;;;;WAMG;QACH,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,CAAA;QAC5B;;;;WAIG;QACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;QAC9C;;;WAGG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,SAAS,CAAA;QAC/B,oDAAoD;QACpD,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAA;QAC3E,gDAAgD;QAChD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACzB;;;WAGG;QACH,aAAa,CAAC,EACV,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC,GACvE,SAAS,CAAA;KACd,CAAA;CACF"}

package/dist/handlers/relay.js

@@ -2,7 +2,7 @@ import { AbiEvent, Hex, RpcRequest, RpcResponse } from 'ox';
 import { Transaction as core_Transaction } from 'ox/tempo';
 import { createClient, decodeFunctionData, formatUnits, http, isAddress, parseEventLogs, zeroAddress, } from 'viem';
 import { simulateCalls } from 'viem/actions';
-import { Abis, Actions, Addresses, Capabilities, VirtualAddress } from 'viem/tempo';
+import { Abis, Actions, Addresses, Capabilities, Multisig as ViemMultisig, VirtualAddress, } from 'viem/tempo';
 import { tempoMainnet, tempoTestnet } from 'viem/tempo/chains';
 import * as ExecutionError from './internal/executionError.js';
 import * as TempoApi from '../Client.js';
@@ -12,6 +12,17 @@ import * as Multisig from './internal/multisig.js';
 import * as Sponsorship from './internal/sponsorship.js';
 import * as Utils from './internal/utils.js';
 const defaultChains = [tempoMainnet, tempoTestnet];
+const multisigMethods = new Set([
+    'eth_getTransactionByHash',
+    'eth_getTransactionReceipt',
+    'eth_sendRawTransaction',
+    'eth_sendRawTransactionSync',
+    'multisig_approveKeyAuthorization',
+    'multisig_approveRawTransaction',
+    'multisig_approveRawTransactionSync',
+    'multisig_getConfig',
+    'multisig_getOperation',
+]);
 /**
  * Instantiates a relay handler that proxies `eth_fillTransaction`
  * with wallet-aware enrichment (fee token resolution, simulation,
@@ -19,7 +30,7 @@ const defaultChains = [tempoMainnet, tempoTestnet];
  *
  * @example
  * ```ts
- * import { Handler } from 'tapimo'
+ * import { Handler } from 'tapimo/server'
  *
  * const handler = Handler.relay({ apiKey: process.env.TEMPO_API_KEY })
  *
@@ -38,7 +49,7 @@ const defaultChains = [tempoMainnet, tempoTestnet];
  *
  * ```ts
  * import { privateKeyToAccount } from 'viem/accounts'
- * import { Handler } from 'tapimo'
+ * import { Handler } from 'tapimo/server'
  *
  * const handler = Handler.relay({
  *   feePayer: {
@@ -55,15 +66,36 @@ export function relay(options = {}) {
     const getClient = getClient_ ?? defaultGetClient({ apiKey });
     const resolveTokens = resolveTokens_ ?? defaultResolveTokens({ apiKey });
     const feePayerOptions = options.feePayer;
-    // Adapt the state store into the multisig operation store once, up front.
-    const multisigOptions = options.multisig
-        ? { ...options.multisig, store: Multisig.fromStore(options.multisig.store) }
-        : undefined;
+    const multisigStore = options.multisig ? Multisig.fromStore(options.multisig.store) : undefined;
     const getTokens = async (chainId) => {
         if (chainId === undefined)
             return [];
         return await resolveTokens(chainId);
     };
+    async function handleRawTransaction(method, params, client) {
+        const serialized = params?.[0];
+        if (!feePayerOptions) {
+            if (method === 'eth_signRawTransaction')
+                throw new RpcResponse.MethodNotFoundError({
+                    message: 'eth_signRawTransaction requires a fee payer to be configured on the relay. ' +
+                        'Set the `feePayer` option in `Handler.relay()` to enable transaction sponsorship.',
+                });
+            return { result: await client.request({ method, params }) };
+        }
+        if (typeof serialized !== 'string' ||
+            !Sponsorship.requestsRawSponsorship(serialized))
+            return { result: await client.request({ method, params }) };
+        return await Sponsorship.handleRawTransaction({
+            account: feePayerOptions.account,
+            feeToken: feePayerOptions.feeToken,
+            getFeeToken: async (chainId) => (await getTokens(chainId))[0],
+            getClient,
+            method,
+            onSponsored: feePayerOptions.onSponsored,
+            request: { params },
+            validate: feePayerOptions.validate,
+        });
+    }
     // Memoize cache for TIP-20 metadata and user fee-token preferences. Kept
     // opt-in: an always-on cache would pin a raced null preference (set, then
     // fill before the set mines) for the whole TTL.
@@ -92,10 +124,37 @@ export function relay(options = {}) {
         const chainId_path = options?.chainId;
         if (chainId_body !== undefined && chainId_path !== undefined && chainId_body !== chainId_path)
             return Utils.rpcErrorJson(request, new RpcResponse.InvalidParamsError({ message: 'Conflicting chain ids.' }));
+        const chainId_request = chainId_path ?? chainId_body;
+        if (multisigStore && multisigMethods.has(request.method)) {
+            let sponsorshipDetails;
+            const handleMultisigRequest = ViemMultisig.handleRequest(async (request, requestOptions) => {
+                const client = getClient(requestOptions?.chainId);
+                if (request.method === 'eth_sendRawTransaction' ||
+                    request.method === 'eth_sendRawTransactionSync') {
+                    const response = await handleRawTransaction(request.method, request.params, client);
+                    sponsorshipDetails = response.sponsorshipDetails;
+                    return response.result;
+                }
+                return await client.request(request, requestOptions);
+            }, { store: multisigStore });
+            try {
+                const result = await handleMultisigRequest({
+                    method: request.method,
+                    params,
+                }, chainId_request === undefined ? undefined : { chainId: chainId_request });
+                return RpcResponse.from({
+                    result,
+                    ...(sponsorshipDetails ? { sponsorship_details: sponsorshipDetails } : {}),
+                }, { request });
+            }
+            catch (error) {
+                return Utils.rpcErrorJson(request, error);
+            }
+        }
         let chainId;
         let client;
         try {
-            chainId = chainId_path ?? chainId_body ?? getClient().chain?.id;
+            chainId = chainId_request ?? getClient().chain?.id;
             client = getClient(chainId);
         }
         catch (error) {
@@ -121,11 +180,9 @@ export function relay(options = {}) {
                     // `tempo_simulateV1` round trip (~250-400ms).
                     const requireBalanceDiffs = capabilities['balanceDiffs'] !== false;
                     const { feePayer: _feePayer, ...normalized } = Utils.normalizeFillTransactionRequest(parameters);
-                    const hasMultisigHints = (typeof normalized['multisig'] === 'object' && normalized['multisig'] !== null) ||
-                        (typeof normalized['multisigInit'] === 'object' &&
-                            normalized['multisigInit'] !== null) ||
-                        typeof normalized['multisigSignatureCount'] !== 'undefined';
-                    const shouldDeferFeePayerSignature = feePayerOptions && multisigOptions && hasMultisigHints;
+                    const hasMultisigSimulation = typeof normalized['multisigSimulation'] === 'object' &&
+                        normalized['multisigSimulation'] !== null;
+                    const shouldDeferFeePayerSignature = feePayerOptions && multisigStore && hasMultisigSimulation;
                     // When sponsoring, the sponsor's preferred fee token (if set)
                     // overrides whatever the consumer asked for — the sponsor is
                     // paying, so the sponsor picks. Falls back to the request's
@@ -167,7 +224,7 @@ export function relay(options = {}) {
                         ? createClient({
                             chain: client.chain,
                             batch: { multicall: { deployless: true } },
-                            transport: http(externalFeePayerUrl),
+                            transport: http(externalFeePayerUrl, { fetchOptions: { redirect: 'error' } }),
                         })
                         : client;
                     if (requestsSponsorship && (externalFeePayerUrl || !feePayerOptions?.validate)) {
@@ -299,7 +356,7 @@ export function relay(options = {}) {
                     const alreadySigned = 'feePayerSignature' in transaction_filled &&
                         transaction_filled.feePayerSignature != null;
                     const calls = extractCalls(transaction_filled);
-                    const [simulation, transaction_final, autoSwap_, virtualAddresses] = await Promise.all([
+                    const [simulation, signed, autoSwap_, virtualAddresses] = await Promise.all([
                         // Simulate and compute balance diffs + fee.
                         // When `capabilities.balanceDiffs` is `false`, skip simulate
                         // and compute fee directly from cached metadata.
@@ -328,12 +385,12 @@ export function relay(options = {}) {
                         (async () => {
                             // Multisig finalization changes the sender signature. Sign after quorum.
                             if (shouldDeferFeePayerSignature)
-                                return transaction_filled;
+                                return { sponsorshipDetails: undefined, transaction: transaction_filled };
                             // Never sign with the managed fee payer for an app-provided
                             // external fee payer URL: that relay is the sponsorship authority,
                             // and signing here would bypass this fee payer's `validate` gate.
                             if (!(sponsored && feePayerOptions && !externalFeePayerUrl && !alreadySigned))
-                                return transaction_filled;
+                                return { sponsorshipDetails: undefined, transaction: transaction_filled };
                             return Sponsorship.sign({
                                 account: feePayerOptions.account,
                                 onSponsored: feePayerOptions.onSponsored,
@@ -348,6 +405,7 @@ export function relay(options = {}) {
                         resolveVirtualAddresses(client, { calls }),
                     ]);
                     const { balanceDiffs, fee } = simulation;
+                    const { sponsorshipDetails, transaction: transaction_final } = signed;
                     const sponsor = (() => {
                         if (!sponsored)
                             return undefined;
@@ -371,6 +429,7 @@ export function relay(options = {}) {
                                 ...(virtualAddresses ? { virtualAddresses } : {}),
                             },
                         },
+                        ...(sponsorshipDetails ? { sponsorship_details: sponsorshipDetails } : {}),
                     }, { request });
                 }
                 catch (error) {
@@ -452,64 +511,11 @@ export function relay(options = {}) {
             case 'eth_sendRawTransaction':
             case 'eth_sendRawTransactionSync': {
                 try {
-                    const serialized = params[0];
-                    if (multisigOptions &&
-                        (request.method === 'eth_sendRawTransaction' ||
-                            request.method === 'eth_sendRawTransactionSync') &&
-                        typeof serialized === 'string' &&
-                        Multisig.isMultisigTransaction(serialized)) {
-                        const result = await Multisig.handleRawTransaction({
-                            claimTtl: multisigOptions.claimTtl,
-                            finalize: multisigOptions.finalize,
-                            getClient,
-                            method: request.method,
-                            request: { params: 'params' in request ? request.params : undefined },
-                            resolveConfig: multisigOptions.resolveConfig,
-                            sponsor: feePayerOptions
-                                ? {
-                                    account: feePayerOptions.account,
-                                    feeToken: feePayerOptions.feeToken,
-                                    onSponsored: feePayerOptions.onSponsored,
-                                    resolveFeeToken: async (chainId) => (await getTokens(chainId))[0],
-                                    validate: feePayerOptions.validate,
-                                }
-                                : undefined,
-                            store: multisigOptions.store,
-                        });
-                        return RpcResponse.from({ result }, { request });
-                    }
-                    if (!feePayerOptions) {
-                        // eth_signRawTransaction is a signing method that only the
-                        // relay can fulfill — forwarding it to the RPC node returns
-                        // an opaque "Method not found". Return an actionable error.
-                        if (request.method === 'eth_signRawTransaction') {
-                            return RpcResponse.from({
-                                error: {
-                                    code: -32601,
-                                    message: 'eth_signRawTransaction requires a fee payer to be configured on the relay. ' +
-                                        'Set the `feePayer` option in `Handler.relay()` to enable transaction sponsorship.',
-                                },
-                            }, { request });
-                        }
-                        const result = await client.request(request);
-                        return RpcResponse.from({ result }, { request });
-                    }
-                    if (typeof serialized !== 'string' ||
-                        !Sponsorship.requestsRawSponsorship(serialized)) {
-                        const result = await client.request(request);
-                        return RpcResponse.from({ result }, { request });
-                    }
-                    const result = await Sponsorship.handleRawTransaction({
-                        account: feePayerOptions.account,
-                        feeToken: feePayerOptions.feeToken,
-                        getFeeToken: async (chainId) => (await getTokens(chainId))[0],
-                        getClient,
-                        method: request.method,
-                        onSponsored: feePayerOptions.onSponsored,
-                        request: { params: 'params' in request ? request.params : undefined },
-                        validate: feePayerOptions.validate,
-                    });
-                    return RpcResponse.from({ result }, { request });
+                    const { result, sponsorshipDetails } = await handleRawTransaction(request.method, params, client);
+                    return RpcResponse.from({
+                        result,
+                        ...(sponsorshipDetails ? { sponsorship_details: sponsorshipDetails } : {}),
+                    }, { request });
                 }
                 catch (error) {
                     return Utils.rpcErrorJson(request, error);
@@ -518,16 +524,6 @@ export function relay(options = {}) {
             case 'eth_getTransactionByHash':
             case 'eth_getTransactionReceipt': {
                 try {
-                    if (multisigOptions) {
-                        const aliased = await Multisig.handleGetTransaction({
-                            getClient,
-                            method: request.method,
-                            request: { params: 'params' in request ? request.params : undefined },
-                            store: multisigOptions.store,
-                        });
-                        if (aliased)
-                            return RpcResponse.from({ result: aliased.result }, { request });
-                    }
                     const result = await client.request(request);
                     return RpcResponse.from({ result }, { request });
                 }