viem 2.0.0-beta.1 → 2.0.0-beta.10

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
+  "type": "module",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",
@@ -32,6 +33,11 @@
       "import": "./_esm/actions/index.js",
       "default": "./_cjs/actions/index.js"
     },
+    "./celo": {
+      "types": "./_types/chains/celo/index.d.ts",
+      "import": "./_esm/chains/celo/index.js",
+      "default": "./_cjs/chains/celo/index.js"
+    },
     "./chains": {
       "types": "./_types/chains/index.d.ts",
       "import": "./_esm/chains/index.js",
@@ -47,6 +53,11 @@
       "import": "./_esm/ens/index.js",
       "default": "./_cjs/ens/index.js"
     },
+    "./op-stack": {
+      "types": "./_types/chains/opStack/index.d.ts",
+      "import": "./_esm/chains/opStack/index.js",
+      "default": "./_cjs/chains/opStack/index.js"
+    },
     "./utils": {
       "types": "./_types/utils/index.d.ts",
       "import": "./_esm/utils/index.js",
@@ -57,31 +68,22 @@
       "import": "./_esm/window/index.js",
       "default": "./_cjs/window/index.js"
     },
+    "./zksync": {
+      "types": "./_types/chains/zksync/index.d.ts",
+      "import": "./_esm/chains/zksync/index.js",
+      "default": "./_cjs/chains/zksync/index.js"
+    },
     "./package.json": "./package.json"
   },
   "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": {
@@ -93,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",
@@ -104,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 }

package/types/contract.ts

@@ -138,8 +138,8 @@ export type Widen<type> =
       ? type extends ResolvedRegister['AddressType']
         ? ResolvedRegister['AddressType']
         : type extends ResolvedRegister['BytesType']['inputs']
-        ? ResolvedRegister['BytesType']
-        : string
+          ? ResolvedRegister['BytesType']
+          : string
       : never)
   | (type extends readonly [] ? readonly [] : never)
   | (type extends Record<string, unknown>
@@ -153,6 +153,8 @@ export type Widen<type> =
         : never
       : never)
 
+export type UnionWiden<type> = type extends any ? Widen<type> : never
+
 export type ExtractAbiFunctionForArgs<
   abi extends Abi,
   mutability extends AbiStateMutability,
@@ -164,7 +166,8 @@ export type ExtractAbiFunctionForArgs<
   mutability
 > extends infer abiFunction extends AbiFunction
   ? IsUnion<abiFunction> extends true // narrow overloads using `args` by converting to tuple and filtering out overloads that don't match
