fix(zksync): fix account hoisting for signEip712Transaction and `se…

…ndEip712Transaction`

.changeset/tall-pets-impress.md

@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Fixed account hoisting for `signEip712Transaction` and `sendEip712Transaction` in ZKsync extension.

src/zksync/actions/sendEip712Transaction.ts

@@ -92,13 +92,15 @@ export async function sendEip712Transaction<
     request
   >,
 ): Promise<SendEip712TransactionReturnType> {
-  const { chain = client.chain } = parameters
+  const { account: account_ = client.account, chain = client.chain } =
+    parameters
 
-  if (!parameters.account)
+  const account = account_ ? parseAccount(account_) : client.account
+
+  if (!account)
     throw new AccountNotFoundError({
       docsPath: '/docs/actions/wallet/sendTransaction',
     })
-  const account = parseAccount(parameters.account)
 
   try {
     assertEip712Request(parameters)

src/zksync/actions/signEip712Transaction.test.ts

@@ -2,7 +2,7 @@ import { expect, test } from 'vitest'
 
 import { accounts } from '~test/src/constants.js'
 
-import { anvilZksync } from '../../../test/src/anvil.js'
+import { anvilZksync } from '~test/src/anvil.js'
 import { privateKeyToAccount } from '../../accounts/privateKeyToAccount.js'
 import type { ZksyncTransactionRequestEIP712 } from '../../zksync/index.js'
 import { signTransaction } from './signTransaction.js'

src/zksync/actions/signEip712Transaction.ts

@@ -53,6 +53,8 @@ export type SignEip712TransactionErrorType = SignTransactionErrorType
 /**
  * Signs an EIP712 transaction.
  *
+ *
+ * @param client - Client to use
  * @param args - {@link SignTransactionParameters}
  * @returns The signed serialized transaction. {@link SignTransactionReturnType}
  *
@@ -102,11 +104,12 @@ export async function signEip712Transaction<
     ...transaction
   } = args
 
-  if (!account_)
+  const account = account_ ? parseAccount(account_) : client.account
+
+  if (!account)
     throw new AccountNotFoundError({
       docsPath: '/docs/actions/wallet/signTransaction',
     })
-  const account = parseAccount(account_)
 
   assertEip712Request({
     account,

src/zksync/decorators/eip712.test.ts

@@ -1,10 +1,14 @@
 import { expect, test } from 'vitest'
 
 import { greeterContract } from '~test/src/abis.js'
+import { anvilZksync } from '~test/src/anvil.js'
 import { accounts } from '~test/src/constants.js'
-import { anvilZksync } from '../../../test/src/anvil.js'
+import { accounts as acc } from '~test/src/zksync.js'
 import { privateKeyToAccount } from '../../accounts/privateKeyToAccount.js'
 import { simulateContract } from '../../actions/index.js'
+import { zksyncLocalHyperchain } from '../../chains/definitions/zksyncLocalHyperchain.js'
+import { createWalletClient } from '../../clients/createWalletClient.js'
+import { http } from '../../clients/transports/http.js'
 import type { EIP1193RequestFn } from '../../types/eip1193.js'
 import { eip712WalletActions } from './eip712.js'
 
@@ -47,6 +51,25 @@ test('sendTransaction', async () => {
   expect(result).toBeDefined()
 })
 
+test('sendTransaction with account hoisting', async () => {
+  const zksyncWallet = createWalletClient({
+    account: privateKeyToAccount(acc[0].privateKey),
+    chain: zksyncLocalHyperchain,
+    transport: http(),
+  }).extend(eip712WalletActions())
+
+  const result = await zksyncWallet.sendTransaction({
+    to: acc[1].address,
+    data: '0x0',
+    value: 7_000_000_000n,
+    maxFeePerGas: 10000000000n,
+    maxPriorityFeePerGas: 10000000000n,
+    gas: 158774n,
+    gasPerPubdata: 50_000n,
+  })
+  expect(result).toBeDefined()
+})
+
 test('signTransaction', async () => {
   const signature = await zksyncClient.signTransaction({
     account: privateKeyToAccount(accounts[0].privateKey),
@@ -65,6 +88,29 @@ test('signTransaction', async () => {
   expect(signature).toBeDefined()
 })
 
+test('signTransaction with account hoisting', async () => {
+  const zksyncWallet = createWalletClient({
+    account: privateKeyToAccount(acc[0].privateKey),
+    chain: zksyncLocalHyperchain,
+    transport: http(),
+  }).extend(eip712WalletActions())
+
+  const signature = await zksyncWallet.signTransaction({
+    to: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8',
+    maxFeePerGas: 10000000000n,
+    maxPriorityFeePerGas: 10000000000n,
+    gas: 158774n,
+    value: 10000000000n,
+    data: '0x0',
+    paymaster: '0xFD9aE5ebB0F6656f4b77a0E99dCbc5138d54b0BA',
+    paymasterInput:
+      '0x8c5a344500000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000',
+    type: 'eip712',
+    gasPerPubdata: 50000n,
+  })
+  expect(signature).toBeDefined()
+})
+
 test('writeContract', async () => {
   zksyncClient.request = (async ({ method, params }) => {
     if (method === 'eth_sendRawTransaction')

test/src/zksync.ts

@@ -1,15 +1,15 @@
 import { zksyncLocalNode } from '~viem/chains/index.js'
 import { createClient } from '~viem/clients/createClient.js'
 import { http } from '~viem/index.js'
-import { accounts } from './constants.js'
+import { accounts as acc } from './constants.js'
 
 export const zksyncClientLocalNode = createClient({
   chain: zksyncLocalNode,
   transport: http(),
 })
 
 export const zksyncClientLocalNodeWithAccount = createClient({
-  account: accounts[0].address,
+  account: acc[0].address,
   chain: zksyncLocalNode,
   transport: http(),
 })
@@ -209,3 +209,16 @@ export function mockClientPublicActionsL2(client: any) {
     return mockRequestReturnData(method)
   }
 }
+
+export const accounts = [
+  {
+    address: '0x36615Cf349d7F6344891B1e7CA7C72883F5dc049',
+    privateKey:
+      '0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110',
+  },
+  {
+    address: '0xa61464658AfeAf65CccaaFD3a512b69A83B77618',
+    privateKey:
+      '0xac1e735be8536c6534bb4f17f06f6afc73b2b5ba84ac2cfb12f7461b20c0bbe3',
+  },
+] as const