viem 0.3.0-main.20230411T230052 → 0.3.0-main.20230412T014743

package/dist/types/utils/errors/getNodeError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNodeError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EAEvB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,mBAAmB,EAEnB,gCAAgC,EAChC,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAE9B,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,WAM/C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,yRA6C9C"}
+{"version":3,"file":"getNodeError.d.ts","sourceRoot":"","sources":["../../../../src/utils/errors/getNodeError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACvE,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EAEvB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EAEnB,gCAAgC,EAChC,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAE9B,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,WAM/C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,yRA6C9C"}

package/dist/types/utils/filters/createFilterRequestScope.d.ts

@@ -0,0 +1,16 @@
+import type { Chain } from '../../chains.js';
+import type { PublicClient, Transport } from '../../clients/index.js';
+import type { Requests } from '../../types/eip1193.js';
+import type { Hex } from '../../types/index.js';
+type CreateFilterRequestScopeParameters = {
+    method: 'eth_newFilter' | 'eth_newPendingTransactionFilter' | 'eth_newBlockFilter';
+};
+type CreateFilterRequestScopeReturnType = (id: Hex) => Requests['request'];
+/**
+ * Scopes `request` to the filter ID. If the client is a fallback, it will
+ * listen for responses and scope the child transport `request` function
+ * to the successful filter ID.
+ */
+export declare function createFilterRequestScope<TChain extends Chain | undefined>(client: PublicClient<Transport, TChain>, { method }: CreateFilterRequestScopeParameters): CreateFilterRequestScopeReturnType;
+export {};
+//# sourceMappingURL=createFilterRequestScope.d.ts.map

package/dist/types/utils/filters/createFilterRequestScope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createFilterRequestScope.d.ts","sourceRoot":"","sources":["../../../../src/utils/filters/createFilterRequestScope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAErE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE/C,KAAK,kCAAkC,GAAG;IACxC,MAAM,EACF,eAAe,GACf,iCAAiC,GACjC,oBAAoB,CAAA;CACzB,CAAA;AAED,KAAK,kCAAkC,GAAG,CAAC,EAAE,EAAE,GAAG,KAAK,QAAQ,CAAC,SAAS,CAAC,CAAA;AAE1E;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,SAAS,KAAK,GAAG,SAAS,EACvE,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,EACvC,EAAE,MAAM,EAAE,EAAE,kCAAkC,GAC7C,kCAAkC,CAkBpC"}

package/dist/types/utils/rpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AAarC,KAAK,aAAa,CAAC,CAAC,IAAI;IACtB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,CAAC,CAAA;IACT,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AACD,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,CAAC,CAAA;CACT,CAAA;AACD,KAAK,YAAY,CAAC,OAAO,EAAE,MAAM,IAAI;IACnC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAA;KACrB,GAAG,CACA;QACE,MAAM,EAAE,OAAO,CAAA;QACf,KAAK,CAAC,EAAE,KAAK,CAAA;KACd,GACD;QACE,MAAM,CAAC,EAAE,KAAK,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;KACd,CACJ,CAAA;CACF,CAAA;AAED,KAAK,UAAU,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,WAAW,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI;IACrD,OAAO,EAAE,GAAG,MAAM,EAAE,CAAA;IACpB,EAAE,EAAE,MAAM,CAAA;CACX,GAAG,CACA,aAAa,CAAC,OAAO,CAAC,GACtB,WAAW,CAAC,MAAM,CAAC,GACnB,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAChC,CAAA;AAKD,MAAM,MAAM,WAAW,GAAG;IAExB,IAAI,EAAE,UAAU,CAAA;IAEhB,YAAY,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAExC,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,iBAAe,IAAI,CACjB,GAAG,EAAE,MAAM,EACX,EAAE,IAAI,EAAE,YAAiB,EAAE,OAAgB,EAAE,EAAE,WAAW,kCAwD3D;AAKD,KAAK,EAAE,GAAG,MAAM,GAAG,MAAM,CAAA;AACzB,KAAK,UAAU,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAA;AACxC,KAAK,WAAW,GAAG,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;AAEtC,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG;IAC/B,QAAQ,EAAE,WAAW,CAAA;IACrB,aAAa,EAAE,WAAW,CAAA;CAC3B,CAAA;AAID,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,mBAqD3C;AAED,iBAAS,SAAS,CAChB,MAAM,EAAE,MAAM,EACd,EACE,IAAI,EACJ,MAAM,EACN,OAAO,GACR,EAAE;IAED,IAAI,EAAE,UAAU,CAAA;IAEhB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IAEvC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;CAClD,UAyCF;AAED,iBAAe,cAAc,CAC3B,MAAM,EAAE,MAAM,EACd,EACE,IAAI,EACJ,OAAgB,GACjB,EAAE;IAED,IAAI,EAAE,UAAU,CAAA;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,kCAgBF;AAID,eAAO,MAAM,GAAG;;;;CAIf,CAAA"}
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AAarC,KAAK,aAAa,CAAC,CAAC,IAAI;IACtB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,CAAC,CAAA;IACT,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AACD,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,KAAK,EAAE,CAAC,CAAA;CACT,CAAA;AACD,KAAK,YAAY,CAAC,OAAO,EAAE,MAAM,IAAI;IACnC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAA;KACrB,GAAG,CACA;QACE,MAAM,EAAE,OAAO,CAAA;QACf,KAAK,CAAC,EAAE,KAAK,CAAA;KACd,GACD;QACE,MAAM,CAAC,EAAE,KAAK,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;KACd,CACJ,CAAA;CACF,CAAA;AAED,KAAK,UAAU,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,WAAW,CAAC,OAAO,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI;IACrD,OAAO,EAAE,GAAG,MAAM,EAAE,CAAA;IACpB,EAAE,EAAE,MAAM,CAAA;CACX,GAAG,CACA,aAAa,CAAC,OAAO,CAAC,GACtB,WAAW,CAAC,MAAM,CAAC,GACnB,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAChC,CAAA;AAKD,MAAM,MAAM,WAAW,GAAG;IAExB,IAAI,EAAE,UAAU,CAAA;IAEhB,YAAY,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAExC,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,iBAAe,IAAI,CACjB,GAAG,EAAE,MAAM,EACX,EAAE,IAAI,EAAE,YAAiB,EAAE,OAAgB,EAAE,EAAE,WAAW,kCAwD3D;AAKD,KAAK,EAAE,GAAG,MAAM,GAAG,MAAM,CAAA;AACzB,KAAK,UAAU,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAA;AACxC,KAAK,WAAW,GAAG,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;AAEtC,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG;IAC/B,QAAQ,EAAE,WAAW,CAAA;IACrB,aAAa,EAAE,WAAW,CAAA;CAC3B,CAAA;AAID,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,mBAqD3C;AAED,iBAAS,SAAS,CAChB,MAAM,EAAE,MAAM,EACd,EACE,IAAI,EACJ,MAAM,EACN,OAAO,GACR,EAAE;IAED,IAAI,EAAE,UAAU,CAAA;IAEhB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IAEvC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;CAClD,UA2CF;AAED,iBAAe,cAAc,CAC3B,MAAM,EAAE,MAAM,EACd,EACE,IAAI,EACJ,OAAgB,GACjB,EAAE;IAED,IAAI,EAAE,UAAU,CAAA;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,kCAgBF;AAID,eAAO,MAAM,GAAG;;;;CAIf,CAAA"}

package/package.json

@@ -12,7 +12,7 @@
     "isomorphic-ws": "5.0.0",
     "ws": "8.12.0"
   },
