@atomiqlabs/chain-evm 1.0.0-dev.81 → 1.0.0-dev.83

package/dist/evm/providers/JsonRpcProviderWithRetries.js

@@ -16,6 +16,10 @@ class JsonRpcProviderWithRetries extends ethers_1.JsonRpcProvider {
         return (0, Utils_1.tryWithRetries)(() => super.send(method, params), this.retryPolicy, e => {
             if (e.code != null && typeof (e.code) === "string")
                 return Utils_1.allowedEthersErrorCodes.has(e.code);
+            if (e.error?.code != null && typeof (e.error.code) === "number")
+                return Utils_1.allowedEthersErrorNumbers.has(e.error.code);
+            if (e.error?.message != null && typeof (e.error.message) === "string")
+                return Utils_1.allowedEthersErrorMessages.has(e.error.message);
             return false;
         });
     }

package/dist/evm/providers/SocketProvider.js

@@ -245,6 +245,8 @@ class SocketProvider extends ethers_1.JsonRpcApiProvider {
     async _send(payload) {
         // WebSocket provider doesn't accept batches
         (0, ethers_1.assertArgument)(!Array.isArray(payload), "WebSocket does not support batch send", "payload", payload);
+        if (!__classPrivateFieldGet(this, _SocketProvider_connected, "f") && payload.method === "eth_subscribe")
+            return Promise.reject((0, ethers_1.makeError)("WebSocket not connected!", "NETWORK_ERROR"));
         // Wait until the socket is connected before writing to it
         await this._waitUntilReady();
         if (!__classPrivateFieldGet(this, _SocketProvider_connected, "f") && payload.method === "eth_subscribe")

package/dist/evm/providers/WebSocketProviderWithRetries.js

@@ -12,6 +12,10 @@ class WebSocketProviderWithRetries extends ReconnectingWebSocketProvider_1.Recon
         return (0, Utils_1.tryWithRetries)(() => super.send(method, params), this.retryPolicy, e => {
             if (e.code != null && typeof (e.code) === "string")
                 return Utils_1.allowedEthersErrorCodes.has(e.code);
+            if (e.error?.code != null && typeof (e.error.code) === "number")
+                return Utils_1.allowedEthersErrorNumbers.has(e.error.code);
+            if (e.error?.message != null && typeof (e.error.message) === "string")
+                return Utils_1.allowedEthersErrorMessages.has(e.error.message);
             return false;
         });
     }

package/dist/utils/Utils.d.ts

@@ -15,3 +15,5 @@ export declare function tryWithRetries<T>(func: () => Promise<T>, retryPolicy?:
 export declare function uint32ReverseEndianness(value: number): number;
 export declare function bigIntMax(a: bigint, b: bigint): bigint;
 export declare const allowedEthersErrorCodes: Set<string>;
+export declare const allowedEthersErrorNumbers: Set<number>;
+export declare const allowedEthersErrorMessages: Set<string>;

package/dist/utils/Utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowedEthersErrorCodes = exports.bigIntMax = exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
+exports.allowedEthersErrorMessages = exports.allowedEthersErrorNumbers = exports.allowedEthersErrorCodes = exports.bigIntMax = exports.uint32ReverseEndianness = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = void 0;
 function timeoutPromise(timeoutMillis, abortSignal) {
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(resolve, timeoutMillis);
@@ -79,3 +79,20 @@ exports.allowedEthersErrorCodes = new Set([
     "INVALID_ARGUMENT", "MISSING_ARGUMENT", "UNEXPECTED_ARGUMENT", "VALUE_MISMATCH",
     "CALL_EXCEPTION", "NONCE_EXPIRED", "REPLACEMENT_UNDERPRICED", "TRANSACTION_REPLACED", "UNCONFIGURED_NAME", "OFFCHAIN_FAULT", "ACTION_REJECTED"
 ]);
+exports.allowedEthersErrorNumbers = new Set([
+    -32700,
+    -32600,
+    -32601,
+    // -32602, //Invalid params
+    // -32603, //Internal error
+    -32000,
+    // -32001, //Resource not found
+    // -32002, //Resource unavailable
+    // -32003, //Transaction rejected
+    -32004,
+    // -32005, //Limit exceeded
+    -32006 //JSON-RPC version not supported
+]);
+exports.allowedEthersErrorMessages = new Set([
+    "already known"
+]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.81",
+  "version": "1.0.0-dev.83",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/evm/providers/JsonRpcProviderWithRetries.ts

@@ -1,6 +1,11 @@
 import {JsonRpcProvider, JsonRpcApiProviderOptions, makeError, JsonRpcPayload, JsonRpcResult} from "ethers";
 import {Networkish, FetchRequest} from "ethers";
-import {allowedEthersErrorCodes, tryWithRetries} from "../../utils/Utils";
+import {
+    allowedEthersErrorCodes,
+    allowedEthersErrorMessages,
+    allowedEthersErrorNumbers,
+    tryWithRetries
+} from "../../utils/Utils";
 
 export class JsonRpcProviderWithRetries extends JsonRpcProvider {
 
@@ -20,6 +25,8 @@ export class JsonRpcProviderWithRetries extends JsonRpcProvider {
     send(method: string, params: Array<any> | Record<string, any>): Promise<any> {
         return tryWithRetries(() => super.send(method, params), this.retryPolicy, e => {
             if(e.code!=null && typeof(e.code)==="string") return allowedEthersErrorCodes.has(e.code);
+            if(e.error?.code!=null && typeof(e.error.code)==="number") return allowedEthersErrorNumbers.has(e.error.code);
+            if(e.error?.message!=null && typeof(e.error.message)==="string") return allowedEthersErrorMessages.has(e.error.message);
             return false;
         });
     }

package/src/evm/providers/SocketProvider.ts

@@ -271,6 +271,9 @@ export class SocketProvider extends JsonRpcApiProvider {
         // WebSocket provider doesn't accept batches
         assertArgument(!Array.isArray(payload), "WebSocket does not support batch send", "payload", payload);
 
+        if(!this.#connected && payload.method==="eth_subscribe")
+            return Promise.reject(makeError("WebSocket not connected!", "NETWORK_ERROR"));
+
         // Wait until the socket is connected before writing to it
         await this._waitUntilReady();
 

package/src/evm/providers/WebSocketProviderWithRetries.ts

@@ -1,6 +1,11 @@
 import {JsonRpcApiProviderOptions} from "ethers";
 import type {Networkish} from "ethers";
-import {allowedEthersErrorCodes, tryWithRetries} from "../../utils/Utils";
+import {
+    allowedEthersErrorCodes,
+    allowedEthersErrorMessages,
+    allowedEthersErrorNumbers,
+    tryWithRetries
+} from "../../utils/Utils";
 import {ReconnectingWebSocketProvider} from "./ReconnectingWebSocketProvider";
 import type {WebSocketLike} from "ethers/lib.esm";
 
@@ -21,6 +26,8 @@ export class WebSocketProviderWithRetries extends ReconnectingWebSocketProvider
     send(method: string, params: Array<any> | Record<string, any>): Promise<any> {
         return tryWithRetries(() => super.send(method, params), this.retryPolicy, e => {
             if(e.code!=null && typeof(e.code)==="string") return allowedEthersErrorCodes.has(e.code);
+            if(e.error?.code!=null && typeof(e.error.code)==="number") return allowedEthersErrorNumbers.has(e.error.code);
+            if(e.error?.message!=null && typeof(e.error.message)==="string") return allowedEthersErrorMessages.has(e.error.message);
             return false;
         });
     }

package/src/utils/Utils.ts

@@ -90,3 +90,22 @@ export const allowedEthersErrorCodes: Set<string> = new Set([
     "INVALID_ARGUMENT", "MISSING_ARGUMENT", "UNEXPECTED_ARGUMENT", "VALUE_MISMATCH",
     "CALL_EXCEPTION", "NONCE_EXPIRED", "REPLACEMENT_UNDERPRICED", "TRANSACTION_REPLACED", "UNCONFIGURED_NAME", "OFFCHAIN_FAULT", "ACTION_REJECTED"
 ]);
+
+export const allowedEthersErrorNumbers: Set<number> = new Set([
+    -32700, //Invalid JSON
+    -32600, //Invalid request
+    -32601, //Method not found
+    // -32602, //Invalid params
+    // -32603, //Internal error
+    -32000, //Invalid input
+    // -32001, //Resource not found
+    // -32002, //Resource unavailable
+    // -32003, //Transaction rejected
+    -32004, //Method not supported
+    // -32005, //Limit exceeded
+    -32006 //JSON-RPC version not supported
+]);
+
+export const allowedEthersErrorMessages: Set<string> = new Set([
+    "already known"
+]);