@cryptorubic/web3 0.2.7 → 0.2.9

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@cryptorubic/web3",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "dependencies": {
     "tslib": "^2.3.0",
     "bignumber.js": "9.1.2",
-    "@cryptorubic/core": "0.2.7",
+    "@cryptorubic/core": "0.2.9",
     "viem": "^2.19.1",
     "web3-utils": "^4.3.1",
     "@ton/ton": "^15.1.0",
     "@solana/web3.js": "1.95.3",
     "@solflare-wallet/utl-sdk": "^1.4.0",
     "@ethersproject/bignumber": "^5.7.0",
-    "@cryptorubic/tron-types": "0.2.7",
+    "@cryptorubic/tron-types": "0.2.9",
     "bitcoin-address-validation": "^2.2.3",
     "axios": "0.27.2",
     "crc-32": "^1.2.2",

package/src/lib/adapter/adapters/constants/possible-errors.d.ts

@@ -0,0 +1 @@
+export declare const possibleErrors: string[];

package/src/lib/adapter/adapters/constants/possible-errors.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.possibleErrors = void 0;
+exports.possibleErrors = [
+    'not authorized',
+    'daily request count exceeded',
+    'invalid json rpc response',
+    "we can't execute this request",
+    'your account has been suspended',
+    'account suspended, please top up to reenable',
+    'your account has been suspended',
+    'too many requests, we recommend you to use free api key',
+    'origin not allowed',
+];

package/src/lib/adapter/adapters/evm-adapter.d.ts

@@ -52,4 +52,5 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
      */
     getMaxPriorityFeePerGas(): Promise<number>;
     getBaseFeePerGas(blockNumber: bigint): Promise<number>;
+    private handlePossibleError;
 }

package/src/lib/adapter/adapters/evm-adapter.js

@@ -8,6 +8,7 @@ const abstract_adapter_1 = require("./abstract-adapter");
 const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
 const web3_pure_1 = require("../../utils/web3-pure");
+const possible_errors_1 = require("./constants/possible-errors");
 class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction(token, contractAddress, walletAddress, amount) {
         return this.needApprove(token, contractAddress, walletAddress, amount);
@@ -37,11 +38,9 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         const transports = rpcList.map((rpc) => (0, viem_1.http)(rpc, {
             batch: { batchSize: 2000, wait: 16 },
             onFetchResponse: (response) => {
-                if ('error' in response) {
-                    this.logger?.customError('Rpc fetch error', response.error);
-                }
+                this.handlePossibleError(response);
             },
-            retryCount: 5,
+            retryCount: 2,
             retryDelay: 100,
             timeout: 5000,
         }));
@@ -336,5 +335,18 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         const feedSum = feeHistory.baseFeePerGas.reduce((acc, v) => acc.plus(v.toString() || 0), new bignumber_js_1.default(0));
         return feedSum.dividedBy(feeHistory.baseFeePerGas.length).toNumber();
     }
+    async handlePossibleError(response) {
+        const body = JSON.stringify(response.body);
+        const isError = !response.ok ||
+            'error' in response ||
+            possible_errors_1.possibleErrors.some((error) => body.includes(error));
+        if (isError) {
+            this.logger?.customError('Rpc fetch error', {
+                blockchain: this.blockchain,
+                text: await response.text(),
+                url: response.url,
+            });
+        }
+    }
 }
 exports.EvmAdapter = EvmAdapter;