viem 2.13.8 → 2.13.9

package/zksync/actions/sendEip712Transaction.ts

@@ -5,7 +5,8 @@ import { prepareTransactionRequest } from '../../actions/wallet/prepareTransacti
 import { sendRawTransaction } from '../../actions/wallet/sendRawTransaction.js'
 import type {
   SendTransactionErrorType,
-  SendTransactionParameters as SendTransactionParameters_,
+  SendTransactionParameters,
+  SendTransactionRequest,
   SendTransactionReturnType,
 } from '../../actions/wallet/sendTransaction.js'
 import type { Client } from '../../clients/createClient.js'
@@ -24,10 +25,14 @@ import { assertEip712Request } from '../utils/assertEip712Request.js'
 import { signTransaction } from './signTransaction.js'
 
 export type SendEip712TransactionParameters<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-> = SendTransactionParameters_<TChain, TAccount, TChainOverride>
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  request extends SendTransactionRequest<
+    chain,
+    chainOverride
+  > = SendTransactionRequest<chain, chainOverride>,
+> = SendTransactionParameters<chain, account, chainOverride, request>
 
 export type SendEip712TransactionReturnType = SendTransactionReturnType
 
@@ -74,27 +79,33 @@ export type SendEip712TransactionErrorType = SendTransactionErrorType
  * })
  */
 export async function sendEip712Transaction<
-  TChain extends ChainEIP712 | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined = undefined,
+  chain extends ChainEIP712 | undefined,
+  account extends Account | undefined,
+  const request extends SendTransactionRequest<chain, chainOverride>,
+  chainOverride extends ChainEIP712 | undefined = undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: SendEip712TransactionParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  parameters: SendEip712TransactionParameters<
+    chain,
+    account,
+    chainOverride,
+    request
+  >,
 ): Promise<SendEip712TransactionReturnType> {
-  const { chain = client.chain } = args
+  const { chain = client.chain } = parameters
 
-  if (!args.account)
+  if (!parameters.account)
     throw new AccountNotFoundError({
       docsPath: '/docs/actions/wallet/sendTransaction',
     })
-  const account = parseAccount(args.account)
+  const account = parseAccount(parameters.account)
 
   try {
-    assertEip712Request(args)
+    assertEip712Request(parameters)
 
     // Prepare the request for signing (assign appropriate fees, etc.)
     const request = await prepareTransactionRequest(client, {
-      ...args,
+      ...parameters,
       parameters: ['gas', 'nonce', 'fees'],
     } as any)
 
@@ -121,7 +132,7 @@ export async function sendEip712Transaction<
     })
   } catch (err) {
     throw getTransactionError(err as BaseError, {
-      ...(args as GetTransactionErrorParameters),
+      ...(parameters as GetTransactionErrorParameters),
       account,
       chain: chain as Chain,
     })

package/zksync/actions/sendTransaction.ts

@@ -1,25 +1,33 @@
 import type { Account } from '../../accounts/types.js'
-import { sendTransaction as sendTransaction_ } from '../../actions/wallet/sendTransaction.js'
+import { sendTransaction as core_sendTransaction } from '../../actions/wallet/sendTransaction.js'
 import type {
-  SendTransactionErrorType as SendTransactionErrorType_,
-  SendTransactionParameters as SendTransactionParameters_,
-  SendTransactionReturnType as SendTransactionReturnType_,
+  SendTransactionRequest,
+  SendTransactionErrorType as core_SendTransactionErrorType,
+  SendTransactionParameters as core_SendTransactionParameters,
+  SendTransactionReturnType as core_SendTransactionReturnType,
 } from '../../actions/wallet/sendTransaction.js'
 import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { ChainEIP712 } from '../types/chain.js'
 import { isEIP712Transaction } from '../utils/isEip712Transaction.js'
-import { sendEip712Transaction } from './sendEip712Transaction.js'
+import {
+  type SendEip712TransactionParameters,
+  sendEip712Transaction,
+} from './sendEip712Transaction.js'
 
 export type SendTransactionParameters<
-  TChain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-  TAccount extends Account | undefined = Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
-> = SendTransactionParameters_<TChain, TAccount, TChainOverride>
+  chain extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  account extends Account | undefined = Account | undefined,
+  chainOverride extends ChainEIP712 | undefined = ChainEIP712 | undefined,
+  request extends SendTransactionRequest<
+    chain,
+    chainOverride
+  > = SendTransactionRequest<chain, chainOverride>,
+> = core_SendTransactionParameters<chain, account, chainOverride, request>
 
-export type SendTransactionReturnType = SendTransactionReturnType_
+export type SendTransactionReturnType = core_SendTransactionReturnType
 
-export type SendTransactionErrorType = SendTransactionErrorType_
+export type SendTransactionErrorType = core_SendTransactionErrorType
 
 /**
  * Creates, signs, and sends a new transaction to the network.
@@ -66,13 +74,21 @@ export type SendTransactionErrorType = SendTransactionErrorType_
  * })
  */
 export async function sendTransaction<
-  TChain extends ChainEIP712 | undefined,
-  TAccount extends Account | undefined,
-  TChainOverride extends ChainEIP712 | undefined = undefined,
+  chain extends ChainEIP712 | undefined,
+  account extends Account | undefined,
+  const request extends SendTransactionRequest<chain, chainOverride>,
+  chainOverride extends ChainEIP712 | undefined = undefined,
 >(
-  client: Client<Transport, TChain, TAccount>,
-  args: SendTransactionParameters<TChain, TAccount, TChainOverride>,
+  client: Client<Transport, chain, account>,
+  parameters: SendTransactionParameters<chain, account, chainOverride, request>,
 ): Promise<SendTransactionReturnType> {
-  if (isEIP712Transaction(args)) return sendEip712Transaction(client, args)
-  return sendTransaction_(client, args)
+  if (isEIP712Transaction(parameters))
+    return sendEip712Transaction(
+      client,
+      parameters as SendEip712TransactionParameters,
+    )
+  return core_sendTransaction(
+    client,
+    parameters as core_SendTransactionParameters,
+  )
 }

package/zksync/decorators/eip712.ts

@@ -1,4 +1,6 @@
 import type { Abi } from 'abitype'
+
+import type { SendTransactionRequest } from '../../actions/wallet/sendTransaction.js'
 import { writeContract } from '../../actions/wallet/writeContract.js'
 import type { Client } from '../../clients/createClient.js'
 import type { WalletActions } from '../../clients/decorators/wallet.js'
@@ -69,8 +71,11 @@ export type Eip712WalletActions<
    *   value: 1000000000000000000n,
    * })
    */
