viem 0.0.0-main.20240103T193024 → 0.0.0-main.20240103T193934

package/clients/decorators/public.ts

@@ -1,4 +1,4 @@
-import type { Abi, AbiEvent } from 'abitype'
+import type { Abi, AbiEvent, Address } from 'abitype'
 
 import {
   type GetEnsAddressParameters,
@@ -217,6 +217,7 @@ import {
   watchPendingTransactions,
 } from '../../actions/public/watchPendingTransactions.js'
 import {
+  type PrepareTransactionRequestParameterType,
   type PrepareTransactionRequestParameters,
   type PrepareTransactionRequestReturnType,
   prepareTransactionRequest,
@@ -230,7 +231,9 @@ import type { Account } from '../../types/account.js'
 import type { BlockNumber, BlockTag } from '../../types/block.js'
 import type { Chain } from '../../types/chain.js'
 import type {
-  ContractFunctionConfig,
+  ContractEventName,
+  ContractFunctionArgs,
+  ContractFunctionName,
   MaybeAbiEventName,
   MaybeExtractEventArgsFromAbi,
 } from '../../types/contract.js'
@@ -310,7 +313,7 @@ export type PublicActions<
    */
   createContractEventFilter: <
     const TAbi extends Abi | readonly unknown[],
-    TEventName extends string | undefined,
+    TEventName extends ContractEventName<TAbi> | undefined,
     TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName> | undefined,
     TStrict extends boolean | undefined = undefined,
     TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
@@ -437,10 +440,15 @@ export type PublicActions<
    */
   estimateContractGas: <
     TChain extends Chain | undefined,
-    const TAbi extends Abi | readonly unknown[],
-    TFunctionName extends string,
+    const abi extends Abi | readonly unknown[],
+    functionName extends ContractFunctionName<abi, 'nonpayable' | 'payable'>,
+    args extends ContractFunctionArgs<
+      abi,
+      'nonpayable' | 'payable',
+      functionName
+    >,
   >(
-    args: EstimateContractGasParameters<TAbi, TFunctionName, TChain, TAccount>,
+    args: EstimateContractGasParameters<abi, functionName, args, TChain>,
   ) => Promise<EstimateContractGasReturnType>
   /**
    * Estimates the gas necessary to complete a transaction without submitting it to the network.
@@ -466,7 +474,7 @@ export type PublicActions<
    * })
    */
   estimateGas: (
-    args: EstimateGasParameters<TChain, TAccount>,
+    args: EstimateGasParameters<TChain>,
   ) => Promise<EstimateGasReturnType>
   /**
    * Returns the balance of an address in wei.
@@ -647,21 +655,21 @@ export type PublicActions<
    * })
    */
   getContractEvents: <
-    const TAbi extends Abi | readonly unknown[],
-    TEventName extends string | undefined = undefined,
-    TStrict extends boolean | undefined = undefined,
-    TFromBlock extends BlockNumber | BlockTag | undefined = undefined,
-    TToBlock extends BlockNumber | BlockTag | undefined = undefined,
+    const abi extends Abi | readonly unknown[],
+    eventName extends ContractEventName<abi> | undefined = undefined,
+    strict extends boolean | undefined = undefined,
+    fromBlock extends BlockNumber | BlockTag | undefined = undefined,
+    toBlock extends BlockNumber | BlockTag | undefined = undefined,
   >(
     args: GetContractEventsParameters<
-      TAbi,
-      TEventName,
-      TStrict,
-      TFromBlock,
-      TToBlock
+      abi,
+      eventName,
+      strict,
+      fromBlock,
+      toBlock
     >,
   ) => Promise<
-    GetContractEventsReturnType<TAbi, TEventName, TStrict, TFromBlock, TToBlock>
+    GetContractEventsReturnType<abi, eventName, strict, fromBlock, toBlock>
   >
   /**
    * Gets address for ENS name.
@@ -1283,11 +1291,11 @@ export type PublicActions<
    * // [{ result: 424122n, status: 'success' }, { result: 1000000n, status: 'success' }]
    */
   multicall: <
-    TContracts extends ContractFunctionConfig[],
-    TAllowFailure extends boolean = true,
+    const contracts extends readonly unknown[],
+    allowFailure extends boolean = true,
   >(
-    args: MulticallParameters<TContracts, TAllowFailure>,
-  ) => Promise<MulticallReturnType<TContracts, TAllowFailure>>
+    args: MulticallParameters<contracts, allowFailure>,
+  ) => Promise<MulticallReturnType<contracts, allowFailure>>
   /**
    * Prepares a transaction request for signing.
    *
@@ -1327,10 +1335,26 @@ export type PublicActions<
    * })
    */
   prepareTransactionRequest: <
+    TParameterType extends PrepareTransactionRequestParameterType,
     TChainOverride extends Chain | undefined = undefined,
+    TAccountOverride extends Account | Address | undefined = undefined,
   >(
-    args: PrepareTransactionRequestParameters<TChain, TAccount, TChainOverride>,
-  ) => Promise<PrepareTransactionRequestReturnType>
+    args: PrepareTransactionRequestParameters<
+      TChain,
+      TAccount,
+      TChainOverride,
+      TAccountOverride,
+      TParameterType
+    >,
+  ) => Promise<
+    PrepareTransactionRequestReturnType<
+      Chain,
+      TAccount,
+      TChainOverride,
+      TAccountOverride,
+      TParameterType
+    >
+  >
   /**
    * Calls a read-only function on a contract, and returns the response.
    *
@@ -1363,11 +1387,12 @@ export type PublicActions<
    * // 424122n
    */
   readContract: <
