viem 0.0.0-portable-types-20230523145621 → 0.0.0-refactor-generics-20230831161903

package/src/actions/ens/getEnsAddress.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import {
-  singleAddressResolverAbi,
-  universalResolverAbi,
+  addressResolverAbi,
+  universalResolverResolveAbi,
 } from '../../constants/abis.js'
 import type { Chain } from '../../types/chain.js'
 import type { Prettify } from '../../types/utils.js'
@@ -13,6 +13,7 @@ import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
 import { getChainContractAddress } from '../../utils/chain.js'
 import { trim } from '../../utils/data/trim.js'
 import { toHex } from '../../utils/encoding/toHex.js'
+import { isNullUniversalResolverError } from '../../utils/ens/errors.js'
 import { namehash } from '../../utils/ens/namehash.js'
 import { packetToBytes } from '../../utils/ens/packetToBytes.js'
 import {
@@ -22,6 +23,8 @@ import {
 
 export type GetEnsAddressParameters = Prettify<
   Pick<ReadContractParameters, 'blockNumber' | 'blockTag'> & {
+    /** ENSIP-9 compliant coinType used to resolve addresses for other chains */
+    coinType?: number
     /** Name to get the address for. */
     name: string
     /** Address of ENS Universal Resolver Contract. */
@@ -60,10 +63,11 @@ export type GetEnsAddressReturnType = Address | null
  * // '0xd2135CfB216b74109775236E36d4b433F1DF507B'
  */
 export async function getEnsAddress<TChain extends Chain | undefined,>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockNumber,
     blockTag,
+    coinType,
     name,
     universalResolverAddress: universalResolverAddress_,
   }: GetEnsAddressParameters,
@@ -82,29 +86,38 @@ export async function getEnsAddress<TChain extends Chain | undefined,>(
     })
   }
 
-  const res = await readContract(client, {
-    address: universalResolverAddress,
-    abi: universalResolverAbi,
-    functionName: 'resolve',
-    args: [
-      toHex(packetToBytes(name)),
-      encodeFunctionData({
-        abi: singleAddressResolverAbi,
-        functionName: 'addr',
-        args: [namehash(name)],
-      }),
-    ],
-    blockNumber,
-    blockTag,
-  })
+  try {
+    const functionData = encodeFunctionData({
+      abi: addressResolverAbi,
+      functionName: 'addr',
+      ...(coinType != null
+        ? { args: [namehash(name), BigInt(coinType)] }
+        : { args: [namehash(name)] }),
+    })
+
+    const res = await readContract(client, {
+      address: universalResolverAddress,
+      abi: universalResolverResolveAbi,
+      functionName: 'resolve',
+      args: [toHex(packetToBytes(name)), functionData],
+      blockNumber,
+      blockTag,
+    })
 
-  if (res[0] === '0x') return null
+    if (res[0] === '0x') return null
 
-  const address = decodeFunctionResult({
-    abi: singleAddressResolverAbi,
-    functionName: 'addr',
-    data: res[0],
-  })
+    const address = decodeFunctionResult({
+      abi: addressResolverAbi,
+      args: coinType != null ? [namehash(name), BigInt(coinType)] : undefined,
+      functionName: 'addr',
+      data: res[0],
+    })
 
-  return trim(address) === '0x00' ? null : address
+    if (address === '0x') return null
+    if (trim(address) === '0x00') return null
+    return address
+  } catch (err) {
+    if (isNullUniversalResolverError(err, 'resolve')) return null
+    throw err
+  }
 }

package/src/actions/ens/getEnsAvatar.ts

@@ -1,4 +1,4 @@
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { AssetGatewayUrls } from '../../types/ens.js'
@@ -45,7 +45,7 @@ export type GetEnsAvatarReturnType = string | null
  * // 'https://ipfs.io/ipfs/Qma8mnp6xV3J2cRNf3mTth5C8nV11CAnceVinc3y8jSbio'
  */
 export async function getEnsAvatar<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockNumber,
     blockTag,

package/src/actions/ens/getEnsName.ts

@@ -1,16 +1,13 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import { panicReasons } from '../../constants/solidity.js'
-import {
-  ContractFunctionExecutionError,
-  type ContractFunctionRevertedError,
-} from '../../errors/contract.js'
+import { universalResolverReverseAbi } from '../../constants/abis.js'
 import type { Chain } from '../../types/chain.js'
 import type { Prettify } from '../../types/utils.js'
 import { getChainContractAddress } from '../../utils/chain.js'
 import { toHex } from '../../utils/encoding/toHex.js'