-    ? UnionToTuple<abiFunction> extends infer abiFunctions extends readonly AbiFunction[]
+    ? UnionToTuple<abiFunction> extends infer abiFunctions extends
+        readonly AbiFunction[]
       ? {
           [k in keyof abiFunctions]: (
             readonly [] extends args
@@ -204,7 +207,7 @@ export type ContractFunctionParameters<
   functionName:
     | allFunctionNames // show all options
     | (functionName extends allFunctionNames ? functionName : never) // infer value
-  args?: (abi extends Abi ? Widen<args> : never) | allArgs | undefined
+  args?: (abi extends Abi ? UnionWiden<args> : never) | allArgs | undefined
 } & (readonly [] extends allArgs ? {} : { args: Widen<args> })
 
 export type ContractFunctionReturnType<
@@ -223,19 +226,19 @@ export type ContractFunctionReturnType<
   ? Abi extends abi
     ? unknown
     : AbiParametersToPrimitiveTypes<
-        ExtractAbiFunctionForArgs<
-          abi,
-          mutability,
-          functionName,
-          args
-        >['outputs']
-      > extends infer types
-    ? types extends readonly []
-      ? void
-      : types extends readonly [infer type]
-      ? type
-      : types
-    : never
+          ExtractAbiFunctionForArgs<
+            abi,
+            mutability,
+            functionName,
+            args
+          >['outputs']
+        > extends infer types
+      ? types extends readonly []
+        ? void
+        : types extends readonly [infer type]
+          ? type
+          : types
+      : never
   : unknown
 
 export type AbiItem = Abi[number]
@@ -306,8 +309,8 @@ export type GetValue<
   ? TAbiFunction['stateMutability'] extends 'payable'
     ? { value?: NoUndefined<TValueType> }
     : TAbiFunction['payable'] extends true
-    ? { value?: NoUndefined<TValueType> }
-    : { value?: never }
+      ? { value?: NoUndefined<TValueType> }
+      : { value?: never }
   : { value?: TValueType }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -363,49 +366,48 @@ export type AbiEventParametersToPrimitiveTypes<
 > = TAbiParameters extends readonly []
   ? readonly []
   : Filter<
-      TAbiParameters,
-      Options['IndexedOnly'] extends true ? { indexed: true } : object
-    > extends infer Filtered extends readonly AbiParameter[]
-  ? _HasUnnamedAbiParameter<Filtered> extends true
-    ? // Has unnamed tuple parameters so return as array
-        | readonly [
-            ...{
-              [K in keyof Filtered]: AbiEventParameterToPrimitiveType<
-                Filtered[K],
-                Options
-              >
-            },
-          ]
-        // Distribute over tuple to represent optional parameters
-        | (Options['Required'] extends true
-            ? never
-            : // Distribute over tuple to represent optional parameters
-            Filtered extends readonly [
-                ...infer Head extends readonly AbiParameter[],
-                infer _,
-              ]
-            ? AbiEventParametersToPrimitiveTypes<
-                readonly [...{ [K in keyof Head]: Omit<Head[K], 'name'> }],
-                Options
-              >
-            : never)
-    : // All tuple parameters are named so return as object
-    {
-        [Parameter in
-          Filtered[number] as Parameter extends {
-            name: infer Name extends string
-          }
-            ? Name
-            : never]?: AbiEventParameterToPrimitiveType<Parameter, Options>
-      } extends infer Mapped
-    ? Prettify<
-        MaybeRequired<
-          Mapped,
-          Options['Required'] extends boolean ? Options['Required'] : false
-        >
-      >
+        TAbiParameters,
+        Options['IndexedOnly'] extends true ? { indexed: true } : object
+      > extends infer Filtered extends readonly AbiParameter[]
+    ? _HasUnnamedAbiParameter<Filtered> extends true
+      ? // Has unnamed tuple parameters so return as array
+          | readonly [
+              ...{
+                [K in keyof Filtered]: AbiEventParameterToPrimitiveType<
+                  Filtered[K],
+                  Options
+                >
+              },
+            ]
+          // Distribute over tuple to represent optional parameters
+          | (Options['Required'] extends true
+              ? never
+              : // Distribute over tuple to represent optional parameters
+                Filtered extends readonly [
+                    ...infer Head extends readonly AbiParameter[],
+                    infer _,
+                  ]
+                ? AbiEventParametersToPrimitiveTypes<
+                    readonly [...{ [K in keyof Head]: Omit<Head[K], 'name'> }],
+                    Options
+                  >
+                : never)
+      : // All tuple parameters are named so return as object
+        {
+            [Parameter in Filtered[number] as Parameter extends {
+              name: infer Name extends string
+            }
+              ? Name
+              : never]?: AbiEventParameterToPrimitiveType<Parameter, Options>
+          } extends infer Mapped
+        ? Prettify<
+            MaybeRequired<
+              Mapped,
+              Options['Required'] extends boolean ? Options['Required'] : false
+            >
+          >
+        : never
     : never
-  : never
 
 // TODO: Speed up by returning immediately as soon as named parameter is found.
 type _HasUnnamedAbiParameter<TAbiParameters extends readonly AbiParameter[]> =
@@ -429,10 +431,10 @@ export type LogTopicType<
 > = TTopic extends Hex
   ? TPrimitiveType
   : TTopic extends Hex[]
-  ? TPrimitiveType[]
-  : TTopic extends null
-  ? null
-  : never
+    ? TPrimitiveType[]
+    : TTopic extends null
+      ? null
+      : never
 
 /**
  * @internal

package/types/eip1193.ts

@@ -709,6 +709,14 @@ export type TestRpcSchema<TMode extends string> = [
     Parameters: [hash: Hash]
     ReturnType: void
   },
+  /**
+   * @description Serializes the current state (including contracts code, contract's storage, accounts properties, etc.) into a savable data blob.
+   */
+  {
+    Method: `${TMode}_dumpState`
+    Parameters?: undefined
+    ReturnType: Hex
+  },
   /**
    * @description Turn on call traces for transactions that are returned to the user when they execute a transaction (instead of just txhash/receipt).
    */
@@ -735,6 +743,14 @@ export type TestRpcSchema<TMode extends string> = [
     Parameters?: undefined
     ReturnType: boolean
   },
+  /**
+   * @description Adds state previously dumped with `dumpState` to the current chain.
+   */
+  {
+    Method: `${TMode}_loadState`
+    Parameters?: [Hex]
+    ReturnType: void
+  },
   /**
    * @description Advance the block number of the network by a certain number of blocks
    * @link https://hardhat.org/hardhat-network/docs/reference#hardhat_mine
@@ -1314,6 +1330,13 @@ export type EIP1193Parameters<
       params?: unknown
     }
 
+export type EIP1193RequestOptions = {
+  // The base delay (in ms) between retries.
+  retryDelay?: number
+  // The max number of times to retry.
+  retryCount?: number
+}
+
 type DerivedRpcSchema<
   TRpcSchema extends RpcSchema | undefined,
   TRpcSchemaOverride extends RpcSchemaOverride | undefined,
@@ -1339,4 +1362,5 @@ export type EIP1193RequestFn<
     : unknown,
 >(
   args: TParameters,
+  options?: EIP1193RequestOptions,
 ) => Promise<_ReturnType>

package/types/ens.ts

@@ -1,5 +1,5 @@
 export type AssetGateway = 'ipfs' | 'arweave'
 
 export type AssetGatewayUrls = {
-  [key in AssetGateway]?: string
+  [_key in AssetGateway]?: string
 }

package/types/filter.ts

@@ -42,18 +42,18 @@ export type Filter<
             strict: TStrict
           }
         : TArgs extends MaybeExtractEventArgsFromAbi<TAbi, TEventName>
-        ? {
-            abi: TAbi
-            args: TArgs
-            eventName: TEventName
-            strict: TStrict
-          }
-        : {
-            abi: TAbi
-            args?: never
-            eventName: TEventName
-            strict: TStrict
-          }
+          ? {
+              abi: TAbi
+              args: TArgs
+              eventName: TEventName
+              strict: TStrict
+            }
+          : {
+              abi: TAbi
+              args?: never
+              eventName: TEventName
+              strict: TStrict
+            }
       : {
           abi?: never
           args?: never

package/types/log.ts

@@ -75,10 +75,10 @@ type GetTopics<
 > = true extends _FailedToParseArgs
   ? [Hex, ...Hex[]] | []
   : TAbiEvent extends AbiEvent
-  ? Topics<TAbiEvent['inputs']>
-  : _AbiEvent extends AbiEvent
-  ? Topics<_AbiEvent['inputs']>
-  : [Hex, ...Hex[]] | []
+    ? Topics<TAbiEvent['inputs']>
+    : _AbiEvent extends AbiEvent
+      ? Topics<_AbiEvent['inputs']>
+      : [Hex, ...Hex[]] | []
 
 type GetInferredLogValues<
   TAbiEvent extends AbiEvent | undefined = undefined,