-  "version": "0.3.0-main.20230411T230052",
+  "version": "0.3.0-main.20230412T014743",
   "files": [
     "dist",
     "!dist/**/*.tsbuildinfo",

package/src/actions/public/createBlockFilter.ts

@@ -1,5 +1,6 @@
 import type { PublicClient, Transport } from '../../clients/index.js'
 import type { Chain, Filter } from '../../types/index.js'
+import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreateBlockFilterReturnType = Filter<'block'>
 
@@ -27,8 +28,11 @@ export type CreateBlockFilterReturnType = Filter<'block'>
 export async function createBlockFilter<TChain extends Chain | undefined>(
   client: PublicClient<Transport, TChain>,
 ): Promise<CreateBlockFilterReturnType> {
+  const getRequest = createFilterRequestScope(client, {
+    method: 'eth_newBlockFilter',
+  })
   const id = await client.request({
     method: 'eth_newBlockFilter',
   })
-  return { id, type: 'block' }
+  return { id, request: getRequest(id), type: 'block' }
 }

package/src/actions/public/createContractEventFilter.ts

@@ -12,6 +12,7 @@ import type {
 } from '../../types/index.js'
 import { encodeEventTopics, numberToHex } from '../../utils/index.js'
 import type { EncodeEventTopicsParameters } from '../../utils/index.js'
+import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreateContractEventFilterParameters<
   TAbi extends Abi | readonly unknown[] = Abi,
@@ -86,6 +87,10 @@ export async function createContractEventFilter<
     toBlock,
   }: CreateContractEventFilterParameters<TAbi, TEventName, TArgs>,
 ): Promise<CreateContractEventFilterReturnType<TAbi, TEventName, TArgs>> {
+  const getRequest = createFilterRequestScope(client, {
+    method: 'eth_newFilter',
+  })
+
   const topics = eventName
     ? encodeEventTopics({
         abi,
@@ -110,6 +115,7 @@ export async function createContractEventFilter<
     args,
     eventName,
     id,
+    request: getRequest(id),
     type: 'event',
   } as unknown as CreateContractEventFilterReturnType<TAbi, TEventName, TArgs>
 }

package/src/actions/public/createEventFilter.ts

@@ -14,6 +14,7 @@ import type {
 } from '../../types/index.js'
 import { encodeEventTopics, numberToHex } from '../../utils/index.js'
 import type { EncodeEventTopicsParameters } from '../../utils/index.js'
+import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreateEventFilterParameters<
   TAbiEvent extends AbiEvent | undefined = undefined,
@@ -105,6 +106,10 @@ export async function createEventFilter<
     _Args
   > = {} as any,
 ): Promise<CreateEventFilterReturnType<TAbiEvent, _Abi, _EventName, _Args>> {
+  const getRequest = createFilterRequestScope(client, {
+    method: 'eth_newFilter',
+  })
+
   let topics: LogTopic[] = []
   if (event)
     topics = encodeEventTopics({
@@ -125,11 +130,13 @@ export async function createEventFilter<
       },
     ],
   })
