viem 0.0.0-tsc-and-nodenext-20230405154910 → 0.0.0-w-20230711200108

package/src/clients/transports/fallback.ts

@@ -1,8 +1,31 @@
-import type { Chain } from '../../types/index.js'
+import type { Chain } from '../../types/chain.js'
 import { isDeterministicError } from '../../utils/buildRequest.js'
 import { wait } from '../../utils/wait.js'
-import type { Transport, TransportConfig } from './createTransport.js'
-import { createTransport } from './createTransport.js'
+
+import {
+  type Transport,
+  type TransportConfig,
+  createTransport,
+} from './createTransport.js'
+// TODO: Narrow `method` & `params` types.
+export type OnResponseFn = (
+  args: {
+    method: string
+    params: unknown[]
+    transport: ReturnType<Transport>
+  } & (
+    | {
+        error?: never
+        response: unknown
+        status: 'success'
+      }
+    | {
+        error: Error
+        response?: never
+        status: 'error'
+      }
+  ),
+) => void
 
 type RankOptions = {
   /**
@@ -52,7 +75,10 @@ export type FallbackTransportConfig = {
 
 export type FallbackTransport = Transport<
   'fallback',
-  { transports: Transport[] }
+  {
+    onResponse: (fn: OnResponseFn) => void
+    transports: ReturnType<Transport>[]
+  }
 >
 
 export function fallback(
@@ -62,26 +88,46 @@ export function fallback(
   const {
     key = 'fallback',
     name = 'Fallback',
-    rank = true,
+    rank = false,
     retryCount,
     retryDelay,
   } = config
   return ({ chain, pollingInterval = 4_000, timeout }) => {
     let transports = transports_
 
+    let onResponse: OnResponseFn = () => {}
+
     const transport = createTransport(
       {
         key,
         name,
         async request({ method, params }) {
-          const fetch = async (i: number = 0): Promise<any> => {
+          const fetch = async (i = 0): Promise<any> => {
             const transport = transports[i]({ chain, retryCount: 0, timeout })
             try {
-              return await transport.request({
+              const response = await transport.request({
                 method,
                 params,
               } as any)
+
+              onResponse({
+                method,
+                params: params as unknown[],
+                response,
+                transport,
+                status: 'success',
+              })
+
+              return response
             } catch (err) {
+              onResponse({
+                error: err as Error,
+                method,
+                params: params as unknown[],
+                transport,
+                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
@@ -100,9 +146,8 @@ export function fallback(
         type: 'fallback',
       },
       {
-        transports: transports.map(
-          (fn) => fn({ chain, retryCount: 0 }) as unknown as Transport,
-        ),
+        onResponse: (fn: OnResponseFn) => (onResponse = fn),
+        transports: transports.map((fn) => fn({ chain, retryCount: 0 })),
       },
     )
 

package/src/clients/transports/http.ts

@@ -1,10 +1,27 @@
-import { UrlRequiredError } from '../../errors/index.js'
-import type { HttpOptions } from '../../utils/index.js'
-import { rpc } from '../../utils/index.js'
-import type { Transport, TransportConfig } from './createTransport.js'
-import { createTransport } from './createTransport.js'
+import { RpcRequestError } from '../../errors/request.js'
+import { UrlRequiredError } from '../../errors/transport.js'
+import { createBatchScheduler } from '../../utils/promise/createBatchScheduler.js'
+import { type HttpOptions, type RpcRequest, rpc } from '../../utils/rpc.js'
+
+import {
+  type Transport,
+  type TransportConfig,
+  createTransport,
+} from './createTransport.js'
+
+export type BatchOptions = {
+  /** The maximum number of JSON-RPC requests to send in a batch. @default 1_000 */
+  batchSize?: number
+  /** The maximum number of milliseconds to wait before sending a batch. @default 0 */
+  wait?: number
+}
 
 export type HttpTransportConfig = {
+  /**
+   * Whether to enable Batch JSON-RPC.
+   * @link https://www.jsonrpc.org/specification#batch
+   */
+  batch?: boolean | BatchOptions
   /**
    * Request configuration to pass to `fetch`.
    * @link https://developer.mozilla.org/en-US/docs/Web/API/fetch
@@ -38,12 +55,15 @@ export function http(
   config: HttpTransportConfig = {},
 ): HttpTransport {
   const {
+    batch,
     fetchOptions,
     key = 'http',
     name = 'HTTP JSON-RPC',
     retryDelay,
   } = config
   return ({ chain, retryCount: retryCount_, timeout: timeout_ }) => {
+    const { batchSize = 1000, wait = 0 } =
+      typeof batch === 'object' ? batch : {}
     const retryCount = config.retryCount ?? retryCount_
     const timeout = timeout_ ?? config.timeout ?? 10_000
     const url_ = url || chain?.rpcUrls.default.http[0]
@@ -53,14 +73,34 @@ export function http(
         key,
         name,
         async request({ method, params }) {
-          const { result } = await rpc.http(url_, {
-            body: {
-              method,
-              params,
+          const body = { method, params }
+
+          const { schedule } = createBatchScheduler({
+            id: `${url}`,
+            wait,
+            shouldSplitBatch(requests) {
+              return requests.length > batchSize
             },
-            fetchOptions,
-            timeout,
+            fn: (body: RpcRequest[]) =>
+              rpc.http(url_, {
+                body,
+                fetchOptions,
+                timeout,
+              }),
           })
+
+          const fn = async (body: RpcRequest) =>
+            batch
+              ? schedule(body)
+              : [await rpc.http(url_, { body, fetchOptions, timeout })]
+
+          const [{ error, result }] = await fn(body)
+          if (error)
+            throw new RpcRequestError({
+              body,
+              error,
+              url: url_,
+            })
           return result
         },
         retryCount,

package/src/clients/transports/webSocket.ts

@@ -1,10 +1,14 @@
 import type { WebSocket } from 'isomorphic-ws'
-import { UrlRequiredError } from '../../errors/index.js'
-import type { Hash } from '../../types/index.js'
-import type { RpcResponse } from '../../utils/rpc.js'
-import { getSocket, rpc } from '../../utils/rpc.js'
-import type { Transport, TransportConfig } from './createTransport.js'
-import { createTransport } from './createTransport.js'
+
+import { RpcRequestError } from '../../errors/request.js'
+import { UrlRequiredError } from '../../errors/transport.js'
+import type { Hash } from '../../types/misc.js'
+import { type RpcResponse, getSocket, rpc } from '../../utils/rpc.js'
+import {
+  type Transport,
+  type TransportConfig,
+  createTransport,
+} from './createTransport.js'
 
 type WebSocketTransportSubscribeParameters = {
   onData: (data: RpcResponse) => void
@@ -68,11 +72,18 @@ export function webSocket(
         key,
         name,
         async request({ method, params }) {
+          const body = { method, params }
           const socket = await getSocket(url_)
-          const { result } = await rpc.webSocketAsync(socket, {
-            body: { method, params },
+          const { error, result } = await rpc.webSocketAsync(socket, {
+            body,
             timeout,
           })
+          if (error)
+            throw new RpcRequestError({
+              body,
+              error,
+              url: url_,
+            })
           return result
         },
         retryCount,
@@ -93,31 +104,32 @@ export function webSocket(
                   method: 'eth_subscribe',
                   params,
                 },
-                onData: (data) => {
-                  if (typeof data.id === 'number') {
-                    resolve(data)
+                onResponse(response) {
+                  if (response.error) {
+                    reject(response.error)
+                    onError?.(response.error)
                     return
                   }
-                  if (data.method !== 'eth_subscription') return
-                  onData(data.params)
-                },
-                onError: (error) => {
-                  reject(error)
-                  onError?.(error)
+
+                  if (typeof response.id === 'number') {
+                    resolve(response)
+                    return
+                  }
+                  if (response.method !== 'eth_subscription') return
+                  onData(response.params)
                 },
               }),
           )
           return {
             subscriptionId,
             async unsubscribe() {
-              return new Promise<any>((resolve, reject) =>
+              return new Promise<any>((resolve) =>
                 rpc.webSocket(socket, {
                   body: {
                     method: 'eth_unsubscribe',
                     params: [subscriptionId],
                   },
-                  onData: resolve,
-                  onError: reject,
+                  onResponse: resolve,
                 }),
               )
             },

package/src/constants/abis.ts

@@ -81,3 +81,45 @@ export const singleAddressResolverAbi = [
     outputs: [{ name: '', type: 'address' }],
   },
 ] as const
+
+// ERC-1271
+// isValidSignature(bytes32 hash, bytes signature) → bytes4 magicValue
+export const smartAccountAbi = [
+  {
+    name: 'isValidSignature',
+    type: 'function',
+    stateMutability: 'view',
+    inputs: [
+      { name: 'hash', type: 'bytes32' },
+      { name: 'signature', type: 'bytes' },
+    ],
+    outputs: [{ name: '', type: 'bytes4' }],
+  },
+] as const
+
+// ERC-6492 - universal deployless signature validator contract
+// constructor(address _signer, bytes32 _hash, bytes _signature) → bytes4 returnValue
+// returnValue is either 0x1 (valid) or 0x0 (invalid)
+export const universalSignatureValidatorAbi = [
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_signer',
+        type: 'address',
+      },
+      {
+        internalType: 'bytes32',
+        name: '_hash',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes',
+        name: '_signature',
+        type: 'bytes',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+] as const

package/src/constants/address.ts

@@ -0,0 +1 @@
+export const zeroAddress = '0x0000000000000000000000000000000000000000' as const

package/src/constants/contract.ts

@@ -0,0 +1 @@
+export const aggregate3Signature = '0x82ad56cb'

package/src/constants/contracts.ts

@@ -0,0 +1,2 @@
+export const universalSignatureValidatorByteCode =
+  '0x60806040523480156200001157600080fd5b50604051620007003803806200070083398101604081905262000034916200056f565b6000620000438484846200004f565b9050806000526001601ff35b600080846001600160a01b0316803b806020016040519081016040528181526000908060200190933c90507f6492649264926492649264926492649264926492649264926492649264926492620000a68462000451565b036200021f57600060608085806020019051810190620000c79190620005ce565b8651929550909350915060000362000192576000836001600160a01b031683604051620000f5919062000643565b6000604051808303816000865af19150503d806000811462000134576040519150601f19603f3d011682016040523d82523d6000602084013e62000139565b606091505b5050905080620001905760405162461bcd60e51b815260206004820152601e60248201527f5369676e617475726556616c696461746f723a206465706c6f796d656e74000060448201526064015b60405180910390fd5b505b604051630b135d3f60e11b808252906001600160a01b038a1690631626ba7e90620001c4908b90869060040162000661565b602060405180830381865afa158015620001e2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200020891906200069d565b6001600160e01b031916149450505050506200044a565b805115620002b157604051630b135d3f60e11b808252906001600160a01b03871690631626ba7e9062000259908890889060040162000661565b602060405180830381865afa15801562000277573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029d91906200069d565b6001600160e01b031916149150506200044a565b8251604114620003195760405162461bcd60e51b815260206004820152603a6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e6174757265206c656e677468000000000000606482015260840162000187565b620003236200046b565b506020830151604080850151855186939260009185919081106200034b576200034b620006c9565b016020015160f81c9050601b81148015906200036b57508060ff16601c14155b15620003cf5760405162461bcd60e51b815260206004820152603b6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e617475726520762076616c75650000000000606482015260840162000187565b6040805160008152602081018083528a905260ff83169181019190915260608101849052608081018390526001600160a01b038a169060019060a0016020604051602081039080840390855afa1580156200042e573d6000803e3d6000fd5b505050602060405103516001600160a01b031614955050505050505b9392505050565b60006020825110156200046357600080fd5b508051015190565b60405180606001604052806003906020820280368337509192915050565b6001600160a01b03811681146200049f57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620004d5578181015183820152602001620004bb565b50506000910152565b600082601f830112620004f057600080fd5b81516001600160401b03808211156200050d576200050d620004a2565b604051601f8301601f19908116603f01168101908282118183101715620005385762000538620004a2565b816040528381528660208588010111156200055257600080fd5b62000565846020830160208901620004b8565b9695505050505050565b6000806000606084860312156200058557600080fd5b8351620005928162000489565b6020850151604086015191945092506001600160401b03811115620005b657600080fd5b620005c486828701620004de565b9150509250925092565b600080600060608486031215620005e457600080fd5b8351620005f18162000489565b60208501519093506001600160401b03808211156200060f57600080fd5b6200061d87838801620004de565b935060408601519150808211156200063457600080fd5b50620005c486828701620004de565b6000825162000657818460208701620004b8565b9190910192915050565b828152604060208201526000825180604084015262000688816060850160208701620004b8565b601f01601f1916919091016060019392505050565b600060208284031215620006b057600080fd5b81516001600160e01b0319811681146200044a57600080fd5b634e487b7160e01b600052603260045260246000fdfe5369676e617475726556616c696461746f72237265636f7665725369676e6572'

package/src/contract.ts

@@ -1,71 +1,106 @@
-export type {
-  CreateContractEventFilterParameters,
-  CreateContractEventFilterReturnType,
-  EstimateContractGasParameters,
-  EstimateContractGasReturnType,
-  GetBytecodeParameters,
-  GetBytecodeReturnType,
-  GetStorageAtParameters,
-  GetStorageAtReturnType,
-  MulticallParameters,
-  MulticallReturnType,
-  OnLogsFn,
-  OnLogsParameter,
-  ReadContractParameters,
-  ReadContractReturnType,
-  SimulateContractParameters,
-  SimulateContractReturnType,
-  WatchContractEventParameters,
-} from './actions/public/index.js'
 export {
+  type CreateContractEventFilterParameters,
+  type CreateContractEventFilterReturnType,
   createContractEventFilter,
+} from './actions/public/createContractEventFilter.js'
+export {
+  type EstimateContractGasParameters,
+  type EstimateContractGasReturnType,
   estimateContractGas,
+} from './actions/public/estimateContractGas.js'
+export {
+  type GetBytecodeParameters,
+  type GetBytecodeReturnType,
   getBytecode,
+} from './actions/public/getBytecode.js'
+export {
+  type GetStorageAtParameters,
+  type GetStorageAtReturnType,
   getStorageAt,
+} from './actions/public/getStorageAt.js'
+export {
+  type MulticallParameters,
+  type MulticallReturnType,
   multicall,
+} from './actions/public/multicall.js'
+export type {
+  OnLogsFn,
+  OnLogsParameter,
+} from './actions/public/watchEvent.js'
+export {
+  type ReadContractParameters,
+  type ReadContractReturnType,
   readContract,
+} from './actions/public/readContract.js'
+export {
+  type SimulateContractParameters,
+  type SimulateContractReturnType,
   simulateContract,
+} from './actions/public/simulateContract.js'
+export {
+  type WatchContractEventParameters,
   watchContractEvent,
-} from './actions/public/index.js'
-
-export type {
-  DeployContractParameters,
-  DeployContractReturnType,
-  WriteContractParameters,
-  WriteContractReturnType,
-} from './actions/wallet/index.js'
-export { deployContract, writeContract } from './actions/wallet/index.js'
-
-export type {
-  DecodeAbiParametersReturnType,
-  DecodeErrorResultParameters,
-  DecodeErrorResultReturnType,
-  DecodeEventLogParameters,
-  DecodeEventLogReturnType,
-  DecodeFunctionDataParameters,
-  DecodeFunctionResultParameters,
-  DecodeFunctionResultReturnType,
-  EncodeAbiParametersReturnType,
-  EncodeDeployDataParameters,
-  EncodeErrorResultParameters,
-  EncodeEventTopicsParameters,
-  EncodeFunctionDataParameters,
-  EncodeFunctionResultParameters,
-  GetAbiItemParameters,
-} from './utils/index.js'
+} from './actions/public/watchContractEvent.js'
+export {
+  type DeployContractParameters,
+  type DeployContractReturnType,
+  deployContract,
+} from './actions/wallet/deployContract.js'
 export {
+  type WriteContractParameters,
+  type WriteContractReturnType,
+  writeContract,
+} from './actions/wallet/writeContract.js'
+export {
+  type DecodeAbiParametersReturnType,
   decodeAbiParameters,
+} from './utils/abi/decodeAbiParameters.js'
+export {
+  type DecodeErrorResultParameters,
+  type DecodeErrorResultReturnType,
   decodeErrorResult,
+} from './utils/abi/decodeErrorResult.js'
+export {
+  type DecodeEventLogParameters,
+  type DecodeEventLogReturnType,
   decodeEventLog,
+} from './utils/abi/decodeEventLog.js'
+export {
+  type DecodeFunctionDataParameters,
   decodeFunctionData,
+} from './utils/abi/decodeFunctionData.js'
+export {
+  type DecodeFunctionResultParameters,
+  type DecodeFunctionResultReturnType,
   decodeFunctionResult,
+} from './utils/abi/decodeFunctionResult.js'
+export {
+  type EncodeAbiParametersReturnType,
   encodeAbiParameters,
+} from './utils/abi/encodeAbiParameters.js'
+export {
+  type EncodeDeployDataParameters,
   encodeDeployData,
+} from './utils/abi/encodeDeployData.js'
+export {
+  type EncodeErrorResultParameters,
   encodeErrorResult,
+} from './utils/abi/encodeErrorResult.js'
+export {
+  type EncodeEventTopicsParameters,
   encodeEventTopics,
+} from './utils/abi/encodeEventTopics.js'
+export {
+  type EncodeFunctionDataParameters,
   encodeFunctionData,
+} from './utils/abi/encodeFunctionData.js'
+export {
+  type EncodeFunctionResultParameters,
   encodeFunctionResult,
-  formatAbiItemWithArgs,
-  formatAbiItem,
+} from './utils/abi/encodeFunctionResult.js'
+export {
+  type GetAbiItemParameters,
   getAbiItem,
-} from './utils/index.js'
+} from './utils/abi/getAbiItem.js'
+export { formatAbiItemWithArgs } from './utils/abi/formatAbiItemWithArgs.js'
+export { formatAbiItem } from './utils/abi/formatAbiItem.js'

package/src/ens.ts

@@ -1,26 +1,28 @@
-export type {
-  GetEnsAddressParameters,
-  GetEnsAddressReturnType,
-  GetEnsAvatarParameters,
-  GetEnsAvatarReturnType,
-  GetEnsNameParameters,
-  GetEnsNameReturnType,
-  GetEnsResolverParameters,
-  GetEnsResolverReturnType,
-  GetEnsTextParameters,
-  GetEnsTextReturnType,
-} from './actions/ens/index.js'
+export { normalize } from './utils/ens/normalize.js'
 export {
+  type GetEnsAddressParameters,
+  type GetEnsAddressReturnType,
   getEnsAddress,
+} from './actions/ens/getEnsAddress.js'
+export {
+  type GetEnsAvatarParameters,
+  type GetEnsAvatarReturnType,
   getEnsAvatar,
+} from './actions/ens/getEnsAvatar.js'
+export {
+  type GetEnsNameParameters,
+  type GetEnsNameReturnType,
   getEnsName,
+} from './actions/ens/getEnsName.js'
+export {
+  type GetEnsResolverParameters,
+  type GetEnsResolverReturnType,
   getEnsResolver,
-  getEnsText,
-} from './actions/ens/index.js'
-
+} from './actions/ens/getEnsResolver.js'
 export {
-  labelhash,
-  namehash,
-} from './utils/ens/index.js'
-
-export { normalize } from './utils/ens/normalize.js'
+  type GetEnsTextParameters,
+  type GetEnsTextReturnType,
+  getEnsText,
+} from './actions/ens/getEnsText.js'
+export { labelhash } from './utils/ens/labelhash.js'
+export { namehash } from './utils/ens/namehash.js'