viem 1.2.10 → 1.2.11

package/src/clients/createWalletClient.ts

@@ -10,28 +10,30 @@ import { type WalletActions, walletActions } from './decorators/wallet.js'
 import type { Transport } from './transports/createTransport.js'
 
 export type WalletClientConfig<
-  TTransport extends Transport = Transport,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccountOrAddress extends Account | Address | undefined =
+  transport extends Transport = Transport,
+  chain extends Chain | undefined = Chain | undefined,
+  accountOrAddress extends Account | Address | undefined =
     | Account
     | Address
     | undefined,
-> = Pick<
-  ClientConfig<TTransport, TChain, TAccountOrAddress>,
-  'account' | 'chain' | 'key' | 'name' | 'pollingInterval' | 'transport'
+> = Prettify<
+  Pick<
+    ClientConfig<transport, chain, accountOrAddress>,
+    'account' | 'chain' | 'key' | 'name' | 'pollingInterval' | 'transport'
+  >
 >
 
 export type WalletClient<
-  TTransport extends Transport = Transport,
-  TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
+  transport extends Transport = Transport,
+  chain extends Chain | undefined = Chain | undefined,
+  account extends Account | undefined = Account | undefined,
 > = Prettify<
   Client<
-    TTransport,
-    TChain,
-    TAccount,
+    transport,
+    chain,
+    account,
     WalletRpcSchema,
-    WalletActions<TChain, TAccount>
+    WalletActions<chain, account>
   >
 >
 
@@ -72,28 +74,23 @@ export type WalletClient<
  * })
  */
 export function createWalletClient<
-  TTransport extends Transport,
-  TChain extends Chain | undefined = undefined,
-  TAccountOrAddress extends Account | Address | undefined = undefined,
->({
-  account,
-  chain,
-  transport,
-  key = 'wallet',
-  name = 'Wallet Client',
-  pollingInterval,
-}: WalletClientConfig<TTransport, TChain, TAccountOrAddress>): WalletClient<
-  TTransport,
-  TChain,
-  ParseAccount<TAccountOrAddress>
-> {
-  return createClient({
-    account,
-    chain,
+  transport extends Transport,
+  chain extends Chain | undefined = undefined,
+  accountOrAddress extends Account | Address | undefined = undefined,
+>(
+  parameters: WalletClientConfig<transport, chain, accountOrAddress>,
+): WalletClient<transport, chain, ParseAccount<accountOrAddress>>
+
+export function createWalletClient(
+  parameters: WalletClientConfig,
+): WalletClient {
+  const { key = 'wallet', name = 'Wallet Client', transport } = parameters
+  const client = createClient({
+    ...parameters,
     key,
     name,
-    pollingInterval,
     transport: (opts) => transport({ ...opts, retryCount: 0 }),
     type: 'walletClient',
-  }).extend(walletActions)
+  })
+  return client.extend(walletActions)
 }

package/src/clients/decorators/public.ts

@@ -1374,52 +1374,57 @@ export type PublicActions<
   ) => WatchPendingTransactionsReturnType
 }
 
