viem 2.42.0 → 2.43.0

package/account-abstraction/accounts/implementations/toSimple7702SmartAccount.ts

@@ -1,4 +1,4 @@
-import type { Address, TypedData } from 'abitype'
+import type { Abi, Address, TypedData } from 'abitype'
 
 import type { PrivateKeyAccount } from '../../../accounts/types.js'
 import { BaseError } from '../../../errors/base.js'
@@ -6,27 +6,60 @@ import type { TypedDataDefinition } from '../../../types/typedData.js'
 import type { Prettify } from '../../../types/utils.js'
 import { decodeFunctionData } from '../../../utils/abi/decodeFunctionData.js'
 import { encodeFunctionData } from '../../../utils/abi/encodeFunctionData.js'
-import { entryPoint08Abi } from '../../constants/abis.js'
-import { entryPoint08Address } from '../../constants/address.js'
+import { entryPoint08Abi, entryPoint09Abi } from '../../constants/abis.js'
+import {
+  entryPoint08Address,
+  entryPoint09Address,
+} from '../../constants/address.js'
+import type { EntryPointVersion } from '../../types/entryPointVersion.js'
 import { getUserOperationTypedData } from '../../utils/userOperation/getUserOperationTypedData.js'
 import { toSmartAccount } from '../toSmartAccount.js'
 import type { SmartAccount, SmartAccountImplementation } from '../types.js'
 
-export type ToSimple7702SmartAccountParameters = {
+type EntryPoint =
+  | '0.8'
+  | '0.9'
+  | {
+      abi: Abi
+      address: Address
+      version: EntryPointVersion
+    }
+
+export type ToSimple7702SmartAccountParameters<
+  entryPoint extends EntryPoint = '0.8',
+> = {
   client: Simple7702SmartAccountImplementation['client']
+  entryPoint?: entryPoint | EntryPoint | undefined
   implementation?: Address | undefined
   getNonce?: SmartAccountImplementation['getNonce'] | undefined
   owner: PrivateKeyAccount
 }
 
-export type ToSimple7702SmartAccountReturnType = Prettify<
-  SmartAccount<Simple7702SmartAccountImplementation>
->
+export type ToSimple7702SmartAccountReturnType<
+  entryPoint extends EntryPoint = '0.8',
+> = Prettify<SmartAccount<Simple7702SmartAccountImplementation<entryPoint>>>
 
-export type Simple7702SmartAccountImplementation = SmartAccountImplementation<
-  typeof entryPoint08Abi,
-  '0.8',
-  { abi: typeof abi; owner: PrivateKeyAccount },
+export type Simple7702SmartAccountImplementation<
+  entryPoint extends EntryPoint = '0.8',
+> = SmartAccountImplementation<
+  entryPoint extends { abi: infer abi }
+    ? abi
+    : entryPoint extends '0.9'
+      ? typeof entryPoint09Abi
+      : typeof entryPoint08Abi,
+  entryPoint extends string
+    ? entryPoint
+    : entryPoint extends { version: infer version }
+      ? version
+      : EntryPointVersion,
+  {
+    abi: entryPoint extends { abi: infer abi }
+      ? abi
+      : entryPoint extends '0.9'
+        ? typeof entryPoint09Abi
+        : typeof entryPoint08Abi
+    owner: PrivateKeyAccount
+  },
   true
 >
 
@@ -45,21 +78,34 @@ export type Simple7702SmartAccountImplementation = SmartAccountImplementation<
  *   owner: '0x...',
  * })
  */
