Skip to content

refactor: explicitly type EIP-712 transactions in signTransaction #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crStiv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: explicitly type EIP-712 transactions in signTransaction #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/agw-client/src/actions/signTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
import AGWAccountAbi from '../abis/AGWAccount.js';
import {
assertEip712Request,
type AssertEip712RequestParameters,
} from '../eip712.js';
import { AccountNotFoundError } from '../errors/account.js';
import { assertSessionKeyPolicies } from '../sessionValidator.js';
Expand Down Expand Up @@ -98,9 +97,10 @@ export async function signEip712TransactionInternal<
chain = client.chain,
...transaction
} = args;
// TODO: open up typing to allow for eip712 transactions
transaction.type = 'eip712' as any;
transformHexValues(transaction, [
// Explicitly type the transaction to allow EIP-712 type assignment
const eip712Transaction = transaction as TransactionRequestEIP712 & { type: 'eip712' };
eip712Transaction.type = 'eip712';
transformHexValues(eip712Transaction, [
'value',
'nonce',
'maxFeePerGas',
Expand All @@ -116,13 +116,13 @@ export async function signEip712TransactionInternal<
});
const smartAccount = parseAccount(account_);
const useSignerAddress =
(transaction as any).from === signerClient.account.address;
eip712Transaction.from === signerClient.account.address;
const fromAccount = useSignerAddress ? signerClient.account : smartAccount;

assertEip712Request({
account: fromAccount,
chain,
...(transaction as AssertEip712RequestParameters),
...eip712Transaction,
});

if (!chain || VALID_CHAINS[chain.id] === undefined) {
Expand All @@ -143,13 +143,13 @@ export async function signEip712TransactionInternal<
publicClient,
chainId,
fromAccount,
transaction,
eip712Transaction,
);

const transactionWithPaymaster = await getTransactionWithPaymasterData(
chainId,
fromAccount,
transaction,
eip712Transaction,
customPaymasterHandler,
);

Expand Down