-    const TAbi extends Abi | readonly unknown[],
-    TFunctionName extends string,
+    const abi extends Abi | readonly unknown[],
+    functionName extends ContractFunctionName<abi, 'pure' | 'view'>,
+    args extends ContractFunctionArgs<abi, 'pure' | 'view', functionName>,
   >(
-    args: ReadContractParameters<TAbi, TFunctionName>,
-  ) => Promise<ReadContractReturnType<TAbi, TFunctionName>>
+    args: ReadContractParameters<abi, functionName, args>,
+  ) => Promise<ReadContractReturnType<abi, functionName, args>>
   /**
    * Sends a **signed** transaction to the network
    *
@@ -1426,18 +1451,34 @@ export type PublicActions<
    * })
    */
   simulateContract: <
-    const TAbi extends Abi | readonly unknown[],
-    TFunctionName extends string,
-    TChainOverride extends Chain | undefined = undefined,
+    const abi extends Abi | readonly unknown[],
+    functionName extends ContractFunctionName<abi, 'nonpayable' | 'payable'>,
+    args extends ContractFunctionArgs<
+      abi,
+      'nonpayable' | 'payable',
+      functionName
+    >,
+    chainOverride extends Chain | undefined,
+    accountOverride extends Account | Address | undefined = undefined,
   >(
     args: SimulateContractParameters<
-      TAbi,
-      TFunctionName,
+      abi,
+      functionName,
+      args,
       TChain,
-      TChainOverride
+      chainOverride,
+      accountOverride
     >,
   ) => Promise<
-    SimulateContractReturnType<TAbi, TFunctionName, TChain, TChainOverride>
+    SimulateContractReturnType<
+      abi,
+      functionName,
+      args,
+      TChain,
+      TAccount,
+      chainOverride,
+      accountOverride
+    >
   >
   verifyMessage: (
     args: VerifyMessageParameters,
@@ -1604,10 +1645,10 @@ export type PublicActions<
    */
   watchContractEvent: <
     const TAbi extends Abi | readonly unknown[],
-    TEventName extends string,
+    TEventName extends ContractEventName<TAbi>,
     TStrict extends boolean | undefined = undefined,
   >(
-    args: WatchContractEventParameters<TAbi, TEventName, TStrict>,
+    args: WatchContractEventParameters<TAbi, TEventName, TStrict, TTransport>,
   ) => WatchContractEventReturnType
   /**
    * Watches and returns emitted [Event Logs](https://viem.sh/docs/glossary/terms.html#event-log).
@@ -1648,7 +1689,7 @@ export type PublicActions<
       | undefined = TAbiEvent extends AbiEvent ? [TAbiEvent] : undefined,
     TStrict extends boolean | undefined = undefined,
   >(
-    args: WatchEventParameters<TAbiEvent, TAbiEvents, TStrict>,
+    args: WatchEventParameters<TAbiEvent, TAbiEvents, TStrict, TTransport>,
   ) => WatchEventReturnType
   /**
    * Watches and returns pending transaction hashes.
@@ -1727,7 +1768,7 @@ export function publicActions<
       getTransactionConfirmations(client, args),
     getTransactionCount: (args) => getTransactionCount(client, args),
     getTransactionReceipt: (args) => getTransactionReceipt(client, args),
-    multicall: (args) => multicall(client, args as any) as any,
+    multicall: (args) => multicall(client, args),
     prepareTransactionRequest: (args) =>
       prepareTransactionRequest(client as any, args as any),
     readContract: (args) => readContract(client, args),

package/clients/decorators/wallet.ts

@@ -1,4 +1,4 @@
-import type { Abi, TypedData } from 'abitype'
+import type { Abi, Address, TypedData } from 'abitype'
 
 import type { Account } from '../../accounts/types.js'
 import {
@@ -23,6 +23,7 @@ import {
   getPermissions,
 } from '../../actions/wallet/getPermissions.js'
 import {
+  type PrepareTransactionRequestParameterType,
   type PrepareTransactionRequestParameters,
   type PrepareTransactionRequestReturnType,
   prepareTransactionRequest,
@@ -76,6 +77,10 @@ import {
   writeContract,
 } from '../../actions/wallet/writeContract.js'
 import type { Chain } from '../../types/chain.js'
+import {
+  type ContractFunctionArgs,
+  type ContractFunctionName,
+} from '../../types/contract.js'
 import type { Client } from '../createClient.js'
 import type { Transport } from '../transports/createTransport.js'
 
@@ -127,10 +132,10 @@ export type WalletActions<
    * })
    */
   deployContract: <
-    const TAbi extends Abi | readonly unknown[],
-    TChainOverride extends Chain | undefined = undefined,
+    const abi extends Abi | readonly unknown[],
+    chainOverride extends Chain | undefined,
   >(
-    args: DeployContractParameters<TAbi, TChain, TAccount, TChainOverride>,
+    args: DeployContractParameters<abi, TChain, TAccount, chainOverride>,
   ) => Promise<DeployContractReturnType>
   /**
    * Returns a list of account addresses owned by the wallet or client.
@@ -229,10 +234,26 @@ export type WalletActions<
    * })
    */
   prepareTransactionRequest: <
+    TParameterType extends PrepareTransactionRequestParameterType,
     TChainOverride extends Chain | undefined = undefined,
+    TAccountOverride extends Account | Address | undefined = undefined,
   >(
-    args: PrepareTransactionRequestParameters<TChain, TAccount, TChainOverride>,
-  ) => Promise<PrepareTransactionRequestReturnType>
+    args: PrepareTransactionRequestParameters<
+      TChain,
+      TAccount,
+      TChainOverride,
+      TAccountOverride,
+      TParameterType
+    >,
+  ) => Promise<
+    PrepareTransactionRequestReturnType<
+      Chain,
+      TAccount,
+      TChainOverride,
+      TAccountOverride,
+      TParameterType
+    >
+  >
   /**
    * Requests a list of accounts managed by a wallet.
    *
@@ -441,7 +462,7 @@ export type WalletActions<
    * })
    * const signature = await client.signTransaction(request)
    */
