viem 2.0.0-beta.6 → 2.0.0-beta.8

package/clients/decorators/public.ts

@@ -217,6 +217,7 @@ import {
   watchPendingTransactions,
 } from '../../actions/public/watchPendingTransactions.js'
 import {
+  type ParameterType,
   type PrepareTransactionRequestParameters,
   type PrepareTransactionRequestReturnType,
   prepareTransactionRequest,
@@ -447,13 +448,7 @@ export type PublicActions<
       functionName
     >,
   >(
-    args: EstimateContractGasParameters<
-      abi,
-      functionName,
-      args,
-      TChain,
-      TAccount
-    >,
+    args: EstimateContractGasParameters<abi, functionName, args, TChain>,
   ) => Promise<EstimateContractGasReturnType>
   /**
    * Estimates the gas necessary to complete a transaction without submitting it to the network.
@@ -479,7 +474,7 @@ export type PublicActions<
    * })
    */
   estimateGas: (
-    args: EstimateGasParameters<TChain, TAccount>,
+    args: EstimateGasParameters<TChain>,
   ) => Promise<EstimateGasReturnType>
   /**
    * Returns the balance of an address in wei.
@@ -520,7 +515,7 @@ export type PublicActions<
    * Returns information about a block at a block number, hash, or tag.
    *
    * - Docs: https://viem.sh/docs/actions/public/getBlock.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/blocks/fetching-blocks
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/blocks/fetching-blocks
    * - JSON-RPC Methods:
    *   - Calls [`eth_getBlockByNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getblockbynumber) for `blockNumber` & `blockTag`.
    *   - Calls [`eth_getBlockByHash`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getblockbyhash) for `blockHash`.
@@ -548,7 +543,7 @@ export type PublicActions<
    * Returns the number of the most recent block seen.
    *
    * - Docs: https://viem.sh/docs/actions/public/getBlockNumber.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/blocks/fetching-blocks
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/blocks/fetching-blocks
    * - JSON-RPC Methods: [`eth_blockNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_blocknumber)
    *
    * @param args - {@link GetBlockNumberParameters}
@@ -680,7 +675,7 @@ export type PublicActions<
    * Gets address for ENS name.
    *
    * - Docs: https://viem.sh/docs/ens/actions/getEnsAddress.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
    *
    * @remarks
    * Calls `resolve(bytes, bytes)` on ENS Universal Resolver Contract.
@@ -700,7 +695,7 @@ export type PublicActions<
    *   transport: http(),
    * })
    * const ensAddress = await client.getEnsAddress({
-   *   name: normalize('wagmi-dev.eth'),
+   *   name: normalize('wevm.eth'),
    * })
    * // '0xd2135CfB216b74109775236E36d4b433F1DF507B'
    */
@@ -711,7 +706,7 @@ export type PublicActions<
    * Gets the avatar of an ENS name.
    *
    * - Docs: https://viem.sh/docs/ens/actions/getEnsAvatar.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
    *
    * @remarks
    * Calls [`getEnsText`](https://viem.sh/docs/ens/actions/getEnsText.html) with `key` set to `'avatar'`.
@@ -731,7 +726,7 @@ export type PublicActions<
    *   transport: http(),
    * })
    * const ensAvatar = await client.getEnsAvatar({
-   *   name: normalize('wagmi-dev.eth'),
+   *   name: normalize('wevm.eth'),
    * })
    * // 'https://ipfs.io/ipfs/Qma8mnp6xV3J2cRNf3mTth5C8nV11CAnceVinc3y8jSbio'
    */
@@ -742,7 +737,7 @@ export type PublicActions<
    * Gets primary name for specified address.
    *
    * - Docs: https://viem.sh/docs/ens/actions/getEnsName.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
    *
    * @remarks
    * Calls `reverse(bytes)` on ENS Universal Resolver Contract to "reverse resolve" the address to the primary ENS name.
@@ -761,14 +756,14 @@ export type PublicActions<
    * const ensName = await client.getEnsName({
    *   address: '0xd2135CfB216b74109775236E36d4b433F1DF507B',
    * })