-  sendTransaction: <chainOverride extends ChainEIP712 | undefined = undefined>(
-    args: SendTransactionParameters<chain, account, chainOverride>,
+  sendTransaction: <
+    const request extends SendTransactionRequest<chain, chainOverride>,
+    chainOverride extends ChainEIP712 | undefined = undefined,
+  >(
+    args: SendTransactionParameters<chain, account, chainOverride, request>,
   ) => Promise<SendTransactionReturnType>
   /**
    * Signs a transaction.

package/zksync/types/chain.ts

@@ -6,20 +6,20 @@ import type { ZkSyncTransactionSerializable } from './transaction.js'
 export type ChainEIP712<
   formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
   TransactionSignable = {},
+  ///
+  transactionSerializable extends
+    ZkSyncTransactionSerializable = formatters extends ChainFormatters
+    ? formatters['transactionRequest'] extends ChainFormatter
+      ? ZkSyncTransactionSerializable &
+          Parameters<formatters['transactionRequest']['format']>[0]
+      : ZkSyncTransactionSerializable
+    : ZkSyncTransactionSerializable,
 > = Chain<
   formatters,
   {
     /** Return EIP712 Domain for EIP712 transaction */
     getEip712Domain?:
-      | EIP712DomainFn<
-          formatters extends ChainFormatters
-            ? formatters['transactionRequest'] extends ChainFormatter
-              ? ZkSyncTransactionSerializable &
-                  Parameters<formatters['transactionRequest']['format']>[0]
-              : ZkSyncTransactionSerializable
-            : ZkSyncTransactionSerializable,
-          TransactionSignable
-        >
+      | EIP712DomainFn<transactionSerializable, TransactionSignable>
       | undefined
   }
 >