-  signTransaction: <TChainOverride extends Chain | undefined = undefined>(
+  signTransaction: <TChainOverride extends Chain | undefined>(
     args: SignTransactionParameters<TChain, TAccount, TChainOverride>,
   ) => Promise<SignTransactionReturnType>
   /**
@@ -640,13 +661,15 @@ export type WalletActions<
    * const hash = await client.writeContract(request)
    */
   writeContract: <
-    const TAbi extends Abi | readonly unknown[],
-    TFunctionName extends string,
+    const abi extends Abi | readonly unknown[],
+    functionName extends ContractFunctionName<abi, 'payable' | 'nonpayable'>,
+    args extends ContractFunctionArgs<abi, 'pure' | 'view', functionName>,
     TChainOverride extends Chain | undefined = undefined,
   >(
     args: WriteContractParameters<
-      TAbi,
-      TFunctionName,
+      abi,
+      functionName,
+      args,
       TChain,
       TAccount,
       TChainOverride
@@ -678,6 +701,6 @@ export function walletActions<
     signTypedData: (args) => signTypedData(client, args),
     switchChain: (args) => switchChain(client, args),
     watchAsset: (args) => watchAsset(client, args),
-    writeContract: (args) => writeContract(client, args),
+    writeContract: (args) => writeContract(client, args as any),
   }
 }

package/clients/transports/fallback.ts

@@ -1,6 +1,9 @@
+import {
+  TransactionRejectedRpcError,
+  UserRejectedRequestError,
+} from '../../errors/rpc.js'
 import type { ErrorType } from '../../errors/utils.js'
 import type { Chain } from '../../types/chain.js'
-import { isDeterministicError } from '../../utils/buildRequest.js'
 import { wait } from '../../utils/wait.js'
 
 import {
@@ -96,7 +99,7 @@ export function fallback(
     retryCount,
     retryDelay,
   } = config
-  return ({ chain, pollingInterval = 4_000, timeout }) => {
+  return ({ chain, pollingInterval = 4_000, timeout, ...rest }) => {
     let transports = transports_
 
     let onResponse: OnResponseFn = () => {}
@@ -107,7 +110,12 @@ export function fallback(
         name,
         async request({ method, params }) {
           const fetch = async (i = 0): Promise<any> => {
-            const transport = transports[i]({ chain, retryCount: 0, timeout })
+            const transport = transports[i]({
+              ...rest,
+              chain,
+              retryCount: 0,
+              timeout,
+            })
             try {
               const response = await transport.request({
                 method,
@@ -132,9 +140,7 @@ export function fallback(
                 status: 'error',
               })
 
-              // If the error is deterministic, we don't need to fall back.
-              // So throw the error.
-              if (isDeterministicError(err as Error)) throw err
+              if (shouldThrow(err as Error)) throw err
 
               // If we've reached the end of the fallbacks, throw the error.
               if (i === transports.length - 1) throw err
@@ -171,6 +177,18 @@ export function fallback(
   }
 }
 
+function shouldThrow(error: Error) {
+  if ('code' in error && typeof error.code === 'number') {
+    if (
+      error.code === TransactionRejectedRpcError.code ||
+      error.code === UserRejectedRequestError.code ||
+      error.code === 5000 // CAIP UserRejectedRequestError
+    )
+      return true
+  }
+  return false
+}
+
 export function rankTransports({
   chain,
   interval = 4_000,