@cryptorubic/web3 0.5.1-alpha.ton-debug.1 → 0.5.1-fix-polygon.0

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@cryptorubic/web3",
-  "version": "0.5.1-alpha.ton-debug.1",
+  "version": "0.5.1-fix-polygon.0",
   "dependencies": {
     "tslib": "^2.3.0",
     "bignumber.js": "9.1.2",
-    "@cryptorubic/core": "0.5.1-alpha.ton-debug.1",
+    "@cryptorubic/core": "0.5.1-fix-polygon.0",
     "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.5.1-alpha.ton-debug.1",
+    "@cryptorubic/tron-types": "0.5.1-fix-polygon.0",
     "bitcoin-address-validation": "^2.2.3",
     "axios": "0.27.2",
     "crc-32": "^1.2.2",

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

@@ -11,7 +11,7 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
     needPreswapAction(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     handlePreswap(contractAddress: string, walletAddress: string, tokenAmount: TokenAmount): Promise<void>;
     constructor(adapterOptions: EvmAdapterOptions, logger?: ICustomLogger);
-    protected createPublicClient(rpcList: string[]): (PublicActions & PublicClient) | null;
+    private createPublicClient;
     read<T>(address: string, abi: Abi, method: string, methodArgs?: unknown[]): Promise<T>;
     writeContract(address: string, abi: Abi, method: string, value?: string, methodArgs?: unknown[]): Promise<string>;
     write(address: string, to: string, value: string, data: string): Promise<string>;

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

@@ -10,6 +10,15 @@ const bignumber_js_1 = require("bignumber.js");
 const web3_pure_1 = require("../../utils/web3-pure");
 const possible_errors_1 = require("./constants/possible-errors");
 const uni_v3_permit_abi_1 = require("./constants/uni-v3-permit-abi");
+const defaultTransportConfig = {
+    batch: { batchSize: 2000, wait: 16 },
+    retryCount: 2,
+    retryDelay: 100,
+    timeout: 5000
+};
+const defaultFallbackConfig = {
+    rank: true
+};
 class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction(token, contractAddress, walletAddress, amount) {
         return this.needApprove(token, contractAddress, walletAddress, amount);
@@ -29,29 +38,24 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     constructor(adapterOptions, logger) {
         super(adapterOptions.blockchain, logger);
-        this.public = this.createPublicClient(adapterOptions.rpcList);
+        this.public = this.createPublicClient(adapterOptions.rpcList, adapterOptions?.transportConfig || defaultTransportConfig, adapterOptions?.fallbackConfig || defaultFallbackConfig);
     }
-    createPublicClient(rpcList) {
+    createPublicClient(rpcList, transportConfig, fallbackConfig) {
         if (!rpcList?.[0]) {
             this.logger?.customError('RPC list is empty');
             return null;
         }
-        const transports = rpcList.map((rpc) => (0, viem_1.http)(rpc, {
-            batch: { batchSize: 2000, wait: 16 },
+        const transports = rpcList.map((rpc) => (0, viem_1.http)(rpc), {
             onFetchResponse: (response) => {
                 this.handlePossibleError(response);
             },
-            retryCount: 2,
-            retryDelay: 100,
-            timeout: 5000
-        }));
+            ...transportConfig
+        });
         const chain = viem_blockchain_mapping_1.viemBlockchainMapping[this.blockchain];
         return (0, viem_1.createPublicClient)({
             // @ts-ignore
             chain,
-            transport: (0, viem_1.fallback)(transports, {
-                rank: true
-            })
+            transport: (0, viem_1.fallback)(transports, fallbackConfig)
         });
     }
     async read(address, abi, method, methodArgs = []) {

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

@@ -1,6 +1,9 @@
 import { EvmBlockchainName } from '@cryptorubic/core';
+import { HttpTransportConfig, FallbackTransportConfig } from 'viem';
 export interface EvmAdapterOptions {
     blockchain: EvmBlockchainName;
     rpcList: string[];
     walletAddress?: string;
+    transportConfig?: HttpTransportConfig;
+    fallbackConfig?: FallbackTransportConfig;
 }

package/src/lib/adapter/adapters/utils/ton-api.service.js

@@ -127,21 +127,16 @@ class TonApiService {
         return res.decoded;
     }
     async fetchTokenInfo(tokenAddress) {
-        try {
-            const res = await this.httpClient.get(`${this.tonApiUrl}/v2/jettons/${tokenAddress}`, {
-                headers: {
-                    apiKey: this.apiKey,
-                    referer: 'https://api.rubic.exchange'
-                }
-            });
-            if ('error' in res) {
-                throw new Error(`[TonApiService] Error in fetchTokenInfo - ${res.error}`);
+        const res = await this.httpClient.get(`${this.tonApiUrl}/v2/jettons/${tokenAddress}`, {
+            headers: {
+                apiKey: this.apiKey,
+                referer: 'https://api.rubic.exchange'
             }
-            return res.metadata;
-        }
-        catch (err) {
-            throw new Error(`[TonApiService] Error in fetchTokenInfo - ${err}`);
+        });
+        if ('error' in res) {
+            throw new Error(`[TonApiService] Error in fetchTokenInfo - ${res.error}`);
         }
+        return res.metadata;
     }
     /**
      *

package/src/lib/adapter/blockchain-adapter-factory.service.js

@@ -70,7 +70,10 @@ class BlockchainAdapterFactoryService {
                 if (viem_blockchain_mapping_1.viemBlockchainMapping?.[blockchain]) {
                     return new evm_adapter_1.EvmAdapter({
                         blockchain: blockchain,
-                        rpcList: rpcs
+                        rpcList: rpcs,
+                        ...(blockchain === core_1.BLOCKCHAIN_NAME.POLYGON && {
+                            fallbackConfig: { rank: false }
+                        })
                     }, this.createLogger?.(`EVM_ADAPTER_${blockchain}`));
                 }
             }