-   * // 'wagmi-dev.eth'
+   * // 'wevm.eth'
    */
   getEnsName: (args: GetEnsNameParameters) => Promise<GetEnsNameReturnType>
   /**
    * Gets resolver for ENS name.
    *
    * - Docs: https://viem.sh/docs/ens/actions/getEnsResolver.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
    *
    * @remarks
    * Calls `findResolver(bytes)` on ENS Universal Resolver Contract to retrieve the resolver of an ENS name.
@@ -788,7 +783,7 @@ export type PublicActions<
    *   transport: http(),
    * })
    * const resolverAddress = await client.getEnsResolver({
-   *   name: normalize('wagmi-dev.eth'),
+   *   name: normalize('wevm.eth'),
    * })
    * // '0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41'
    */
@@ -799,7 +794,7 @@ export type PublicActions<
    * Gets a text record for specified ENS name.
    *
    * - Docs: https://viem.sh/docs/ens/actions/getEnsResolver.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/ens
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/ens
    *
    * @remarks
    * Calls `resolve(bytes, bytes)` on ENS Universal Resolver Contract.
@@ -819,7 +814,7 @@ export type PublicActions<
    *   transport: http(),
    * })
    * const twitterRecord = await client.getEnsText({
-   *   name: normalize('wagmi-dev.eth'),
+   *   name: normalize('wevm.eth'),
    *   key: 'com.twitter',
    * })
    * // 'wagmi_sh'
@@ -1047,7 +1042,7 @@ export type PublicActions<
    * Returns a list of event logs matching the provided parameters.
    *
    * - Docs: https://viem.sh/docs/actions/public/getLogs.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/filters-and-logs/event-logs
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/filters-and-logs/event-logs
    * - JSON-RPC Methods: [`eth_getLogs`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getlogs)
    *
    * @param args - {@link GetLogsParameters}
@@ -1163,7 +1158,7 @@ export type PublicActions<
    * Returns information about a [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) given a hash or block identifier.
    *
    * - Docs: https://viem.sh/docs/actions/public/getTransaction.html
-   * - Example: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/fetching-transactions
+   * - Example: https://stackblitz.com/github/wevm/viem/tree/main/examples/transactions/fetching-transactions
    * - JSON-RPC Methods: [`eth_getTransactionByHash`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getTransactionByHash)
    *
    * @param args - {@link GetTransactionParameters}
@@ -1188,7 +1183,7 @@ export type PublicActions<
    * Returns the number of blocks passed (confirmations) since the transaction was processed on a block.
    *
    * - Docs: https://viem.sh/docs/actions/public/getTransactionConfirmations.html
-   * - Example: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/fetching-transactions
+   * - Example: https://stackblitz.com/github/wevm/viem/tree/main/examples/transactions/fetching-transactions
    * - JSON-RPC Methods: [`eth_getTransactionConfirmations`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getTransactionConfirmations)
    *
    * @param args - {@link GetTransactionConfirmationsParameters}
@@ -1237,7 +1232,7 @@ export type PublicActions<
    * Returns the [Transaction Receipt](https://viem.sh/docs/glossary/terms.html#transaction-receipt) given a [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) hash.
    *
    * - Docs: https://viem.sh/docs/actions/public/getTransactionReceipt.html
-   * - Example: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/fetching-transactions
+   * - Example: https://stackblitz.com/github/wevm/viem/tree/main/examples/transactions/fetching-transactions
    * - JSON-RPC Methods: [`eth_getTransactionReceipt`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getTransactionReceipt)
    *
    * @param args - {@link GetTransactionReceiptParameters}
@@ -1340,15 +1335,31 @@ export type PublicActions<
    * })
    */
   prepareTransactionRequest: <
+    TParameterType extends ParameterType,
     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.
    *
    * - Docs: https://viem.sh/docs/contract/readContract.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/reading-contracts
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/contracts/reading-contracts
    *
    * @remarks
    * A "read-only" function (constant function) on a Solidity contract is denoted by a `view` or `pure` keyword. They can only read the state of the contract, and cannot make any changes to it. Since read-only methods do not change the state of the contract, they do not require any gas to be executed, and can be called by any user without the need to pay for gas.
