Skip to content

Commit

Permalink
Merge pull request #11 from amhedcb/justinlee/rename-to-typed-data
Browse files Browse the repository at this point in the history
[TRIVIAL] Rename message field to typedData
  • Loading branch information
justin-lee-cb authored Oct 3, 2024
2 parents 9afc465 + 78700df commit f775dfc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/helpers/formatTxMessageResponse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
},
Expand Down
6 changes: 3 additions & 3 deletions src/pages/api/submitPaymentTx/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/types/paymentTx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit f775dfc

Please sign in to comment.