viem 2.0.0-alpha.14 → 2.0.0-alpha.16

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "2.0.0-alpha.14",
-  "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
+}

package/utils/promise/withTimeout.ts

@@ -5,12 +5,12 @@ export type WithTimeoutErrorType = ErrorType
 export function withTimeout<TData>(
   fn: ({ signal }: { signal?: AbortController['signal'] }) => Promise<TData>,
   {
-    errorInstance,
+    errorInstance = new Error('timed out'),
     timeout,
     signal,
   }: {
     // The error instance to throw when the timeout is reached.
-    errorInstance: Error
+    errorInstance?: Error
     // The timeout (in ms).
     timeout: number
     // Whether or not the timeout should use an abort signal.

package/utils/rpc.ts

@@ -1,6 +1,5 @@
-// @ts-ignore - TODO: TypeScript throws an error during CJS compilation here. Need to look into just rolling our own isomorphic-ws.
-import WebSocket from 'isomorphic-ws'
-import type { MessageEvent } from 'isomorphic-ws'
+import { WebSocket } from 'isows'
+import type { MessageEvent } from 'isows'
 
 import {
   HttpRequestError,
@@ -173,9 +172,7 @@ export async function getSocket(url: string) {
   const { schedule } = createBatchScheduler<undefined, [Socket]>({
     id: url,
     fn: async () => {
-      let WebSocket_ = WebSocket
-      if (!WebSocket.constructor) WebSocket_ = WebSocket.WebSocket
-      const webSocket = new WebSocket_(url)
+      const webSocket = new WebSocket(url)
 
       // Set up a cache for incoming "synchronous" requests.
       const requests = new Map<Id, CallbackFn>()

package/_cjs/_test/generated.js

@@ -1,313 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.payableABI = exports.offchainLookupExampleABI = exports.errorsExampleABI = exports.ensAvatarTokenUriABI = exports.gh434ABI = exports.erc20InvalidTransferEventABI = exports.verifySigABI = exports.ierc1271WalletABI = void 0;
-exports.ierc1271WalletABI = [
-    {
-        stateMutability: 'view',
-        type: 'function',
-        inputs: [
-            { name: 'hash', internalType: 'bytes32', type: 'bytes32' },
-            { name: 'signature', internalType: 'bytes', type: 'bytes' },
-        ],
-        name: 'isValidSignature',
-        outputs: [{ name: 'magicValue', internalType: 'bytes4', type: 'bytes4' }],
-    },
-];
-exports.verifySigABI = [
-    {
-        stateMutability: 'nonpayable',
-        type: 'constructor',
-        inputs: [
-            { name: '_signer', internalType: 'address', type: 'address' },
-            { name: '_hash', internalType: 'bytes32', type: 'bytes32' },
-            { name: '_signature', internalType: 'bytes', type: 'bytes' },
-        ],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [
-            { name: '_signer', internalType: 'address', type: 'address' },
-            { name: '_hash', internalType: 'bytes32', type: 'bytes32' },
-            { name: '_signature', internalType: 'bytes', type: 'bytes' },
-        ],
-        name: 'isValidUniversalSig',
-        outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
-    },
-];
-exports.erc20InvalidTransferEventABI = [
-    {
-        type: 'event',
-        anonymous: false,
-        inputs: [
-            { name: 'from', internalType: 'address', type: 'address', indexed: true },
-            { name: 'to', internalType: 'address', type: 'address', indexed: false },
-            {
-                name: 'value',
-                internalType: 'uint256',
-                type: 'uint256',
-                indexed: false,
-            },
-        ],
-        name: 'Transfer',
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [
-            { name: 'recipient', internalType: 'address', type: 'address' },
-            { name: 'amount', internalType: 'uint256', type: 'uint256' },
-        ],
-        name: 'transfer',
-        outputs: [],
-    },
-];
-exports.gh434ABI = [
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'bar',
-        outputs: [{ name: '', internalType: 'string', type: 'string' }],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'baz',
-        outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'foo',
-        outputs: [
-            { name: 'a', internalType: 'uint256', type: 'uint256' },
-            { name: 'b', internalType: 'bool', type: 'bool' },
-        ],
-    },
-];
-exports.ensAvatarTokenUriABI = [
-    {
-        stateMutability: 'view',
-        type: 'function',
-        inputs: [{ name: 'tokenId', internalType: 'uint256', type: 'uint256' }],
-        name: 'ownerOf',
-        outputs: [{ name: '', internalType: 'address', type: 'address' }],
-    },
-    {
-        stateMutability: 'view',
-        type: 'function',
-        inputs: [{ name: 'tokenId', internalType: 'uint256', type: 'uint256' }],
-        name: 'tokenURI',
-        outputs: [{ name: '', internalType: 'string', type: 'string' }],
-    },
-];
-exports.errorsExampleABI = [
-    {
-        type: 'error',
-        inputs: [
-            {
-                name: 'foo',
-                internalType: 'struct ErrorsExample.Foo',
-                type: 'tuple',
-                components: [
-                    { name: 'sender', internalType: 'address', type: 'address' },
-                    { name: 'bar', internalType: 'uint256', type: 'uint256' },
-                ],
-            },
-            { name: 'message', internalType: 'string', type: 'string' },
-            { name: 'number', internalType: 'uint256', type: 'uint256' },
-        ],
-        name: 'ComplexError',
-    },
-    {
-        type: 'error',
-        inputs: [{ name: 'message', internalType: 'string', type: 'string' }],
-        name: 'SimpleError',
-    },
-    { type: 'error', inputs: [], name: 'SimpleErrorNoArgs' },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'assertRead',
-        outputs: [],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'assertWrite',
-        outputs: [],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'complexCustomRead',
-        outputs: [],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'complexCustomWrite',
-        outputs: [],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'divideByZeroRead',
-        outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'divideByZeroWrite',
-        outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'overflowRead',
-        outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'overflowWrite',
-        outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'requireRead',
-        outputs: [],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'requireWrite',
-        outputs: [],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'revertRead',
-        outputs: [],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'revertWrite',
-        outputs: [],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'simpleCustomRead',
-        outputs: [],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [],
-        name: 'simpleCustomReadNoArgs',
-        outputs: [],
-    },
-    {
-        stateMutability: 'nonpayable',
-        type: 'function',
-        inputs: [],
-        name: 'simpleCustomWrite',
-        outputs: [],
-    },
-];
-exports.offchainLookupExampleABI = [
-    {
-        stateMutability: 'nonpayable',
-        type: 'constructor',
-        inputs: [{ name: 'urls_', internalType: 'string[]', type: 'string[]' }],
-    },
-    {
-        type: 'error',
-        inputs: [
-            { name: 'sender', internalType: 'address', type: 'address' },
-            { name: 'urls', internalType: 'string[]', type: 'string[]' },
-            { name: 'callData', internalType: 'bytes', type: 'bytes' },
-            { name: 'callbackFunction', internalType: 'bytes4', type: 'bytes4' },
-            { name: 'extraData', internalType: 'bytes', type: 'bytes' },
-        ],
-        name: 'OffchainLookup',
-    },
-    {
-        stateMutability: 'view',
-        type: 'function',
-        inputs: [{ name: 'name', internalType: 'string', type: 'string' }],
-        name: 'getAddress',
-        outputs: [{ name: '', internalType: 'address', type: 'address' }],
-    },
-    {
-        stateMutability: 'view',
-        type: 'function',
-        inputs: [
-            { name: 'result', internalType: 'bytes', type: 'bytes' },
-            { name: 'extraData', internalType: 'bytes', type: 'bytes' },
-        ],
-        name: 'getAddressWithProof',
-        outputs: [{ name: '', internalType: 'address', type: 'address' }],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [
-            {
-                name: '_ethSignedMessageHash',
-                internalType: 'bytes32',
-                type: 'bytes32',
-            },
-            { name: '_signature', internalType: 'bytes', type: 'bytes' },
-        ],
-        name: 'recoverSigner',
-        outputs: [{ name: '', internalType: 'address', type: 'address' }],
-    },
-    {
-        stateMutability: 'pure',
-        type: 'function',
-        inputs: [{ name: 'sig', internalType: 'bytes', type: 'bytes' }],
-        name: 'splitSignature',
-        outputs: [
-            { name: 'r', internalType: 'bytes32', type: 'bytes32' },
-            { name: 's', internalType: 'bytes32', type: 'bytes32' },
-            { name: 'v', internalType: 'uint8', type: 'uint8' },
-        ],
-    },
-    {
-        stateMutability: 'view',
-        type: 'function',
-        inputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-        name: 'urls',
-        outputs: [{ name: '', internalType: 'string', type: 'string' }],
-    },
-];
-exports.payableABI = [
-    {
-        stateMutability: 'payable',
-        type: 'function',
-        inputs: [],
-        name: 'pay',
-        outputs: [],
-    },
-];
-//# sourceMappingURL=generated.js.map

package/_cjs/_test/generated.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generated.js","sourceRoot":"","sources":["../../_test/generated.ts"],"names":[],"mappings":"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"}