diff --git a/src/helpers/formatTxMessageResponse.ts b/src/helpers/formatTxMessageResponse.ts index bdd6136..b25ee3a 100644 --- a/src/helpers/formatTxMessageResponse.ts +++ b/src/helpers/formatTxMessageResponse.ts @@ -11,10 +11,10 @@ export function formatTxMessageResponse({ txMessage, senderAddress }: Props) { ...txMessage, rpcProxySubmissionParams: { ...txMessage.rpcProxySubmissionParams, - message: { - ...txMessage.rpcProxySubmissionParams.message, + typedData: { + ...txMessage.rpcProxySubmissionParams.typedData, message: { - ...txMessage.rpcProxySubmissionParams.message.message, + ...txMessage.rpcProxySubmissionParams.typedData.message, from: senderAddress, } }, diff --git a/src/pages/api/submitPaymentTx/index.ts b/src/pages/api/submitPaymentTx/index.ts index 3b9d355..b49089e 100644 --- a/src/pages/api/submitPaymentTx/index.ts +++ b/src/pages/api/submitPaymentTx/index.ts @@ -32,9 +32,9 @@ export default async function handler( return res.status(200).json({ data: { txHash } as TxHashReceivedResponse }); } - const { message, signature } = req.body; - const { from, to, value, nonce, validAfter, validBefore } = message.message; - const { chainId } = message.domain; + const { typedData, signature } = req.body; + const { from, to, value, nonce, validAfter, validBefore } = typedData.message; + const { chainId } = typedData.domain; const sponsoredInfo = sponsoredUsdcMapping.find((s) => s.chainId === Number(chainId)); if (!sponsoredInfo) { diff --git a/src/types/paymentTx.ts b/src/types/paymentTx.ts index e0120c7..8745ed5 100644 --- a/src/types/paymentTx.ts +++ b/src/types/paymentTx.ts @@ -49,5 +49,5 @@ export function isContractCallPayload(payload: Payload): payload is ContractCall } export function isEip712Payload(payload: Payload): payload is Eip712Payload { - return payload.payloadType === 'eip712' && 'rpcProxySubmissionParams' in payload && 'message' in payload.rpcProxySubmissionParams; + return payload.payloadType === 'eip712' && 'rpcProxySubmissionParams' in payload && 'typedData' in payload.rpcProxySubmissionParams; }