viem 1.2.13 → 1.2.15

package/src/clients/createClient.ts

@@ -21,9 +21,7 @@ export type ClientConfig<
     | undefined,
 > = {
   /** The Account to use for the Client. This will be used for Actions that require an account as an argument. */
-  account?: accountOrAddress extends Account | Address
-    ? accountOrAddress | Account | Address // `accountOrAddress` defined, add for inference
-    : Account | Address | undefined // `accountOrAddress` undefined, show possible types for autocomplete
+  account?: accountOrAddress | Account | Address | undefined
   /** Flags for batch settings. */
   batch?:
     | {
@@ -32,9 +30,7 @@ export type ClientConfig<
       }
     | undefined
   /** Chain for the client. */
-  chain?: chain extends Chain
-    ? chain // `chain` defined, add for inference
-    : Chain | undefined // `chain` undefined, show possible types for autocomplete
+  chain?: Chain | undefined | chain
   /** A key for the client. */
   key?: string | undefined
   /** A name for the client. */
@@ -58,23 +54,20 @@ export type Client<
   account extends Account | undefined = Account | undefined,
   rpcSchema extends RpcSchema | undefined = undefined,
   extended extends Extended | undefined = Extended | undefined,
-> = Prettify<
-  Prettify<Client_Base<transport, chain, account, rpcSchema>> & {
+> = Client_Base<transport, chain, account, rpcSchema> &
+  (extended extends Extended ? extended : unknown) & {
     extend: <const client extends Extended>(
       fn: (
         client: Client<transport, chain, account, rpcSchema, extended>,
       ) => client,
-    ) => Prettify<
-      Client<
-        transport,
-        chain,
-        account,
-        rpcSchema,
-        Prettify<client> & (extended extends Extended ? extended : unknown)
-      >
+    ) => Client<
+      transport,
+      chain,
+      account,
+      rpcSchema,
+      Prettify<client> & (extended extends Extended ? extended : unknown)
     >
-  } & (extended extends Extended ? extended : unknown)
->
+  }
 
 type Client_Base<
   transport extends Transport = Transport,
@@ -129,12 +122,14 @@ export function createClient<
   accountOrAddress extends Account | Address | undefined = undefined,
 >(
   parameters: ClientConfig<transport, chain, accountOrAddress>,
-): Client<
-  transport,
-  chain,
-  accountOrAddress extends Address
-    ? Prettify<JsonRpcAccount<accountOrAddress>>
-    : accountOrAddress
+): Prettify<
+  Client<
+    transport,
+    chain,
+    accountOrAddress extends Address
+      ? Prettify<JsonRpcAccount<accountOrAddress>>
+      : accountOrAddress
+  >
 >
 
 export function createClient(parameters: ClientConfig): Client {

package/src/constants/abis.ts

@@ -43,7 +43,21 @@ export const multicall3Abi = [
   },
 ] as const
 
-export const universalResolverAbi = [
+const universalResolverErrors = [
+  {
+    inputs: [],
+    name: 'ResolverNotFound',
+    type: 'error',
+  },
+  {
+    inputs: [],
+    name: 'ResolverWildcardNotSupported',
+    type: 'error',
+  },
+] as const
+
+export const universalResolverResolveAbi = [
+  ...universalResolverErrors,
   {
     name: 'resolve',
     type: 'function',
@@ -59,6 +73,22 @@ export const universalResolverAbi = [
   },
 ] as const
 
+export const universalResolverReverseAbi = [
+  ...universalResolverErrors,
+  {
+    name: 'reverse',
+    type: 'function',
+    stateMutability: 'view',
+    inputs: [{ type: 'bytes', name: 'reverseName' }],
+    outputs: [
+      { type: 'string', name: 'resolvedName' },
+      { type: 'address', name: 'resolvedAddress' },
+      { type: 'address', name: 'reverseResolver' },
+      { type: 'address', name: 'resolver' },
+    ],
+  },
+] as const
+
 export const textResolverAbi = [
   {
     name: 'text',

package/src/errors/version.ts

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

package/src/index.ts

@@ -55,6 +55,7 @@ export type {
   DeployContractReturnType,
 } from './actions/wallet/deployContract.js'
 export type { DropTransactionParameters } from './actions/test/dropTransaction.js'
+export type { GetAutomineReturnType } from './actions/test/getAutomine.js'
 export type {
   EstimateContractGasParameters,
   EstimateContractGasReturnType,
@@ -181,6 +182,9 @@ export type {
   RequestPermissionsReturnType,
   RequestPermissionsParameters,
 } from './actions/wallet/requestPermissions.js'
+export type { GetTxpoolContentReturnType } from './actions/test/getTxpoolContent.js'
+export type { GetTxpoolStatusReturnType } from './actions/test/getTxpoolStatus.js'
+export type { InspectTxpoolReturnType } from './actions/test/inspectTxpool.js'
 export type { ResetParameters } from './actions/test/reset.js'
 export type { RevertParameters } from './actions/test/revert.js'
 export type {

package/src/test.ts

@@ -2,9 +2,18 @@ export {
   dropTransaction,
   type DropTransactionParameters,
 } from './actions/test/dropTransaction.js'
-export { getAutomine } from './actions/test/getAutomine.js'
-export { getTxpoolContent } from './actions/test/getTxpoolContent.js'
-export { getTxpoolStatus } from './actions/test/getTxpoolStatus.js'
+export {
+  getAutomine,
+  type GetAutomineReturnType,
+} from './actions/test/getAutomine.js'
+export {
+  getTxpoolContent,
+  type GetTxpoolContentReturnType,
+} from './actions/test/getTxpoolContent.js'
+export {
+  getTxpoolStatus,
+  type GetTxpoolStatusReturnType,
+} from './actions/test/getTxpoolStatus.js'
 export {
   impersonateAccount,
   type ImpersonateAccountParameters,
@@ -13,7 +22,10 @@ export {
   increaseTime,
   type IncreaseTimeParameters,
 } from './actions/test/increaseTime.js'
-export { inspectTxpool } from './actions/test/inspectTxpool.js'
+export {
+  inspectTxpool,
+  type InspectTxpoolReturnType,
+} from './actions/test/inspectTxpool.js'
 export { mine, type MineParameters } from './actions/test/mine.js'
 export { removeBlockTimestampInterval } from './actions/test/removeBlockTimestampInterval.js'
 export { reset, type ResetParameters } from './actions/test/reset.js'

package/src/utils/ens/errors.ts

@@ -0,0 +1,27 @@
+import { panicReasons } from '../../constants/solidity.js'
+import { BaseError } from '../../errors/base.js'
+import { ContractFunctionRevertedError } from '../../errors/contract.js'
+
+/*
+ * @description Checks if error is a valid null result UniversalResolver error
+ */
+export function isNullUniversalResolverError(
+  err: unknown,
+  callType: 'resolve' | 'reverse',
+): boolean {
+  if (!(err instanceof BaseError)) return false
+  const cause = err.walk((e) => e instanceof ContractFunctionRevertedError)
+  if (!(cause instanceof ContractFunctionRevertedError)) return false
+  if (cause.data?.errorName === 'ResolverNotFound') return true
+  if (cause.data?.errorName === 'ResolverWildcardNotSupported') return true
+  // Backwards compatibility for older UniversalResolver contracts
+  if (
+    cause.reason?.includes(
+      'Wildcard on non-extended resolvers is not supported',
+    )
+  )
+    return true
+  // No primary name set for address.
+  if (callType === 'reverse' && cause.reason === panicReasons[50]) return true
+  return false
+}