viem 2.0.0-alpha.15 → 2.0.0-alpha.16

package/chains/definitions/telos.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain.js'
 export const telos = /*#__PURE__*/ defineChain({
   id: 40,
   name: 'Telos',
-  network: 'telos',
   nativeCurrency: {
     decimals: 18,
     name: 'Telos',
@@ -11,7 +10,6 @@ export const telos = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://mainnet.telos.net/evm'] },
-    public: { http: ['https://mainnet.telos.net/evm'] },
   },
   blockExplorers: {
     default: {

package/chains/definitions/telosTestnet.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain.js'
 export const telosTestnet = /*#__PURE__*/ defineChain({
   id: 41,
   name: 'Telos',
-  network: 'telosTestnet',
   nativeCurrency: {
     decimals: 18,
     name: 'Telos',
@@ -11,7 +10,6 @@ export const telosTestnet = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://testnet.telos.net/evm'] },
-    public: { http: ['https://testnet.telos.net/evm'] },
   },
   blockExplorers: {
     default: {

package/chains/definitions/thunderTestnet.ts

@@ -3,15 +3,11 @@ import { defineChain } from '../../utils/chain.js'
 export const thunderTestnet = /*#__PURE__*/ defineChain({
   id: 997,
   name: '5ireChain Thunder Testnet',
-  network: '5ireChain',
   nativeCurrency: { name: '5ire Token', symbol: '5IRE', decimals: 18 },
   rpcUrls: {
     default: {
       http: ['https://rpc-testnet.5ire.network'],
     },
-    public: {
-      http: ['https://rpc-testnet.5ire.network'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/vechain.ts

@@ -3,15 +3,11 @@ import { defineChain } from '../../utils/chain.js'
 export const vechain = /*#__PURE__*/ defineChain({
   id: 100009,
   name: 'Vechain',
-  network: 'vechain',
   nativeCurrency: { name: 'VeChain', symbol: 'VET', decimals: 18 },
   rpcUrls: {
     default: {
       http: ['https://mainnet.vechain.org'],
     },
-    public: {
-      http: ['https://mainnet.vechain.org'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/wanchain.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain.js'
 export const wanchain = /*#__PURE__*/ defineChain({
   id: 888,
   name: 'Wanchain',
-  network: 'wanchain',
   nativeCurrency: { name: 'WANCHAIN', symbol: 'WAN', decimals: 18 },
   rpcUrls: {
     default: {
@@ -12,18 +11,8 @@ export const wanchain = /*#__PURE__*/ defineChain({
         'https://gwan2-ssl.wandevs.org',
       ],
     },
-    public: {
-      http: [
-        'https://gwan-ssl.wandevs.org:56891',
-        'https://gwan2-ssl.wandevs.org',
-      ],
-    },
   },
   blockExplorers: {
-    etherscan: {
-      name: 'WanScan',
-      url: 'https://wanscan.org',
-    },
     default: {
       name: 'WanScan',
       url: 'https://wanscan.org',

package/chains/definitions/wanchainTestnet.ts

@@ -3,21 +3,13 @@ import { defineChain } from '../../utils/chain.js'
 export const wanchainTestnet = /*#__PURE__*/ defineChain({
   id: 999,
   name: 'Wanchain Testnet',
-  network: 'wanchainTestnet',
   nativeCurrency: { name: 'WANCHAIN', symbol: 'WANt', decimals: 18 },
   rpcUrls: {
     default: {
       http: ['https://gwan-ssl.wandevs.org:46891'],
     },
-    public: {
-      http: ['https://gwan-ssl.wandevs.org:46891'],
-    },
   },
   blockExplorers: {
-    etherscan: {
-      name: 'WanScanTest',
-      url: 'https://wanscan.org',
-    },
     default: {
       name: 'WanScanTest',
       url: 'https://wanscan.org',

package/chains/definitions/xdc.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain.js'
 export const xdc = /*#__PURE__*/ defineChain({
   id: 50,
   name: 'XinFin Network',
-  network: 'xdc',
   nativeCurrency: {
     decimals: 18,
     name: 'XDC',
@@ -11,7 +10,6 @@ export const xdc = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://rpc.xinfin.network'] },
-    public: { http: ['https://rpc.xinfin.network'] },
   },
   blockExplorers: {
     xinfin: { name: 'XinFin', url: 'https://explorer.xinfin.network' },

package/chains/definitions/xdcTestnet.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain.js'
 export const xdcTestnet = /*#__PURE__*/ defineChain({
   id: 51,
   name: 'Apothem Network',
-  network: 'xdc-testnet',
   nativeCurrency: {
     decimals: 18,
     name: 'TXDC',
@@ -11,7 +10,6 @@ export const xdcTestnet = /*#__PURE__*/ defineChain({
   },
   rpcUrls: {
     default: { http: ['https://erpc.apothem.network'] },
-    public: { http: ['https://erpc.apothem.network'] },
   },
   blockExplorers: {
     xinfin: { name: 'XinFin', url: 'https://explorer.apothem.network' },

package/chains/definitions/zetachainAthensTestnet.ts

@@ -3,16 +3,12 @@ import { defineChain } from '../../utils/chain.js'
 export const zetachainAthensTestnet = /*#__PURE__*/ defineChain({
   id: 7001,
   name: 'ZetaChain Athens Testnet',
-  network: 'zetachain-athens-testnet',
   nativeCurrency: {
     decimals: 18,
     name: 'Zeta',
     symbol: 'aZETA',
   },
   rpcUrls: {
-    public: {
-      http: ['https://zetachain-athens-evm.blockpi.network/v1/rpc/public'],
-    },
     default: {
       http: ['https://zetachain-athens-evm.blockpi.network/v1/rpc/public'],
     },

package/chains/definitions/zhejiang.ts

@@ -2,26 +2,14 @@ import { defineChain } from '../../utils/chain.js'
 
 export const zhejiang = /*#__PURE__*/ defineChain({
   id: 1_337_803,
-  network: 'zhejiang',
   name: 'Zhejiang',
   nativeCurrency: { name: 'Zhejiang Ether', symbol: 'ZhejETH', decimals: 18 },
   rpcUrls: {
     default: {
       http: ['https://rpc.zhejiang.ethpandaops.io'],
     },
-    public: {
-      http: ['https://rpc.zhejiang.ethpandaops.io'],
-    },
   },
   blockExplorers: {
-    beaconchain: {
-      name: 'Etherscan',
-      url: 'https://zhejiang.beaconcha.in',
-    },
-    blockscout: {
-      name: 'Blockscout',
-      url: 'https://blockscout.com/eth/zhejiang-testnet',
-    },
     default: {
       name: 'Beaconchain',
       url: 'https://zhejiang.beaconcha.in',

package/chains/definitions/zkSync.ts

@@ -3,7 +3,6 @@ import { defineChain } from '../../utils/chain.js'
 export const zkSync = /*#__PURE__*/ defineChain({
   id: 324,
   name: 'zkSync Era',
-  network: 'zksync-era',
   nativeCurrency: {
     decimals: 18,
     name: 'Ether',
@@ -14,10 +13,6 @@ export const zkSync = /*#__PURE__*/ defineChain({
       http: ['https://mainnet.era.zksync.io'],
       webSocket: ['wss://mainnet.era.zksync.io/ws'],
     },
-    public: {
-      http: ['https://mainnet.era.zksync.io'],
-      webSocket: ['wss://mainnet.era.zksync.io/ws'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/zkSyncTestnet.ts

@@ -3,17 +3,12 @@ import { defineChain } from '../../utils/chain.js'
 export const zkSyncTestnet = /*#__PURE__*/ defineChain({
   id: 280,
   name: 'zkSync Era Testnet',
-  network: 'zksync-era-testnet',
   nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 },
   rpcUrls: {
     default: {
       http: ['https://testnet.era.zksync.dev'],
       webSocket: ['wss://testnet.era.zksync.dev/ws'],
     },
-    public: {
-      http: ['https://testnet.era.zksync.dev'],
-      webSocket: ['wss://testnet.era.zksync.dev/ws'],
-    },
   },
   blockExplorers: {
     default: {

package/chains/definitions/zora.ts

@@ -5,7 +5,6 @@ export const zora = /*#__PURE__*/ defineChain(
   {
     id: 7777777,
     name: 'Zora',
-    network: 'zora',
     nativeCurrency: {
       decimals: 18,
       name: 'Ether',
@@ -16,10 +15,6 @@ export const zora = /*#__PURE__*/ defineChain(
         http: ['https://rpc.zora.energy'],
         webSocket: ['wss://rpc.zora.energy'],
       },
-      public: {
-        http: ['https://rpc.zora.energy'],
-        webSocket: ['wss://rpc.zora.energy'],
-      },
     },
     blockExplorers: {
       default: { name: 'Explorer', url: 'https://explorer.zora.energy' },

package/chains/definitions/zoraTestnet.ts

@@ -5,7 +5,6 @@ export const zoraTestnet = /*#__PURE__*/ defineChain(
   {
     id: 999,
     name: 'Zora Goerli Testnet',
-    network: 'zora-testnet',
     nativeCurrency: {
       decimals: 18,
       name: 'Zora Goerli',
@@ -16,10 +15,6 @@ export const zoraTestnet = /*#__PURE__*/ defineChain(
         http: ['https://testnet.rpc.zora.energy'],
         webSocket: ['wss://testnet.rpc.zora.energy'],
       },
-      public: {
-        http: ['https://testnet.rpc.zora.energy'],
-        webSocket: ['wss://testnet.rpc.zora.energy'],
-      },
     },
     blockExplorers: {
       default: {

package/chains/index.ts

@@ -107,6 +107,7 @@ export { rollux } from './definitions/rollux.js'
 export { rolluxTestnet } from './definitions/rolluxTestnet.js'
 export { ronin } from './definitions/ronin.js'
 export { saigon } from './definitions/saigon.js'
+export { scroll } from './definitions/scroll.js'
 export { scrollSepolia } from './definitions/scrollSepolia.js'
 export { scrollTestnet } from './definitions/scrollTestnet.js'
 export { sepolia } from './definitions/sepolia.js'

package/clients/decorators/public.ts

@@ -126,6 +126,11 @@ import {
   type GetLogsReturnType,
   getLogs,
 } from '../../actions/public/getLogs.js'
+import {
+  type GetProofParameters,
+  type GetProofReturnType,
+  getProof,
+} from '../../actions/public/getProof.js'
 import {
   type GetStorageAtParameters,
   type GetStorageAtReturnType,
@@ -1078,6 +1083,31 @@ export type PublicActions<
   ) => Promise<
     GetLogsReturnType<TAbiEvent, TAbiEvents, TStrict, TFromBlock, TToBlock>
   >
+  /**
+   * Returns the account and storage values of the specified account including the Merkle-proof.
+   *
+   * - Docs: https://viem.sh/docs/actions/public/getProof.html
+   * - JSON-RPC Methods:
+   *   - Calls [`eth_getProof`](https://eips.ethereum.org/EIPS/eip-1186)
+   *
+   * @param client - Client to use
+   * @param parameters - {@link GetProofParameters}
+   * @returns Proof data. {@link GetProofReturnType}
+   *
+   * @example
+   * import { createPublicClient, http } from 'viem'
+   * import { mainnet } from 'viem/chains'
+   *
+   * const client = createPublicClient({
+   *   chain: mainnet,
+   *   transport: http(),
+   * })
+   * const block = await client.getProof({
+   *  address: '0x...',
+   *  storageKeys: ['0x...'],
+   * })
+   */
+  getProof: (args: GetProofParameters) => Promise<GetProofReturnType>
   /**
    * Returns an estimate for the max priority fee per gas (in wei) for a transaction
    * to be included in the next block.
@@ -1714,6 +1744,7 @@ export function publicActions<
     getFilterLogs: (args) => getFilterLogs(client, args),
     getGasPrice: () => getGasPrice(client),
     getLogs: (args) => getLogs(client, args as any),
+    getProof: (args) => getProof(client, args),
     estimateMaxPriorityFeePerGas: (args) =>
       estimateMaxPriorityFeePerGas(client, args),
     getStorageAt: (args) => getStorageAt(client, args),

package/clients/transports/http.ts

@@ -47,6 +47,7 @@ export type HttpTransportConfig = {
 export type HttpTransport = Transport<
   'http',
   {
+    fetchOptions?: HttpTransportConfig['fetchOptions']
     url?: string
   }
 >
@@ -119,6 +120,7 @@ export function http(
         type: 'http',
       },
       {
+        fetchOptions,
         url,
       },
     )

package/clients/transports/webSocket.ts

@@ -1,5 +1,3 @@
-import type { WebSocket } from 'isomorphic-ws'
-
 import { RpcRequestError } from '../../errors/request.js'
 import {
   UrlRequiredError,

package/errors/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-alpha.15'
+export const version = '2.0.0-alpha.16'

package/index.ts

@@ -11,7 +11,7 @@ export {
   type ParseAbiItem,
   type ParseAbiParameter,
   type ParseAbiParameters,
-  type ResolvedConfig,
+  type ResolvedRegister,
   type TypedData,
   type TypedDataDomain,
   type TypedDataParameter,
@@ -444,6 +444,7 @@ export {
 } from './clients/transports/fallback.js'
 export {
   type HttpTransport,
+  type HttpTransportConfig,
   type HttpTransportErrorType,
   http,
 } from './clients/transports/http.js'
@@ -956,6 +957,7 @@ export type {
   RpcTransactionRequest,
   RpcUncle,
 } from './types/rpc.js'
+export type { Withdrawal } from './types/withdrawal.js'
 export { labelhash, type LabelhashErrorType } from './utils/ens/labelhash.js'
 export { namehash, type NamehashErrorType } from './utils/ens/namehash.js'
 export {

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.0.0-alpha.15",
-  "type": "module",
+  "version": "2.0.0-alpha.16",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",
@@ -62,13 +61,27 @@
   },
   "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": {
@@ -85,19 +98,27 @@
     "@noble/hashes": "1.3.2",
     "@scure/bip32": "1.3.2",
     "@scure/bip39": "1.2.1",
-    "@types/ws": "^8.5.5",
-    "abitype": "0.9.8",
-    "isomorphic-ws": "5.0.0",
+    "abitype": "0.10.0",
+    "isows": "1.0.3",
     "ws": "8.13.0"
   },
   "license": "MIT",
   "repository": "wagmi-dev/viem",
-  "authors": ["awkweb.eth", "jxom.eth"],
+  "authors": [
+    "awkweb.eth",
+    "jxom.eth"
+  ],
   "funding": [
     {
       "type": "github",
       "url": "https://github.com/sponsors/wagmi-dev"
     }
   ],
-  "keywords": ["eth", "ethereum", "dapps", "wallet", "web3"]
-}
+  "keywords": [
+    "eth",
+    "ethereum",
+    "dapps",
+    "wallet",
+    "web3"
+  ]
+}

package/types/block.ts

@@ -2,6 +2,7 @@ import type { Address } from 'abitype'
 
 import type { Hash, Hex } from './misc.js'
 import type { Transaction } from './transaction.js'
+import type { Withdrawal } from './withdrawal.js'
 
 export type Block<
   TQuantity = bigint,
@@ -56,6 +57,10 @@ export type Block<
   transactionsRoot: Hash
   /** List of uncle hashes */
   uncles: Hash[]
+  /** List of withdrawal objects */
+  withdrawals?: Withdrawal[]
+  /** Root of the this block’s withdrawals trie */
+  withdrawalsRoot?: Hex
 }
 
 export type BlockIdentifier<TQuantity = bigint> = {

package/types/chain.ts

@@ -30,8 +30,8 @@ type ChainConstants = {
   /** Collection of block explorers */
   blockExplorers?:
     | {
+        [key: string]: ChainBlockExplorer
         default: ChainBlockExplorer
-        etherscan?: ChainBlockExplorer | undefined
       }
     | undefined
   /** Collection of contracts */
@@ -53,18 +53,12 @@ type ChainConstants = {
   id: number
   /** Human-readable name */
   name: string
-  /**
-   * Internal network name
-   * @deprecated will be removed in v2 - use `id` instead.
-   */
-  network: string
   /** Currency used by chain */
   nativeCurrency: ChainNativeCurrency
   /** Collection of RPC endpoints */
   rpcUrls: {
     [key: string]: ChainRpcUrls
     default: ChainRpcUrls
-    public: ChainRpcUrls
   }
   /** Source Chain ID (ie. the L1 chain) */
   sourceId?: number | undefined

package/types/contract.ts

@@ -13,7 +13,7 @@ import {
   type ExtractAbiEventNames,
   type ExtractAbiFunction,
   type ExtractAbiFunctionNames,
-  type ResolvedConfig,
+  type ResolvedRegister,
 } from 'abitype'
 
 import type { Hex, LogTopic } from './misc.js'
@@ -132,14 +132,14 @@ export type ContractEventArgsFromTopics<
 export type Widen<type> =
   | ([unknown] extends [type] ? unknown : never)
   | (type extends Function ? type : never)
-  | (type extends ResolvedConfig['BigIntType'] ? bigint : never)
+  | (type extends ResolvedRegister['BigIntType'] ? bigint : never)
   | (type extends boolean ? boolean : never)
-  | (type extends ResolvedConfig['IntType'] ? number : never)
+  | (type extends ResolvedRegister['IntType'] ? number : never)
   | (type extends string
-      ? type extends ResolvedConfig['AddressType']
-        ? ResolvedConfig['AddressType']
-        : type extends ResolvedConfig['BytesType']['inputs']
-        ? ResolvedConfig['BytesType']
+      ? type extends ResolvedRegister['AddressType']
+        ? ResolvedRegister['AddressType']
+        : type extends ResolvedRegister['BytesType']['inputs']
+        ? ResolvedRegister['BytesType']
         : string
       : never)
   | (type extends readonly [] ? readonly [] : never)

package/types/eip1193.ts

@@ -9,6 +9,7 @@ import type {
   RpcBlockNumber as BlockNumber,
   RpcFeeHistory as FeeHistory,
   RpcLog as Log,
+  RpcProof as Proof,
   RpcTransaction as Transaction,
   RpcTransactionReceipt as TransactionReceipt,
   RpcTransactionRequest as TransactionRequest,
@@ -449,6 +450,26 @@ export type PublicRpcSchema = [
     ]
     ReturnType: Log[]
   },
+  /**
+   * @description Returns the account and storage values of the specified account including the Merkle-proof.
+   * @link https://eips.ethereum.org/EIPS/eip-1186
+   * @example
+   * provider.request({ method: 'eth_getProof', params: ['0x...', ['0x...'], 'latest'] })
+   * // => {
+   * //   ...
+   * // }
+   */
+  {
+    Method: 'eth_getProof'
+    Parameters: [
+      /** Address of the account. */
+      address: Address,
+      /** An array of storage-keys that should be proofed and included. */
+      storageKeys: Hash[],
+      block: BlockNumber | BlockTag,
+    ]
+    ReturnType: Proof
+  },
   /**
    * @description Returns the value from a storage position at an address
    * @link https://eips.ethereum.org/EIPS/eip-1474

package/types/proof.ts

@@ -0,0 +1,20 @@
+import type { Address } from 'abitype'
+import type { Hash } from './misc.js'
+
+export type AccountProof = Hash
+
+export type StorageProof<TQuantity = bigint> = {
+  key: Hash
+  proof: Hash[]
+  value: TQuantity
+}
+
+export type Proof<TQuantity = bigint, TIndex = number> = {
+  address: Address
+  balance: TQuantity
+  codeHash: Hash
+  nonce: TIndex
+  storageHash: Hash
+  accountProof: AccountProof[]
+  storageProof: StorageProof<TQuantity>[]
+}

package/types/rpc.ts

@@ -7,6 +7,7 @@ import type {
 } from './block.js'
 import type { FeeHistory, FeeValues } from './fee.js'
 import type { Log } from './log.js'
+import type { Proof } from './proof.js'
 import type {
   TransactionEIP1559,
   TransactionEIP2930,
@@ -34,6 +35,7 @@ export type RpcUncle = Uncle<Quantity>
 export type RpcFeeHistory = FeeHistory<Quantity>
 export type RpcFeeValues = FeeValues<Quantity>
 export type RpcLog = Log<Quantity, Index>
+export type RpcProof = Proof<Quantity, Index>
 export type RpcTransactionReceipt = TransactionReceipt<
   Quantity,
   Index,

package/types/transaction.ts

@@ -32,7 +32,7 @@ export type TransactionReceipt<
   /** Gas used by this transaction */
   gasUsed: TQuantity
   /** List of log objects generated by this transaction */
-  logs: Log<TQuantity, TIndex>[]
+  logs: Log<TQuantity, TIndex, false>[]
   /** Logs bloom filter */
   logsBloom: Hex
   /** `success` if this transaction was successful or `reverted` if it failed */

package/types/withdrawal.ts

@@ -0,0 +1,8 @@
+import type { Hex } from './misc.js'
+
+export type Withdrawal = {
+  address: Hex
+  amount: Hex
+  index: Hex
+  validatorIndex: Hex
+}

package/utils/formatters/proof.ts

@@ -0,0 +1,24 @@
+import type { ErrorType } from '../../errors/utils.js'
+import type { Proof } from '../../types/proof.js'
+import type { RpcProof } from '../../types/rpc.js'
+import { hexToNumber } from '../index.js'
+
+export type FormatProofErrorType = ErrorType
+
+function formatStorageProof(storageProof: RpcProof['storageProof']) {
+  return storageProof.map((proof) => ({
+    ...proof,
+    value: BigInt(proof.value),
+  }))
+}
+
+export function formatProof(proof: Partial<RpcProof>) {
+  return {
+    ...proof,
+    balance: proof.balance ? BigInt(proof.balance) : undefined,
+    nonce: proof.nonce ? hexToNumber(proof.nonce) : undefined,
+    storageProof: proof.storageProof
+      ? formatStorageProof(proof.storageProof)
+      : undefined,
+  } as Proof
+}