-export const publicActions = <
+export function publicActions<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
 >(
   client: Client<TTransport, TChain, TAccount>,
-): PublicActions<TTransport, TChain, TAccount> => ({
-  call: (args) => call(client, args),
-  createBlockFilter: () => createBlockFilter(client),
-  createContractEventFilter: (args) => createContractEventFilter(client, args),
-  createEventFilter: (args) => createEventFilter(client, args),
-  createPendingTransactionFilter: () => createPendingTransactionFilter(client),
-  estimateContractGas: (args) => estimateContractGas(client, args as any),
-  estimateGas: (args) => estimateGas(client, args),
-  getBalance: (args) => getBalance(client, args),
-  getBlock: (args) => getBlock(client, args),
-  getBlockNumber: (args) => getBlockNumber(client, args),
-  getBlockTransactionCount: (args) => getBlockTransactionCount(client, args),
-  getBytecode: (args) => getBytecode(client, args),
-  getChainId: () => getChainId(client),
-  getEnsAddress: (args) => getEnsAddress(client, args),
-  getEnsAvatar: (args) => getEnsAvatar(client, args),
-  getEnsName: (args) => getEnsName(client, args),
-  getEnsResolver: (args) => getEnsResolver(client, args),
-  getEnsText: (args) => getEnsText(client, args),
-  getFeeHistory: (args) => getFeeHistory(client, args),
-  getFilterChanges: (args) => getFilterChanges(client, args),
-  getFilterLogs: (args) => getFilterLogs(client, args),
-  getGasPrice: () => getGasPrice(client),
-  getLogs: (args) => getLogs(client, args),
-  getStorageAt: (args) => getStorageAt(client, args),
-  getTransaction: (args) => getTransaction(client, args),
-  getTransactionConfirmations: (args) =>
-    getTransactionConfirmations(client, args),
-  getTransactionCount: (args) => getTransactionCount(client, args),
-  getTransactionReceipt: (args) => getTransactionReceipt(client, args),
-  multicall: (args) => multicall(client, args),
-  readContract: (args) => readContract(client, args),
-  simulateContract: (args) => simulateContract(client, args),
-  verifyMessage: (args) => verifyMessage(client, args),
-  verifyTypedData: (args) => verifyTypedData(client, args),
-  uninstallFilter: (args) => uninstallFilter(client, args),
-  waitForTransactionReceipt: (args) => waitForTransactionReceipt(client, args),
-  watchBlocks: (args) => watchBlocks(client, args),
-  watchBlockNumber: (args) => watchBlockNumber(client, args),
-  watchContractEvent: (args) => watchContractEvent(client, args),
-  watchEvent: (args) => watchEvent(client, args),
-  watchPendingTransactions: (args) => watchPendingTransactions(client, args),
-})
+): PublicActions<TTransport, TChain, TAccount> {
+  return {
+    call: (args) => call(client, args),
+    createBlockFilter: () => createBlockFilter(client),
+    createContractEventFilter: (args) =>
+      createContractEventFilter(client, args),
+    createEventFilter: (args) => createEventFilter(client, args),
+    createPendingTransactionFilter: () =>
+      createPendingTransactionFilter(client),
+    estimateContractGas: (args) => estimateContractGas(client, args as any),
+    estimateGas: (args) => estimateGas(client, args),
+    getBalance: (args) => getBalance(client, args),
+    getBlock: (args) => getBlock(client, args),
+    getBlockNumber: (args) => getBlockNumber(client, args),
+    getBlockTransactionCount: (args) => getBlockTransactionCount(client, args),
+    getBytecode: (args) => getBytecode(client, args),
+    getChainId: () => getChainId(client),
+    getEnsAddress: (args) => getEnsAddress(client, args),
+    getEnsAvatar: (args) => getEnsAvatar(client, args),
+    getEnsName: (args) => getEnsName(client, args),
+    getEnsResolver: (args) => getEnsResolver(client, args),
+    getEnsText: (args) => getEnsText(client, args),
+    getFeeHistory: (args) => getFeeHistory(client, args),
+    getFilterChanges: (args) => getFilterChanges(client, args),
+    getFilterLogs: (args) => getFilterLogs(client, args),
+    getGasPrice: () => getGasPrice(client),
+    getLogs: (args) => getLogs(client, args),
+    getStorageAt: (args) => getStorageAt(client, args),
+    getTransaction: (args) => getTransaction(client, args),
+    getTransactionConfirmations: (args) =>
+      getTransactionConfirmations(client, args),
+    getTransactionCount: (args) => getTransactionCount(client, args),
+    getTransactionReceipt: (args) => getTransactionReceipt(client, args),
+    multicall: (args) => multicall(client, args),
+    readContract: (args) => readContract(client, args),
+    simulateContract: (args) => simulateContract(client, args),
+    verifyMessage: (args) => verifyMessage(client, args),
+    verifyTypedData: (args) => verifyTypedData(client, args),
+    uninstallFilter: (args) => uninstallFilter(client, args),
+    waitForTransactionReceipt: (args) =>
+      waitForTransactionReceipt(client, args),
+    watchBlocks: (args) => watchBlocks(client, args),
+    watchBlockNumber: (args) => watchBlockNumber(client, args),
+    watchContractEvent: (args) => watchContractEvent(client, args),
+    watchEvent: (args) => watchEvent(client, args),
+    watchPendingTransactions: (args) => watchPendingTransactions(client, args),
+  }
+}

package/src/clients/decorators/wallet.ts

@@ -523,24 +523,26 @@ export type WalletActions<
   ) => Promise<WriteContractReturnType>
 }
 
-export const walletActions = <
+export function walletActions<
   TTransport extends Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends Account | undefined = Account | undefined,
 >(
   client: Client<TTransport, TChain, TAccount>,
-): WalletActions<TChain, TAccount> => ({
-  addChain: (args) => addChain(client, args),
-  deployContract: (args) => deployContract(client, args),
-  getAddresses: () => getAddresses(client),
-  getChainId: () => getChainId(client),
-  getPermissions: () => getPermissions(client),
-  requestAddresses: () => requestAddresses(client),
-  requestPermissions: (args) => requestPermissions(client, args),
-  sendTransaction: (args) => sendTransaction(client, args),
-  signMessage: (args) => signMessage(client, args),
-  signTypedData: (args) => signTypedData(client, args),
-  switchChain: (args) => switchChain(client, args),
-  watchAsset: (args) => watchAsset(client, args),
-  writeContract: (args) => writeContract(client, args),
-})
+): WalletActions<TChain, TAccount> {
+  return {
+    addChain: (args) => addChain(client, args),
+    deployContract: (args) => deployContract(client, args),
+    getAddresses: () => getAddresses(client),
+    getChainId: () => getChainId(client),
+    getPermissions: () => getPermissions(client),
+    requestAddresses: () => requestAddresses(client),
+    requestPermissions: (args) => requestPermissions(client, args),
+    sendTransaction: (args) => sendTransaction(client, args),
+    signMessage: (args) => signMessage(client, args),
+    signTypedData: (args) => signTypedData(client, args),
+    switchChain: (args) => switchChain(client, args),
+    watchAsset: (args) => watchAsset(client, args),
+    writeContract: (args) => writeContract(client, args),
+  }
+}

package/src/types/chain.ts

@@ -1,4 +1,3 @@
-import type { Chain as Chain_ } from '@wagmi/chains'
 import type { Address } from 'abitype'
 
 import type { Formatters } from './formatter.js'
@@ -6,13 +5,13 @@ import type { Serializers } from './serializer.js'
 import type { IsUndefined } from './utils.js'
 
 export type Chain<
-  TFormatters extends Formatters | undefined = Formatters | undefined,
-  TSerializers extends Serializers<TFormatters> | undefined =
-    | Serializers<TFormatters>
+  formatters extends Formatters | undefined = Formatters | undefined,
+  serializers extends Serializers<formatters> | undefined =
+    | Serializers<formatters>
     | undefined,
-> = Chain_ & {
-  formatters?: TFormatters
-  serializers?: TSerializers
+> = import('@wagmi/chains').Chain & {
+  formatters?: formatters | undefined
+  serializers?: serializers | undefined
 }
 
 export type ChainContract = {