-export async function toSimple7702SmartAccount(
-  parameters: ToSimple7702SmartAccountParameters,
-): Promise<ToSimple7702SmartAccountReturnType> {
-  const {
-    client,
-    implementation = '0xe6Cae83BdE06E4c305530e199D7217f42808555B',
-    getNonce,
-    owner,
-  } = parameters
+export async function toSimple7702SmartAccount<
+  entryPoint extends EntryPoint = '0.8',
+>(
+  parameters: ToSimple7702SmartAccountParameters<entryPoint>,
+): Promise<ToSimple7702SmartAccountReturnType<entryPoint>> {
+  const { client, getNonce, owner } = parameters
+
+  const entryPoint = (() => {
+    if (parameters.entryPoint === '0.9')
+      return {
+        abi: entryPoint09Abi,
+        address: entryPoint09Address,
+        version: '0.9',
+      } as const
+    if (typeof parameters.entryPoint === 'object') return parameters.entryPoint
+    return {
+      abi: entryPoint08Abi,
+      address: entryPoint08Address,
+      version: '0.8',
+    } as const
+  })()
 
-  const entryPoint = {
-    abi: entryPoint08Abi,
-    address: entryPoint08Address,
-    version: '0.8',
-  } as const
+  const implementation = (() => {
+    if (parameters.implementation) return parameters.implementation
+    if (parameters.entryPoint === '0.9')
+      return '0xa46cc63eBF4Bd77888AA327837d20b23A63a56B5'
+    return '0xe6Cae83BdE06E4c305530e199D7217f42808555B'
+  })()
 
   return toSmartAccount({
     authorization: { account: owner, address: implementation },
@@ -150,7 +196,7 @@ export async function toSimple7702SmartAccount(
       })
       return await owner.signTypedData(typedData)
     },
-  })
+  }) as unknown as ToSimple7702SmartAccountReturnType<entryPoint>
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////

package/account-abstraction/actions/bundler/waitForUserOperationReceipt.ts

@@ -121,13 +121,14 @@ export function waitForUserOperationReceipt(
               getUserOperationReceipt,
               'getUserOperationReceipt',
             )({ hash })
+            clearTimeout(timeoutId)
             done(() => emit.resolve(receipt))
           } catch (err) {
             const error = err as GetUserOperationReceiptErrorType
-            if (error.name !== 'UserOperationReceiptNotFoundError')
+            if (error.name !== 'UserOperationReceiptNotFoundError') {
+              clearTimeout(timeoutId)
               done(() => emit.reject(error))
-          } finally {
-            clearTimeout(timeoutId)
+            }
           }
 
           count++

package/actions/getContract.ts

@@ -825,7 +825,7 @@ type GetReadFunction<
     ? ExtractAbiFunction<abi, functionName>
     : AbiFunction,
   //
-  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs']>,
+  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs'], 'inputs', true>,
   _options = Prettify<
     UnionOmit<
       ReadContractParameters<abi, functionName, args>,
@@ -859,7 +859,7 @@ type GetEstimateFunction<
     ? ExtractAbiFunction<abi, functionName>
     : AbiFunction,
   //
-  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs']>,
+  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs'], 'inputs', true>,
   _options = Prettify<
     UnionOmit<
       EstimateContractGasParameters<abi, functionName, args, chain>,
@@ -909,7 +909,7 @@ type GetSimulateFunction<
     ? ExtractAbiFunction<abi, functionName>
     : AbiFunction,
   //
-  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs']>,
+  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs'], 'inputs', true>,
 > = narrowable extends true
   ? <
       chainOverride extends Chain | undefined = undefined,
@@ -1003,7 +1003,7 @@ type GetWriteFunction<
     ? ExtractAbiFunction<abi, functionName>
     : AbiFunction,
   //
-  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs']>,
+  _args = AbiParametersToPrimitiveTypes<abiFunction['inputs'], 'inputs', true>,
   // For making `options` parameter required if `account` or `chain` is undefined
   _isOptionsRequired = Or<[IsUndefined<account>, IsUndefined<chain>]>,
 > = narrowable extends true

package/actions/public/simulateContract.ts

@@ -83,6 +83,8 @@ export type SimulateContractParameters<
   accountOverride extends Account | Address | null | undefined = undefined,
   ///
   derivedChain extends Chain | undefined = DeriveChain<chain, chainOverride>,