+import { isNullUniversalResolverError } from '../../utils/ens/errors.js'
 import { packetToBytes } from '../../utils/ens/packetToBytes.js'
 import {
   type ReadContractParameters,
@@ -55,7 +52,7 @@ export type GetEnsNameReturnType = string | null
  * // 'wagmi-dev.eth'
  */
 export async function getEnsName<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     address,
     blockNumber,
@@ -81,33 +78,15 @@ export async function getEnsName<TChain extends Chain | undefined>(
   try {
     const res = await readContract(client, {
       address: universalResolverAddress,
-      abi: [
-        {
-          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' },
-          ],
-        },
-      ],
+      abi: universalResolverReverseAbi,
       functionName: 'reverse',
       args: [toHex(packetToBytes(reverseNode))],
       blockNumber,
       blockTag,
     })
     return res[0]
-  } catch (error) {
-    if (
-      error instanceof ContractFunctionExecutionError &&
-      (error.cause as ContractFunctionRevertedError).reason === panicReasons[50]
-    )
-      // No primary name set for address.
-      return null
-    throw error
+  } catch (err) {
+    if (isNullUniversalResolverError(err, 'reverse')) return null
+    throw err
   }
 }

package/src/actions/ens/getEnsResolver.ts

@@ -1,6 +1,6 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
 import type { Chain } from '../../types/chain.js'
 import type { Prettify } from '../../types/utils.js'
@@ -52,7 +52,7 @@ export type GetEnsResolverReturnType = Address
  * // '0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41'
  */
 export async function getEnsResolver<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockNumber,
     blockTag,

package/src/actions/ens/getEnsText.ts

@@ -1,14 +1,18 @@
 import type { Address } from 'abitype'
 
-import type { PublicClient } from '../../clients/createPublicClient.js'
+import type { Client } from '../../clients/createClient.js'
 import type { Transport } from '../../clients/transports/createTransport.js'
-import { textResolverAbi, universalResolverAbi } from '../../constants/abis.js'
+import {
+  textResolverAbi,
+  universalResolverResolveAbi,
+} from '../../constants/abis.js'
 import type { Chain } from '../../types/chain.js'
 import type { Prettify } from '../../types/utils.js'
 import { decodeFunctionResult } from '../../utils/abi/decodeFunctionResult.js'
 import { encodeFunctionData } from '../../utils/abi/encodeFunctionData.js'
 import { getChainContractAddress } from '../../utils/chain.js'
 import { toHex } from '../../utils/encoding/toHex.js'
+import { isNullUniversalResolverError } from '../../utils/ens/errors.js'
 import { namehash } from '../../utils/ens/namehash.js'
 import { packetToBytes } from '../../utils/ens/packetToBytes.js'
 import {
@@ -59,7 +63,7 @@ export type GetEnsTextReturnType = string | null
  * // 'wagmi_sh'
  */
 export async function getEnsText<TChain extends Chain | undefined>(
-  client: PublicClient<Transport, TChain>,
+  client: Client<Transport, TChain>,
   {
     blockNumber,
     blockTag,
@@ -82,29 +86,34 @@ export async function getEnsText<TChain extends Chain | undefined>(
     })
   }
 
-  const res = await readContract(client, {
-    address: universalResolverAddress,
-    abi: universalResolverAbi,
-    functionName: 'resolve',
-    args: [
-      toHex(packetToBytes(name)),
-      encodeFunctionData({
-        abi: textResolverAbi,
-        functionName: 'text',
-        args: [namehash(name), key],
-      }),
-    ],
-    blockNumber,
-    blockTag,
-  })
+  try {
+    const res = await readContract(client, {
+      address: universalResolverAddress,
+      abi: universalResolverResolveAbi,
+      functionName: 'resolve',
+      args: [
+        toHex(packetToBytes(name)),
+        encodeFunctionData({
+          abi: textResolverAbi,
+          functionName: 'text',
+          args: [namehash(name), key],
+        }),
+      ],
+      blockNumber,
+      blockTag,
+    })
 
-  if (res[0] === '0x') return null
+    if (res[0] === '0x') return null
 
-  const record = decodeFunctionResult({
-    abi: textResolverAbi,
-    functionName: 'text',
-    data: res[0],
-  })
+    const record = decodeFunctionResult({
+      abi: textResolverAbi,
+      functionName: 'text',
+      data: res[0],
+    })
 
-  return record === '' ? null : record
+    return record === '' ? null : record
+  } catch (err) {
+    if (isNullUniversalResolverError(err, 'resolve')) return null
+    throw err
+  }
 }