@@ -1413,7 +1424,7 @@ export type PublicActions<
    * Simulates/validates a contract interaction. This is useful for retrieving **return data** and **revert reasons** of contract write functions.
    *
    * - Docs: https://viem.sh/docs/contract/simulateContract.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/writing-to-contracts
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/contracts/writing-to-contracts
    *
    * @remarks
    * This function does not require gas to execute and _**does not**_ change the state of the blockchain. It is almost identical to [`readContract`](https://viem.sh/docs/contract/readContract.html), but also supports contract write functions.
@@ -1504,7 +1515,7 @@ export type PublicActions<
    * Waits for the [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) to be included on a [Block](https://viem.sh/docs/glossary/terms.html#block) (one confirmation), and then returns the [Transaction Receipt](https://viem.sh/docs/glossary/terms.html#transaction-receipt). If the Transaction reverts, then the action will throw an error.
    *
    * - Docs: https://viem.sh/docs/actions/public/waitForTransactionReceipt.html
-   * - Example: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/sending-transactions
+   * - Example: https://stackblitz.com/github/wevm/viem/tree/main/examples/transactions/sending-transactions
    * - JSON-RPC Methods:
    *   - Polls [`eth_getTransactionReceipt`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getTransactionReceipt) on each block until it has been processed.
    *   - If a Transaction has been replaced:
@@ -1545,7 +1556,7 @@ export type PublicActions<
    * Watches and returns incoming block numbers.
    *
    * - Docs: https://viem.sh/docs/actions/public/watchBlockNumber.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/blocks/watching-blocks
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/blocks/watching-blocks
    * - JSON-RPC Methods:
    *   - When `poll: true`, calls [`eth_blockNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_blocknumber) on a polling interval.
    *   - When `poll: false` & WebSocket Transport, uses a WebSocket subscription via [`eth_subscribe`](https://docs.alchemy.com/reference/eth-subscribe-polygon) and the `"newHeads"` event.
@@ -1572,7 +1583,7 @@ export type PublicActions<
    * Watches and returns information for incoming blocks.
    *
    * - Docs: https://viem.sh/docs/actions/public/watchBlocks.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/blocks/watching-blocks
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/blocks/watching-blocks
    * - JSON-RPC Methods:
    *   - When `poll: true`, calls [`eth_getBlockByNumber`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getBlockByNumber) on a polling interval.
    *   - When `poll: false` & WebSocket Transport, uses a WebSocket subscription via [`eth_subscribe`](https://docs.alchemy.com/reference/eth-subscribe-polygon) and the `"newHeads"` event.

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 ParameterType,
   type PrepareTransactionRequestParameters,
   type PrepareTransactionRequestReturnType,
   prepareTransactionRequest,
@@ -109,7 +110,7 @@ export type WalletActions<
    * Deploys a contract to the network, given bytecode and constructor arguments.
    *
    * - Docs: https://viem.sh/docs/contract/deployContract.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/deploying-contracts
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/contracts/deploying-contracts
    *
    * @param args - {@link DeployContractParameters}
    * @returns The [Transaction](https://viem.sh/docs/glossary/terms.html#transaction) hash. {@link DeployContractReturnType}
@@ -232,9 +233,27 @@ export type WalletActions<
    *   value: 1n,
    * })
    */
-  prepareTransactionRequest: <TChainOverride extends Chain | undefined>(
-    args: PrepareTransactionRequestParameters<TChain, TAccount, TChainOverride>,
-  ) => Promise<PrepareTransactionRequestReturnType>
+  prepareTransactionRequest: <
+    TParameterType extends ParameterType,
+    TChainOverride extends Chain | undefined = undefined,
+    TAccountOverride extends Account | Address | undefined = undefined,
+  >(
+    args: PrepareTransactionRequestParameters<
+      TChain,
+      TAccount,
+      TChainOverride,
+      TAccountOverride,
+      TParameterType
+    >,
+  ) => Promise<
+    PrepareTransactionRequestReturnType<
+      Chain,
+      TAccount,
+      TChainOverride,
+      TAccountOverride,
+      TParameterType
+    >
+  >
   /**
    * Requests a list of accounts managed by a wallet.
    *
@@ -313,7 +332,7 @@ export type WalletActions<
    * Creates, signs, and sends a new transaction to the network.
    *
    * - Docs: https://viem.sh/docs/actions/wallet/sendTransaction.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/transactions/sending-transactions
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/transactions/sending-transactions
    * - JSON-RPC Methods:
    *   - JSON-RPC Accounts: [`eth_sendTransaction`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_sendtransaction)
    *   - Local Accounts: [`eth_sendRawTransaction`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_sendrawtransaction)
@@ -598,7 +617,7 @@ export type WalletActions<
    * Executes a write function on a contract.
    *
    * - Docs: https://viem.sh/docs/contract/writeContract.html
-   * - Examples: https://stackblitz.com/github/wagmi-dev/viem/tree/main/examples/contracts/writing-to-contracts
+   * - Examples: https://stackblitz.com/github/wevm/viem/tree/main/examples/contracts/writing-to-contracts
    *
    * A "write" function on a Solidity contract modifies the state of the blockchain. These types of functions require gas to be executed, and hence a [Transaction](https://viem.sh/docs/glossary/terms.html) is needed to be broadcast in order to change the state.
    *

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,

package/errors/base.ts

@@ -32,8 +32,8 @@ export class BaseError extends Error {
       args.cause instanceof BaseError
         ? args.cause.details
         : args.cause?.message
-        ? args.cause.message
-        : args.details!
+          ? args.cause.message
+          : args.details!
     const docsPath =
       args.cause instanceof BaseError
         ? args.cause.docsPath || args.docsPath

package/errors/estimateGas.ts

@@ -29,7 +29,7 @@ export class EstimateGasExecutionError extends BaseError {
       nonce,
       to,
       value,
-    }: Omit<EstimateGasParameters<any, any>, 'account'> & {
+    }: Omit<EstimateGasParameters<any>, 'account'> & {
       account?: Account
       chain?: Chain
       docsPath?: string

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-beta.6'
+export const version = '2.0.0-beta.8'

package/index.ts

@@ -397,7 +397,8 @@ export type {
   ChainFeesFnParameters,
   ChainFormatter,
   ChainEstimateFeesPerGasFnParameters,
-  GetChain,
+  DeriveChain,
+  GetChainParameter,
   ChainFormatters,
   ChainSerializers,
   ExtractChainFormatterExclude,

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.8",
+  "type": "module",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",
@@ -76,27 +77,13 @@
   },
   "typesVersions": {
     "*": {
-      "accounts": [
-        "./_types/accounts/index.d.ts"
-      ],
-      "actions": [
-        "./_types/actions/index.d.ts"
-      ],
-      "chains": [
-        "./_types/chains/index.d.ts"
-      ],
-      "chains/utils": [
-        "./_types/chains/utils.d.ts"
-      ],
-      "ens": [
-        "./_types/ens/index.d.ts"
-      ],
-      "utils": [
-        "./_types/utils/index.d.ts"
-      ],
-      "window": [
-        "./_types/window/index.d.ts"
-      ]
+      "accounts": ["./_types/accounts/index.d.ts"],
+      "actions": ["./_types/actions/index.d.ts"],
+      "chains": ["./_types/chains/index.d.ts"],
+      "chains/utils": ["./_types/chains/utils.d.ts"],
+      "ens": ["./_types/ens/index.d.ts"],
+      "utils": ["./_types/utils/index.d.ts"],
+      "window": ["./_types/window/index.d.ts"]
     }
   },
   "peerDependencies": {
@@ -108,7 +95,7 @@
     }
   },
   "dependencies": {
-    "@adraffy/ens-normalize": "1.9.4",
+    "@adraffy/ens-normalize": "1.10.0",
     "@noble/curves": "1.2.0",
     "@noble/hashes": "1.3.2",
     "@scure/bip32": "1.3.2",
@@ -119,22 +106,13 @@
   },
   "license": "MIT",
   "homepage": "https://viem.sh",
-  "repository": "wagmi-dev/viem",
-  "authors": [
-    "awkweb.eth",
-    "jxom.eth"
-  ],
+  "repository": "wevm/viem",
+  "authors": ["awkweb.eth", "jxom.eth"],
   "funding": [
     {
       "type": "github",
-      "url": "https://github.com/sponsors/wagmi-dev"
+      "url": "https://github.com/sponsors/wevm"
     }
   ],
-  "keywords": [
-    "eth",
-    "ethereum",
-    "dapps",
-    "wallet",
-    "web3"
-  ]
-}
+  "keywords": ["eth", "ethereum", "dapps", "wallet", "web3"]
+}

package/types/account.ts

@@ -4,11 +4,20 @@ import type { Account, JsonRpcAccount } from '../accounts/types.js'
 
 import type { IsUndefined, Prettify } from './utils.js'
 
+export type DeriveAccount<
+  account extends Account | undefined,
+  accountOverride extends Account | Address | undefined,
+> = accountOverride extends Account ? accountOverride : account
+
 export type GetAccountParameter<
   TAccount extends Account | undefined = Account | undefined,
+  TAccountOverride extends Account | Address | undefined = Account | Address,
+  TRequired extends boolean = true,
 > = IsUndefined<TAccount> extends true
-  ? { account: Account | Address }
-  : { account?: Account | Address }
+  ? TRequired extends true
+    ? { account: TAccountOverride }
+    : { account?: TAccountOverride }
+  : { account?: TAccountOverride }
 
 export type ParseAccount<
   TAccountOrAddress extends Account | Address | undefined =

package/types/chain.ts

@@ -30,7 +30,7 @@ export type Chain<
         {
           [key: string]:
             | ChainContract
-            | { [chainId: number]: ChainContract | undefined }
+            | { [sourceId: number]: ChainContract | undefined }
             | undefined
         } & {
           ensRegistry?: ChainContract | undefined
@@ -63,7 +63,7 @@ export type Chain<
   /** Modifies how data (ie. Transactions) is serialized. */
   serializers?: ChainSerializers<formatters> | undefined
   /** Modifies how fees are derived. */
-  fees?: ChainFees<formatters> | undefined
+  fees?: ChainFees<formatters | undefined> | undefined
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -168,7 +168,9 @@ export type ChainFeesFnParameters<
   formatters extends ChainFormatters | undefined = ChainFormatters | undefined,
 > = {
   /** The latest block. */
-  block: Prettify<FormattedBlock<{ formatters: formatters }>>
+  block: Prettify<
+    FormattedBlock<Omit<Chain, 'formatters'> & { formatters: formatters }>
+  >
   client: Client<Transport, Chain>
   /**
    * A transaction request. This value will be undefined if the caller
@@ -206,7 +208,7 @@ export type ExtractChain<
 > = Extract<chains[number], { id: chainId }>
 
 export type ExtractChainFormatterExclude<
-  chain extends { formatters?: Chain['formatters'] } | undefined,
+  chain extends Chain | undefined,
   type extends keyof ChainFormatters,
 > = chain extends { formatters?: infer _Formatters extends ChainFormatters }
   ? _Formatters[type] extends { exclude: infer Exclude }
@@ -215,7 +217,7 @@ export type ExtractChainFormatterExclude<
   : ''
 
 export type ExtractChainFormatterParameters<
-  chain extends { formatters?: Chain['formatters'] } | undefined,
+  chain extends Chain | undefined,
   type extends keyof ChainFormatters,
   fallback,
 > = chain extends { formatters?: infer _Formatters extends ChainFormatters }
@@ -225,18 +227,27 @@ export type ExtractChainFormatterParameters<
   : fallback
 
 export type ExtractChainFormatterReturnType<
-  chain extends { formatters?: Chain['formatters'] } | undefined,
+  chain extends Chain | undefined,
   type extends keyof ChainFormatters,
   fallback,
-> = chain extends { formatters?: infer _Formatters extends ChainFormatters }
-  ? _Formatters[type] extends ChainFormatter
-    ? ReturnType<_Formatters[type]['format']>
-    : fallback
+> = chain extends {
+  formatters?:
+    | { [_ in type]?: infer formatter extends ChainFormatter }
+    | undefined
+}
+  ? chain['formatters'] extends undefined
+    ? fallback
+    : ReturnType<formatter['format']>
   : fallback
 
-export type GetChain<
+export type DeriveChain<
+  chain extends Chain | undefined,
+  chainOverride extends Chain | undefined,
+> = chainOverride extends Chain ? chainOverride : chain
+
+export type GetChainParameter<
   chain extends Chain | undefined,
-  chainOverride extends Chain | undefined = undefined,
+  chainOverride extends Chain | undefined = Chain | undefined,
 > = IsUndefined<chain> extends true
   ? { chain: chainOverride | null }
   : { chain?: chainOverride | null | undefined }