+
   return {
     abi: event ? [event] : undefined,
     args,
     eventName: event ? (event as AbiEvent).name : undefined,
     id,
+    request: getRequest(id),
     type: 'event',
   } as unknown as CreateEventFilterReturnType<
     TAbiEvent,

package/src/actions/public/createPendingTransactionFilter.ts

@@ -1,5 +1,6 @@
 import type { PublicClient, Transport } from '../../clients/index.js'
 import type { Chain, Filter } from '../../types/index.js'
+import { createFilterRequestScope } from '../../utils/filters/createFilterRequestScope.js'
 
 export type CreatePendingTransactionFilterReturnType = Filter<'transaction'>
 
@@ -30,8 +31,11 @@ export async function createPendingTransactionFilter<
 >(
   client: PublicClient<TTransport, TChain>,
 ): Promise<CreatePendingTransactionFilterReturnType> {
+  const getRequest = createFilterRequestScope(client, {
+    method: 'eth_newPendingTransactionFilter',
+  })
   const id = await client.request({
     method: 'eth_newPendingTransactionFilter',
   })
-  return { id, type: 'transaction' }
+  return { id, request: getRequest(id), type: 'transaction' }
 }

package/src/actions/public/getFilterChanges.ts

@@ -121,12 +121,12 @@ export async function getFilterChanges<
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
 >(
-  client: PublicClient<TTransport, TChain>,
+  _client: PublicClient<TTransport, TChain>,
   {
     filter,
   }: GetFilterChangesParameters<TFilterType, TAbiEvent, TAbi, TEventName>,
 ) {
-  const logs = await client.request({
+  const logs = await filter.request({
     method: 'eth_getFilterChanges',
     params: [filter.id],
   })

package/src/actions/public/getFilterLogs.ts

@@ -57,10 +57,10 @@ export async function getFilterLogs<
   TAbi extends Abi | readonly unknown[],
   TEventName extends string | undefined,
 >(
-  client: PublicClient<Transport, TChain>,
+  _client: PublicClient<Transport, TChain>,
   { filter }: GetFilterLogsParameters<TAbiEvent, TAbi, TEventName>,
 ): Promise<GetFilterLogsReturnType<TAbiEvent, TAbi, TEventName>> {
-  const logs = await client.request({
+  const logs = await filter.request({
     method: 'eth_getFilterLogs',
     params: [filter.id],
   })

package/src/actions/public/uninstallFilter.ts

@@ -35,10 +35,10 @@ export async function uninstallFilter<
   TTransport extends Transport,
   TChain extends Chain | undefined,
 >(
-  client: PublicClient<TTransport, TChain>,
+  _client: PublicClient<TTransport, TChain>,
   { filter }: UninstallFilterParameters,
 ): Promise<UninstallFilterReturnType> {
-  return client.request({
+  return filter.request({
     method: 'eth_uninstallFilter',
     params: [filter.id],
   })

package/src/clients/transports/fallback.ts

@@ -4,6 +4,26 @@ import { wait } from '../../utils/wait.js'
 import type { Transport, TransportConfig } from './createTransport.js'
 import { 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 = {
   /**
    * The polling interval (in ms) at which the ranker should ping the RPC URL.
@@ -52,7 +72,10 @@ export type FallbackTransportConfig = {
 
 export type FallbackTransport = Transport<
   'fallback',
-  { transports: ReturnType<Transport>[] }
+  {
+    onResponse: (fn: OnResponseFn) => void
+    transports: ReturnType<Transport>[]
+  }
 >
 
 export function fallback(
@@ -69,6 +92,8 @@ export function fallback(
   return ({ chain, pollingInterval = 4_000, timeout }) => {
     let transports = transports_
 
+    let onResponse: OnResponseFn = () => {}
+
     const transport = createTransport(
       {
         key,
@@ -77,11 +102,29 @@ export function fallback(
           const fetch = async (i: number = 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,6 +143,7 @@ export function fallback(
         type: 'fallback',
       },
       {
+        onResponse: (fn: OnResponseFn) => (onResponse = fn),
         transports: transports.map((fn) => fn({ chain, retryCount: 0 })),
       },
     )

package/src/errors/base.ts

@@ -22,8 +22,11 @@ export class BaseError extends Error {
   shortMessage: string
 
   override name = 'ViemError'
+  version = getVersion()
 
   constructor(shortMessage: string, args: BaseErrorParameters = {}) {
+    super()
+
     const details =
       args.cause instanceof BaseError
         ? args.cause.details
@@ -34,7 +37,8 @@ export class BaseError extends Error {
       args.cause instanceof BaseError
         ? args.cause.docsPath || args.docsPath
         : args.docsPath
-    const message = [
+
+    this.message = [
       shortMessage || 'An error occurred.',
       '',
       ...(args.metaMessages ? [...args.metaMessages, ''] : []),
@@ -46,11 +50,9 @@ export class BaseError extends Error {
           ]
         : []),
       ...(details ? [`Details: ${details}`] : []),
-      `Version: ${getVersion()}`,
+      `Version: ${this.version}`,
     ].join('\n')
 
-    super(message)
-
     if (args.cause) this.cause = args.cause
     this.details = details
     this.docsPath = docsPath

package/src/errors/index.ts

@@ -63,8 +63,8 @@ export {
 export {
   EnsAvatarInvalidMetadataError,
   EnsAvatarInvalidNftUriError,
-  EnsAvatarUriResolutionError,
   EnsAvatarUnsupportedNamespaceError,
+  EnsAvatarUriResolutionError,
 } from './ens.js'
 
 export { EstimateGasExecutionError } from './estimateGas.js'
@@ -87,6 +87,14 @@ export {
 } from './node.js'
 
 export {
+  HttpRequestError,
+  RpcRequestError,
+  TimeoutError,
+  WebSocketRequestError,
+} from './request.js'
+
+export {
+  ChainDisconnectedError,
   InternalRpcError,
   InvalidInputRpcError,
   InvalidParamsRpcError,
@@ -96,29 +104,25 @@ export {
   MethodNotFoundRpcError,
   MethodNotSupportedRpcError,
   ParseRpcError,
-  RequestError,
+  ProviderDisconnectedError,
+  ProviderRpcError,
   ResourceNotFoundRpcError,
   ResourceUnavailableRpcError,
-  RpcRequestError,
+  RpcError,
   SwitchChainError,
   TransactionRejectedRpcError,
+  UnauthorizedProviderError,
   UnknownRpcError,
+  UnsupportedProviderMethodError,
   UserRejectedRequestError,
-} from './request.js'
-
-export {
-  HttpRequestError,
-  RpcError,
-  TimeoutError,
-  WebSocketRequestError,
 } from './rpc.js'
 
 export {
   FeeConflictError,
   InvalidLegacyVError,
+  InvalidSerializableTransactionError,
   InvalidSerializedTransactionError,
   InvalidSerializedTransactionTypeError,
-  InvalidSerializableTransactionError,
   InvalidStorageKeySizeError,
   TransactionExecutionError,
   TransactionNotFoundError,

package/src/errors/request.ts

@@ -1,191 +1,98 @@
+import { stringify } from '../utils/index.js'
 import { BaseError } from './base.js'
-import type { RpcError } from './rpc.js'
-
-export class RequestError extends BaseError {
-  constructor(
-    err: Error,
-    {
-      docsPath,
-      metaMessages,
-      shortMessage,
-    }: { docsPath?: string; metaMessages?: string[]; shortMessage: string },
-  ) {
-    super(shortMessage, {
-      cause: err,
-      docsPath,
-      metaMessages:
-        metaMessages || (err as { metaMessages?: string[] })?.metaMessages,
-    })
-    this.name = err.name
-  }
-}
-
-export class RpcRequestError extends RequestError {
-  code: number
-
-  constructor(
-    err: RpcError,
-    { docsPath, shortMessage }: { docsPath?: string; shortMessage: string },
-  ) {
-    super(err, { docsPath, shortMessage })
-    this.code = err.code
-    this.name = err.name
-  }
-}
-
-export class ParseRpcError extends RpcRequestError {
-  override name = 'ParseRpcError'
-  override code = -32700
-
-  constructor(err: RpcError) {
-    super(err, {
-      shortMessage:
-        'Invalid JSON was received by the server. An error occurred on the server while parsing the JSON text.',
-    })
-  }
-}
-
-export class InvalidRequestRpcError extends RpcRequestError {
-  override name = 'InvalidRequestRpcError'
-  override code = -32600
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'JSON is not a valid request object.' })
-  }
-}
-
-export class MethodNotFoundRpcError extends RpcRequestError {
-  override name = 'MethodNotFoundRpcError'
-  override code = -32601
-
-  constructor(err: RpcError) {
-    super(err, {
-      shortMessage: 'The method does not exist / is not available.',
+import { getUrl } from './utils.js'
+
+export class HttpRequestError extends BaseError {
+  override name = 'HttpRequestError'
+
+  body: { [key: string]: unknown }
+  headers?: Headers
+  status?: number
+  url: string
+
+  constructor({
+    body,
+    details,
+    headers,
+    status,
+    url,
+  }: {
+    body: { [key: string]: unknown }
+    details?: string
+    headers?: Headers
+    status?: number
+    url: string
+  }) {
+    super('HTTP request failed.', {
+      details,
+      metaMessages: [
+        status && `Status: ${status}`,
+        `URL: ${getUrl(url)}`,
+        `Request body: ${stringify(body)}`,
+      ].filter(Boolean) as string[],
     })
-  }
-}
-
-export class InvalidParamsRpcError extends RpcRequestError {
-  override name = 'InvalidParamsRpcError'
-  override code = -32602
-
-  constructor(err: RpcError) {
-    super(err, {
-      shortMessage: [
-        'Invalid parameters were provided to the RPC method.',
-        'Double check you have provided the correct parameters.',
-      ].join('\n'),
+    this.body = body
+    this.headers = headers
+    this.status = status
+    this.url = url
+  }
+}
+
+export class WebSocketRequestError extends BaseError {
+  override name = 'WebSocketRequestError'
+
+  constructor({
+    body,
+    details,
+    url,
+  }: {
+    body: { [key: string]: unknown }
+    details: string
+    url: string
+  }) {
+    super('WebSocket request failed.', {
+      details,
+      metaMessages: [`URL: ${getUrl(url)}`, `Request body: ${stringify(body)}`],
     })
   }
 }
 
-export class InternalRpcError extends RpcRequestError {
-  override name = 'InternalRpcError'
-  override code = -32603
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'An internal error was received.' })
-  }
-}
-
-export class InvalidInputRpcError extends RpcRequestError {
-  override name = 'InvalidInputRpcError'
-  override code = -32000
-
-  constructor(err: RpcError) {
-    super(err, {
-      shortMessage: [
-        'Missing or invalid parameters.',
-        'Double check you have provided the correct parameters.',
-      ].join('\n'),
-    })
-  }
-}
+export class RpcRequestError extends BaseError {
+  override name = 'RpcRequestError'
 
-export class ResourceNotFoundRpcError extends RpcRequestError {
-  override name = 'ResourceNotFoundRpcError'
-  override code = -32001
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'Requested resource not found.' })
-  }
-}
-
-export class ResourceUnavailableRpcError extends RpcRequestError {
-  override name = 'ResourceUnavailableRpcError'
-  override code = -32002
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'Requested resource not available.' })
-  }
-}
-
-export class TransactionRejectedRpcError extends RpcRequestError {
-  override name = 'TransactionRejectedRpcError'
-  override code = -32003
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'Transaction creation failed.' })
-  }
-}
-
-export class MethodNotSupportedRpcError extends RpcRequestError {
-  override name = 'MethodNotSupportedRpcError'
-  override code = -32004
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'Method is not implemented.' })
-  }
-}
-
-export class LimitExceededRpcError extends RpcRequestError {
-  override name = 'LimitExceededRpcError'
-  override code = -32005
-
-  constructor(err: RpcError) {
-    super(err, { shortMessage: 'Request exceeds defined limit.' })
-  }
-}
-
-export class JsonRpcVersionUnsupportedError extends RpcRequestError {
-  override name = 'JsonRpcVersionUnsupportedError'
-  override code = -32006
-
-  constructor(err: RpcError) {
-    super(err, {
-      shortMessage: 'Version of JSON-RPC protocol is not supported.',
-    })
-  }
-}
-
-export class UserRejectedRequestError extends RequestError {
-  override name = 'UserRejectedRequestError'
-  code = 4001
-
-  constructor(err: Error) {
-    super(err, {
-      shortMessage: 'User rejected the request.',
-    })
-  }
-}
-
-export class SwitchChainError extends RequestError {
-  override name = 'SwitchChainError'
-  code = 4902
+  code: number
 
-  constructor(err: Error) {
-    super(err, {
-      shortMessage: 'An error occurred when attempting to switch chain.',
+  constructor({
+    body,
+    error,
+    url,
+  }: {
+    body: { [key: string]: unknown }
+    error: { code: number; message: string }
+    url: string
+  }) {
+    super('RPC Request failed.', {
+      cause: error as any,
+      details: error.message,
+      metaMessages: [`URL: ${getUrl(url)}`, `Request body: ${stringify(body)}`],
     })
+    this.code = error.code
   }
 }
 
-export class UnknownRpcError extends RequestError {
-  override name = 'UnknownRpcError'
+export class TimeoutError extends BaseError {
+  override name = 'TimeoutError'
 
-  constructor(err: Error) {
-    super(err, {
-      shortMessage: 'An unknown RPC error occurred.',
+  constructor({
+    body,
+    url,
+  }: {
+    body: { [key: string]: unknown }
+    url: string
+  }) {
+    super('The request took too long to respond.', {
+      details: 'The request timed out.',
+      metaMessages: [`URL: ${getUrl(url)}`, `Request body: ${stringify(body)}`],
     })
   }
 }