11import { JsonRpcError , EthereumProviderError } from './classes' ;
22import { errorCodes } from './error-constants' ;
3- import type { DataWithOptionalCause } from './utils' ;
3+ import type {
4+ DataWithOptionalCause ,
5+ OptionalDataWithOptionalCause ,
6+ } from './utils' ;
47import { getMessageFromCode } from './utils' ;
58
6- type EthereumErrorOptions < Data extends DataWithOptionalCause > = {
9+ type EthereumErrorOptions < Data extends OptionalDataWithOptionalCause > = {
710 message ?: string ;
811 data ?: Data ;
912} ;
@@ -15,7 +18,7 @@ type ServerErrorOptions<Data extends DataWithOptionalCause> = {
1518type CustomErrorArg < Data extends DataWithOptionalCause > =
1619 ServerErrorOptions < Data > ;
1720
18- type JsonRpcErrorsArg < Data extends DataWithOptionalCause > =
21+ type JsonRpcErrorsArg < Data extends OptionalDataWithOptionalCause > =
1922 | EthereumErrorOptions < Data >
2023 | string ;
2124
@@ -65,7 +68,7 @@ export const rpcErrors = {
6568 * @param arg - The error message or options bag.
6669 * @returns An instance of the {@link JsonRpcError} class.
6770 */
68- internal : < Data extends DataWithOptionalCause > (
71+ internal : < Data extends OptionalDataWithOptionalCause > (
6972 arg ?: JsonRpcErrorsArg < Data > ,
7073 ) => getJsonRpcError ( errorCodes . rpc . internal , arg ) ,
7174
@@ -245,7 +248,7 @@ export const providerErrors = {
245248 * @param arg - The error message or options bag.
246249 * @returns An instance of the {@link JsonRpcError} class.
247250 */
248- function getJsonRpcError < Data extends DataWithOptionalCause > (
251+ function getJsonRpcError < Data extends OptionalDataWithOptionalCause > (
249252 code : number ,
250253 arg ?: JsonRpcErrorsArg < Data > ,
251254) : JsonRpcError < Data > {
@@ -278,7 +281,7 @@ function getEthProviderError<Data extends DataWithOptionalCause>(
278281 * @param arg - The error message or options bag.
279282 * @returns A tuple containing the error message and optional data.
280283 */
281- function parseOpts < Data extends DataWithOptionalCause > (
284+ function parseOpts < Data extends OptionalDataWithOptionalCause > (
282285 arg ?: JsonRpcErrorsArg < Data > ,
283286) : [ message ?: string | undefined , data ?: Data | undefined ] {
284287 if ( arg ) {
0 commit comments