viem 0.0.0-w-20230630153145 → 0.0.0-w-20230711200108

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/errors/base.ts

@@ -60,13 +60,16 @@ export class BaseError extends Error {
     this.shortMessage = shortMessage
   }
 
-  walk(fn?: (err: unknown) => boolean) {
+  walk(): Error
+  walk(fn: (err: unknown) => boolean): Error | null
+  walk(fn?: any): any {
     return walk(this, fn)
   }
 }
 
 function walk(err: unknown, fn?: (err: unknown) => boolean): unknown {
   if (fn?.(err)) return err
-  if ((err as Error).cause) return walk((err as Error).cause, fn)
-  return err
+  if (err && typeof err === 'object' && 'cause' in err)
+    return walk(err.cause, fn)
+  return fn ? null : err
 }

package/src/errors/version.ts

@@ -1 +1 @@
-export const version = '1.2.6'
+export const version = '1.2.12'

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 = {

package/src/types/eip1193.ts

@@ -51,35 +51,22 @@ export type ProviderMessage = {
   data: unknown
 }
 
-export type EIP1193Events = {
-  on(
-    event: 'connect',
-    listener: (connectInfo: ProviderConnectInfo) => void,
-  ): void
-  on(event: 'disconnect', listener: (error: ProviderRpcError) => void): void
-  on(event: 'chainChanged', listener: (chainId: string) => void): void
-  on(event: 'accountsChanged', listener: (accounts: string[]) => void): void
-  on(event: 'message', listener: (message: ProviderMessage) => void): void
+type EIP1193EventMap = {
+  accountsChanged(accounts: Address[]): void
+  chainChanged(chainId: string): void
+  connect(connectInfo: ProviderConnectInfo): void
+  disconnect(error: ProviderRpcError): void
+  message(message: ProviderMessage): void
+}
 
-  removeListener(
-    event: 'connect',
-    listener: (connectInfo: ProviderConnectInfo) => void,
-  ): void
-  removeListener(
-    event: 'disconnect',
-    listener: (error: ProviderRpcError) => void,
-  ): void
-  removeListener(
-    event: 'chainChanged',
-    listener: (chainId: string) => void,
-  ): void
-  removeListener(
-    event: 'accountsChanged',
-    listener: (accounts: Address[]) => void,
+export type EIP1193Events = {
+  on<TEvent extends keyof EIP1193EventMap>(
+    event: TEvent,
+    listener: EIP1193EventMap[TEvent],
   ): void
-  removeListener(
-    event: 'message',
-    listener: (message: ProviderMessage) => void,
+  removeListener<TEvent extends keyof EIP1193EventMap>(
+    event: TEvent,
+    listener: EIP1193EventMap[TEvent],
   ): void
 }
 

package/src/types/transaction.ts

@@ -35,7 +35,7 @@ export type TransactionReceipt<
   logs: Log<TQuantity, TIndex>[]
   /** Logs bloom filter */
   logsBloom: Hex
-  /** `1` if this transaction was successful or `0` if it failed */
+  /** `success` if this transaction was successful or `reverted` if it failed */
   status: TStatus
   /** Transaction recipient or `null` if deploying a contract */
   to: Address | null

package/src/types/typedData.ts

@@ -15,11 +15,11 @@ export type TypedDataDefinition<
   GetTypedDataDomain<TTypedData, TPrimaryType>
 
 export type GetTypedDataDomain<
-  TTypedData extends TypedData | { [key: string]: unknown } = TypedData,
+  TTypedData extends TypedData | { [key_1: string]: unknown } = TypedData,
   TPrimaryType extends string = string,
   TSchema = TTypedData extends TypedData
     ? TypedDataToPrimitiveTypes<TTypedData>
-    : { [key: string]: any },
+    : { [key_2: string]: any },
   TDomain = TSchema extends { EIP712Domain: infer Domain }
     ? Domain
     : TypedDataDomain,
@@ -32,24 +32,24 @@ export type GetTypedDataDomain<
     }
 
 export type GetTypedDataMessage<
-  TTypedData extends TypedData | { [key: string]: unknown } = TypedData,
+  TTypedData extends TypedData | { [key_1: string]: unknown } = TypedData,
   TPrimaryType extends string = string,
   TSchema = TTypedData extends TypedData
     ? TypedDataToPrimitiveTypes<TTypedData>
-    : { [key: string]: any },
+    : { [key_2: string]: any },
   TMessage = TSchema[TPrimaryType extends keyof TSchema
     ? TPrimaryType
     : keyof TSchema],
 > = TPrimaryType extends 'EIP712Domain'
   ? {}
-  : { [key: string]: any } extends TMessage // Check if we were able to infer the shape of typed data
+  : { [key_3: string]: any } extends TMessage // Check if we were able to infer the shape of typed data
   ? {
       /**
        * Data to sign
        *
        * Use a [const assertion](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-4.html#const-assertions) on {@link types} for type inference.
        */
-      message: { [key: string]: unknown }
+      message: { [key_4: string]: unknown }
     }
   : {
       /** Data to sign */

package/src/utils/abi/encodePacked.ts

@@ -62,7 +62,7 @@ export function encodePacked<
 function encode<TPackedAbiType extends PackedAbiType | unknown>(
   type: TPackedAbiType,
   value: EncodePackedValues<[TPackedAbiType]>[0],
-  isArray: boolean = false,
+  isArray = false,
 ): Hex {
   if (type === 'address') {
     const address = value as Address

package/src/utils/ens/avatar/utils.ts

@@ -40,6 +40,7 @@ export async function isImageUri(uri: string) {
       return false
     }
     // fail in NodeJS, since the error is not cors but any other network issue
+    // rome-ignore lint/suspicious/noPrototypeBuiltins:
     if (!globalThis.hasOwnProperty('Image')) return false
     // in case of cors, use image api to validate if given url is an actual image
     return new Promise((resolve) => {
@@ -179,7 +180,8 @@ type ParsedNft = {
   tokenID: string
 }
 
-export function parseNftUri(uri: string): ParsedNft {
+export function parseNftUri(uri_: string): ParsedNft {
+  let uri = uri_
   // parse valid nft spec (CAIP-22/CAIP-29)
   // @see: https://github.com/ChainAgnostic/CAIPs/tree/master/CAIPs
   if (uri.startsWith('did:nft:')) {

package/src/utils/errors/getContractError.ts

@@ -33,7 +33,7 @@ export function getContractError(
     err instanceof RawContractError
       ? err
       : err instanceof BaseError
-      ? err.walk((err) => 'data' in (err as Error))
+      ? err.walk((err) => 'data' in (err as Error)) || err.walk()
       : {}
   ) as RawContractError
 

package/src/utils/formatters/extract.ts

@@ -9,9 +9,10 @@ export function extract(
 ) {
   if (!format) return {}
   const keys = Object.keys(format({}))
-  return keys.reduce((data, key) => {
+  return keys.reduce((data: Record<string, unknown>, key) => {
+    // rome-ignore lint/suspicious/noPrototypeBuiltins:
     if (value?.hasOwnProperty(key)) {
-      ;(data as any)[key] = value[key]
+      data[key] = value[key]
     }
     return data
   }, {})

package/src/utils/transaction/prepareRequest.ts

@@ -72,7 +72,7 @@ export async function prepareRequest<
       blockTag: 'pending',
     })
 
-  if (block.baseFeePerGas) {
+  if (typeof block.baseFeePerGas === 'bigint') {
     if (typeof gasPrice !== 'undefined')
       throw new BaseError('Chain does not support legacy `gasPrice`.')