+  callParameters extends
+    CallParameters<derivedChain> = CallParameters<derivedChain>,
 > = {
   account?: accountOverride | null | undefined
   chain?: chainOverride | undefined
@@ -95,7 +97,7 @@ export type SimulateContractParameters<
   args
 > &
   UnionOmit<
-    CallParameters<derivedChain>,
+    callParameters,
     | 'account'
     | 'batch'
     | 'code'
@@ -109,9 +111,7 @@ export type SimulateContractParameters<
     abi,
     'nonpayable' | 'payable',
     functionName,
-    CallParameters<derivedChain> extends CallParameters
-      ? CallParameters<derivedChain>['value']
-      : CallParameters['value'],
+    callParameters['value'],
     args
   >
 

package/actions/public/verifyHash.ts

@@ -67,6 +67,8 @@ export type VerifyHashParameters = Pick<
 > & {
   /** The address that signed the original message. */
   address: Address
+  /** The chain to use. */
+  chain?: Chain | null | undefined
   /** The address of the ERC-6492 signature verifier contract. */
   erc6492VerifierAddress?: Address | undefined
   /** The hash to be verified. */
@@ -111,14 +113,17 @@ export async function verifyHash<chain extends Chain | undefined>(
 ): Promise<VerifyHashReturnType> {
   const {
     address,
+    chain = client.chain,
     hash,
     erc6492VerifierAddress:
       verifierAddress = parameters.universalSignatureVerifierAddress ??
-      client.chain?.contracts?.erc6492Verifier?.address,
+      chain?.contracts?.erc6492Verifier?.address,
     multicallAddress = parameters.multicallAddress ??
-      client.chain?.contracts?.multicall3?.address,
+      chain?.contracts?.multicall3?.address,
   } = parameters
 
+  if (chain?.verifyHash) return await chain.verifyHash(client, parameters)
+
   const signature = (() => {
     const signature = parameters.signature
     if (isHex(signature)) return signature
@@ -223,13 +228,13 @@ export async function verifyErc8010(
     args: [
       [
         ...(initData
-          ? [
+          ? ([
               {
                 allowFailure: true,
                 target: to ?? address,
                 callData: initData,
               },
-            ]
+            ] as const)
           : []),
         {
           allowFailure: true,

package/actions/wallet/prepareTransactionRequest.ts

@@ -71,6 +71,7 @@ import {
   getTransactionType,
 } from '../../utils/transaction/getTransactionType.js'
 import {
+  type FillTransactionErrorType,
   type FillTransactionParameters,
   fillTransaction,
 } from '../public/fillTransaction.js'
@@ -267,12 +268,12 @@ export async function prepareTransactionRequest<
   >
 > {
   let request = args as PrepareTransactionRequestParameters
-  const {
-    account: account_ = client.account,
-    chain = client.chain,
-    nonceManager,
-    parameters = defaultParameters,
-  } = request
+
+  request.account ??= client.account
+  request.chain ??= client.chain
+  request.parameters ??= defaultParameters
+
+  const { account: account_, chain, nonceManager, parameters } = request
 
   const prepareTransactionRequest = (() => {
     if (typeof chain?.prepareTransactionRequest === 'function')
@@ -402,7 +403,10 @@ export async function prepareTransactionRequest<
           }
         })
         .catch((e) => {
-          const error = e as BaseError & { cause: BaseError }
+          const error = e as FillTransactionErrorType
+
+          if (error.name !== 'TransactionExecutionError') return request
+
           const unsupported = error.walk?.((e) => {
             const error = e as BaseError
             return (
@@ -411,6 +415,7 @@ export async function prepareTransactionRequest<
             )
           })
           if (unsupported) supportsFillTransaction.set(client.uid, false)
+
           return request
         })
     : request

package/chains/definitions/birdlayer.ts

@@ -1,6 +1,6 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 
-export const birdlayer = defineChain({
+export const birdlayer = /*#__PURE__*/ defineChain({
   id: 53456,
   name: 'BirdLayer',
   nativeCurrency: { decimals: 18, name: 'Ether', symbol: 'ETH' },

package/chains/definitions/bob.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 const sourceId = 1 // mainnet
 
-export const bob = defineChain({
+export const bob = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 60808,
   name: 'BOB',

package/chains/definitions/bobSepolia.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 const sourceId = 11_155_111 // sepolia
 
-export const bobSepolia = defineChain({
+export const bobSepolia = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 808813,
   name: 'BOB Sepolia',

package/chains/definitions/crab.ts

@@ -1,6 +1,6 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 
-export const crab = defineChain({
+export const crab = /*#__PURE__*/ defineChain({
   id: 44,
   name: 'Crab Network',
   nativeCurrency: {

package/chains/definitions/creatorTestnet.ts

@@ -1,6 +1,6 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 
-export const creatorTestnet = defineChain({
+export const creatorTestnet = /*#__PURE__*/ defineChain({
   id: 66665,
   name: 'Creator',
   nativeCurrency: {

package/chains/definitions/datahavenTestnet.ts

@@ -0,0 +1,26 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const datahavenTestnet = /*#__PURE__*/ defineChain({
+  id: 55931,
+  name: 'Datahaven Testnet',
+  nativeCurrency: {
+    decimals: 18,
+    name: 'MOCK',
+    symbol: 'MOCK',
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://services.datahaven-testnet.network/testnet'],
+      webSocket: ['wss://services.datahaven-testnet.network/testnet'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'DhScan',
+      url: 'https://testnet.dhscan.io/',
+      apiUrl: 'https://testnet.dhscan.io/api-docs',
+    },
+  },
+  contracts: {},
+  testnet: true,
+})

package/chains/definitions/dodochainTestnet.ts

@@ -1,6 +1,6 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 
-export const dodochainTestnet = defineChain({
+export const dodochainTestnet = /*#__PURE__*/ defineChain({
   id: 53457,
   name: 'DODOchain Testnet',
   nativeCurrency: { decimals: 18, name: 'DODO', symbol: 'DODO' },

package/chains/definitions/funkiSepolia.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 const sourceId = 11_155_111 // sepolia
 
-export const funkiSepolia = defineChain({
+export const funkiSepolia = /*#__PURE__*/ defineChain({
   ...chainConfig,
   id: 3397901,
   network: 'funkiSepolia',

package/chains/definitions/garnet.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 const sourceId = 17000 // Holesky testnet
 
-export const garnet = defineChain({
+export const garnet = /*#__PURE__*/ defineChain({
   ...chainConfig,
   name: 'Garnet Testnet',
   testnet: true,

package/chains/definitions/koi.ts

@@ -1,6 +1,6 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 
-export const koi = defineChain({
+export const koi = /*#__PURE__*/ defineChain({
   id: 701,
   name: 'Koi Network',
   nativeCurrency: {

package/chains/definitions/omni.ts

@@ -1,6 +1,6 @@
 import { defineChain } from '../../utils/chain/defineChain.js'
 
-export const omni = defineChain({
+export const omni = /*#__PURE__*/ defineChain({
   id: 166,
   name: 'Omni',
   nativeCurrency: { name: 'Omni', symbol: 'OMNI', decimals: 18 },

package/chains/definitions/polygon.ts

@@ -14,7 +14,7 @@ export const polygon = /*#__PURE__*/ defineChain({
     default: {
       name: 'PolygonScan',
       url: 'https://polygonscan.com',
-      apiUrl: 'https://api.polygonscan.com/api',
+      apiUrl: 'https://api.etherscan.io/v2/api',
     },
   },
   contracts: {

package/chains/definitions/polygonAmoy.ts

@@ -13,7 +13,7 @@ export const polygonAmoy = /*#__PURE__*/ defineChain({
     default: {
       name: 'PolygonScan',
       url: 'https://amoy.polygonscan.com',
-      apiUrl: 'https://api-amoy.polygonscan.com/api',
+      apiUrl: 'https://api.etherscan.io/v2/api',
     },
   },
   contracts: {

package/chains/definitions/pyrope.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 const sourceId = 11155111 // Sepolia testnet
 
-export const pyrope = defineChain({
+export const pyrope = /*#__PURE__*/ defineChain({
   ...chainConfig,
   name: 'Pyrope Testnet',
   testnet: true,

package/chains/definitions/redstone.ts

@@ -3,7 +3,7 @@ import { defineChain } from '../../utils/chain/defineChain.js'
 
 const sourceId = 1 // Ethereum mainnet
 
-export const redstone = defineChain({
+export const redstone = /*#__PURE__*/ defineChain({
   ...chainConfig,
   name: 'Redstone',
   id: 690,

package/chains/definitions/skale/skaleBase.ts

@@ -0,0 +1,20 @@
+import { defineChain } from '../../../utils/chain/defineChain.js'
+
+export const skaleBase = /*#__PURE__*/ defineChain({
+  id: 1187947933,
+  name: 'SKALE Base',
+  nativeCurrency: { name: 'Credits', symbol: 'CREDIT', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://skale-base.skalenodes.com/v1/base'],
+      webSocket: ['wss://skale-base.skalenodes.com/v1/ws/base'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'SKALE Explorer',
+      url: 'https://skale-base-explorer.skalenodes.com/',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/skale/skaleBaseSepoliaTestnet.ts

@@ -0,0 +1,22 @@
+import { defineChain } from '../../../utils/chain/defineChain.js'
+
+export const skaleBaseSepoliaTestnet = /*#__PURE__*/ defineChain({
+  id: 324705682,
+  name: 'SKALE Base Sepolia Testnet',
+  nativeCurrency: { name: 'Credits', symbol: 'CREDIT', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://base-sepolia-testnet.skalenodes.com/v1/base-testnet'],
+      webSocket: [
+        'wss://base-sepolia-testnet.skalenodes.com/v1/ws/base-testnet',
+      ],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'SKALE Explorer',
+      url: 'https://base-sepolia-testnet-explorer.skalenodes.com/',
+    },
+  },
+  testnet: true,
+})

package/chains/definitions/somnia.ts

@@ -0,0 +1,20 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const somnia = /*#__PURE__*/ defineChain({
+  id: 5031,
+  name: 'Somnia',
+  nativeCurrency: { name: 'Somnia', symbol: 'SOMI', decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ['https://api.infra.mainnet.somnia.network'],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: 'Somnia Explorer',
+      url: 'https://explorer.somnia.network',
+      apiUrl: 'https://explorer.somnia.network/api',
+    },
+  },
+  testnet: false,
+})

package/chains/definitions/tempoDevnet.ts

@@ -0,0 +1,19 @@
+import { chainConfig } from '../../tempo/chainConfig.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const tempoDevnet = /*#__PURE__*/ defineChain({
+  ...chainConfig,
+  id: 1337,
+  name: 'Tempo Devnet',
+  nativeCurrency: {
+    name: 'USD',
+    symbol: 'USD',
+    decimals: 6,
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.devnet.tempo.xyz'],
+      webSocket: ['wss://rpc.devnet.tempo.xyz'],
+    },
+  },
+})

package/chains/definitions/tempoLocalnet.ts

@@ -0,0 +1,16 @@
+import { chainConfig } from '../../tempo/chainConfig.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const tempoLocalnet = /*#__PURE__*/ defineChain({
+  ...chainConfig,
+  id: 1337,
+  name: 'Tempo',
+  nativeCurrency: {
+    name: 'USD',
+    symbol: 'USD',
+    decimals: 6,
+  },
+  rpcUrls: {
+    default: { http: ['http://localhost:8545'] },
+  },
+})

package/chains/definitions/tempoTestnet.ts

@@ -0,0 +1,25 @@
+import { chainConfig } from '../../tempo/chainConfig.js'
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const tempoTestnet = /*#__PURE__*/ defineChain({
+  ...chainConfig,
+  id: 42429,
+  blockExplorers: {
+    default: {
+      name: 'Tempo Explorer',
+      url: 'https://explore.tempo.xyz',
+    },
+  },
+  name: 'Tempo Testnet',
+  nativeCurrency: {
+    name: 'USD',
+    symbol: 'USD',
+    decimals: 6,
+  },
+  rpcUrls: {
+    default: {
+      http: ['https://rpc.testnet.tempo.xyz'],
+      webSocket: ['wss://rpc.testnet.tempo.xyz'],
+    },
+  },
+})

package/chains/definitions/xrplevm.ts

@@ -0,0 +1,22 @@
+import { defineChain } from '../../utils/chain/defineChain.js'
+
+export const xrplevm = /*#__PURE__*/ defineChain({
+  id: 1440000,
+  name: 'XRPL EVM',
+  nativeCurrency: {
+    name: 'XRP',
+    symbol: 'XRP',
+    decimals: 18,
+  },
+  rpcUrls: {
+    default: { http: ['https://rpc.xrplevm.org'] },
+  },
+  blockExplorers: {
+    default: {
+      name: 'blockscout',
+      url: 'https://explorer.xrplevm.org',
+      apiUrl: 'https://explorer.xrplevm.org/api/v2',
+    },
+  },
+  testnet: false,
+})