@cryptorubic/web3 0.8.17-alpha.solana.4 → 0.8.17-alpha.solana.6

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.17-alpha.solana.4",
+    "version": "0.8.17-alpha.solana.6",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.17-alpha.solana.4",
+        "@cryptorubic/core": "0.8.17-alpha.solana.6",
         "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.8.17-alpha.solana.4",
+        "@cryptorubic/tron-types": "0.8.17-alpha.solana.6",
         "bitcoin-address-validation": "^2.2.3",
         "axios": "0.27.2",
         "crc-32": "^1.2.2",

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

@@ -34,13 +34,13 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             return null;
         }
         const transports = rpcList.map((rpc) => (0, viem_1.http)(rpc, {
-            batch: { batchSize: 2000, wait: 16 },
+            batch: { batchSize: 2_000, wait: 16 },
             onFetchResponse: (response) => {
                 this.handlePossibleError(response);
             },
             retryCount: 2,
             retryDelay: 100,
-            timeout: 5000
+            timeout: 5_000
         }));
         const chain = viem_blockchain_mapping_1.viemBlockchainMapping[this.blockchain];
         return (0, viem_1.createPublicClient)({
@@ -48,7 +48,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             chain,
             transport: (0, viem_1.fallback)(transports, {
                 rank: {
-                    interval: 1800000
+                    interval: 1_800_000
                 }
             })
         });
@@ -135,7 +135,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             throw err;
         }
     }
-    async simulateTransaction(config, from, timeout = 15000) {
+    async simulateTransaction(config, from, timeout = 15_000) {
         try {
             const callParams = {
                 account: from,
@@ -278,7 +278,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             to: tx.to
         };
     }
-    async approveOnPermit2(fromAddress, tokenAddress, permit2Address, spenderAddress, deadline = new bignumber_js_1.default(1000000), amount) {
+    async approveOnPermit2(fromAddress, tokenAddress, permit2Address, spenderAddress, deadline = new bignumber_js_1.default(1_000_000), amount) {
         const approveAmount = amount ? amount : new bignumber_js_1.default(2).pow(256).minus(1);
         const expiration = new bignumber_js_1.default(Date.now()).plus(deadline).toFixed();
         const tx = this.encodePermit2Approve(tokenAddress, spenderAddress, permit2Address, expiration, approveAmount.toFixed());

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

@@ -6,12 +6,12 @@ import BigNumber from 'bignumber.js';
 import { SolanaRawInstruction } from './models/solana-web3-types';
 import { SolanaTxConfig } from '../../utils/models/solana-transaction-config';
 import { SolanaAdapterConfig } from './models/solana-adapter-config';
-import { SolanaApiService } from './utils/solana-utils/solana-api-service';
+import { SolanaGasService } from './utils/solana-utils/solana-gas-service';
 export declare const NATIVE_SOLANA_MINT_ADDRESS = "So11111111111111111111111111111111111111111";
 export declare const DEFAULT_CU_LIMIT = 600000;
 export declare class SolanaAdapter extends AbstractAdapter<Connection, Connection, SolanaBlockchainName> {
     private readonly httpClient;
-    readonly apiService: SolanaApiService;
+    readonly apiService: SolanaGasService;
     constructor(rpcList: string[], httpClient: HttpClient, solanaConfig: SolanaAdapterConfig, logger?: ICustomLogger);
     private createPublicClient;
     read<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;

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

@@ -9,16 +9,16 @@ const web3_pure_1 = require("../../utils/web3-pure");
 const bignumber_js_1 = require("bignumber.js");
 const bs58_1 = require("bs58");
 const utils_1 = require("ethers/lib/utils");
-const solana_api_service_1 = require("./utils/solana-utils/solana-api-service");
+const solana_gas_service_1 = require("./utils/solana-utils/solana-gas-service");
 const solana_tokens_service_1 = require("./utils/solana-utils/solana-tokens-service");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
-exports.DEFAULT_CU_LIMIT = 600000;
+exports.DEFAULT_CU_LIMIT = 600_000;
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, solanaConfig, logger) {
         super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
         this.httpClient = httpClient;
         this.public = this.createPublicClient(rpcList);
-        this.apiService = new solana_api_service_1.SolanaApiService(httpClient, this.public, solanaConfig);
+        this.apiService = new solana_gas_service_1.SolanaGasService(httpClient, this.public, solanaConfig);
     }
     createPublicClient(rpcList) {
         if (!rpcList?.[0]) {
@@ -41,7 +41,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     async multicallByAddress(_address, _abi, _method, _methodArgs = [], _allowErrors = true) {
         throw new Error('Method multicall is not supported');
     }
-    async simulateTransaction(config, timeout = 15000) {
+    async simulateTransaction(config, timeout = 15_000) {
         try {
             const bufferData = config.data.startsWith('0x') ? Buffer.from(config.data.slice(2), 'hex') : Buffer.from(config.data, 'base64');
             const { blockhash } = await this.public.getLatestBlockhash();

package/src/lib/adapter/adapters/utils/solana-utils/solana-gas-service.d.ts

@@ -0,0 +1,22 @@
+import { HttpClient } from '@cryptorubic/core';
+import { Connection } from '@solana/web3.js';
+import { SolanaAdapterConfig } from '../../models/solana-adapter-config';
+import BigNumber from 'bignumber.js';
+export declare class SolanaGasService {
+    private httpClient;
+    private readonly connection;
+    private readonly HELIUS_API_URL;
+    private readonly HELIUS_API_KEY;
+    constructor(httpClient: HttpClient, connection: Connection, solanaConfig: SolanaAdapterConfig);
+    /**
+     * @returns wei ComputedUnitsLimit - like gasLimit in evm
+     */
+    getConsumedUnitsLimit(txData: string): Promise<BigNumber>;
+    /**
+     * @param txData base64 or hex string
+     * @returns wei ComputedUnitsPrice - like gasPrice in evm
+     */
+    getConsumedUnitsPrice(txData: string): Promise<BigNumber>;
+    private calculateCUPriceHelius;
+    private calculateCUPriceSolWeb3;
+}

package/src/lib/adapter/adapters/utils/solana-utils/{solana-api-service.js → solana-gas-service.js}

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaApiService = void 0;
+exports.SolanaGasService = void 0;
 const utils_1 = require("ethers/lib/utils");
 const utility_funcs_1 = require("./utility-funcs");
-class SolanaApiService {
+const bignumber_js_1 = require("bignumber.js");
+class SolanaGasService {
     constructor(httpClient, connection, solanaConfig) {
         this.httpClient = httpClient;
         this.connection = connection;
@@ -11,29 +12,34 @@ class SolanaApiService {
         this.HELIUS_API_KEY = solanaConfig.heliusApiKey;
     }
     /**
-     * @returns ComputedUnitsLimit - like gasLimit in evm
+     * @returns wei ComputedUnitsLimit - like gasLimit in evm
      */
     async getConsumedUnitsLimit(txData) {
-        const DEFAULT_CU_LIMIT = 600000;
+        const DEFAULT_CU_LIMIT = 600_000;
         try {
             const tx = (0, utility_funcs_1.convertB64DataToTx)(txData);
             const resp = await this.connection.simulateTransaction(tx, {
                 replaceRecentBlockhash: true
             });
-            return resp.value.unitsConsumed ? resp.value.unitsConsumed * 1.2 : DEFAULT_CU_LIMIT;
+            return resp.value.unitsConsumed ? new bignumber_js_1.default(resp.value.unitsConsumed * 1.2) : new bignumber_js_1.default(DEFAULT_CU_LIMIT);
         }
         catch (err) {
             console.error('Solana_simulateTransaction_Error ==> ', err);
-            return DEFAULT_CU_LIMIT;
+            return new bignumber_js_1.default(DEFAULT_CU_LIMIT);
         }
     }
     /**
-     * @returns ComputedUnitsPrice - like gasPrice in evm
+     * @param txData base64 or hex string
+     * @returns wei ComputedUnitsPrice - like gasPrice in evm
      */
     async getConsumedUnitsPrice(txData) {
         if (!this.HELIUS_API_KEY) {
-            throw new Error('[SolanaApiService_getConsumedUnitsPrice] params.solanaParams.heliusApiKey is not provided in "createFactory" method to use this method');
+            console.warn('[SolanaApiService_getConsumedUnitsPrice] heliusApiKey is not provided in "createFactory"');
         }
+        const cuPrice = await Promise.any([this.calculateCUPriceHelius(txData), this.calculateCUPriceSolWeb3()]);
+        return cuPrice;
+    }
+    async calculateCUPriceHelius(txData) {
         const tx = (0, utility_funcs_1.convertB64DataToTx)(txData);
         const resp = await this.httpClient.post(`${this.HELIUS_API_URL}/?api-key=${this.HELIUS_API_KEY}`, {
             jsonrpc: '2.0',
@@ -46,7 +52,15 @@ class SolanaApiService {
                 }
             ]
         });
-        return resp.result.priorityFeeEstimate;
+        return new bignumber_js_1.default(resp.result.priorityFeeEstimate);
+    }
+    async calculateCUPriceSolWeb3() {
+        const resp = await this.connection.getRecentPrioritizationFees();
+        const cuPriceSum = resp
+            .reduce((acc, tx) => acc.plus(tx.prioritizationFee), new bignumber_js_1.default(0))
+            .div(resp.length)
+            .dp(0, bignumber_js_1.default.ROUND_CEIL);
+        return cuPriceSum;
     }
 }
-exports.SolanaApiService = SolanaApiService;
+exports.SolanaGasService = SolanaGasService;

package/src/lib/adapter/adapters/utils/solana-utils/solana-tokens-service.js

@@ -57,7 +57,7 @@ class SolanaTokensService {
     }
     async fetchTokensFromOldBackend(mints, prevFetchedTokens) {
         const tokensAddresses = mints.map((mint) => mint.toString());
-        const { content: tokensFromOlbBackend } = await (0, timeout_1.withTimeout)(this.getTokensListOld(tokensAddresses), 3000, 'Api Timeout!').catch(() => ({ content: [] }));
+        const { content: tokensFromOlbBackend } = await (0, timeout_1.withTimeout)(this.getTokensListOld(tokensAddresses), 3_000, 'Api Timeout!').catch(() => ({ content: [] }));
         const notSortedTokensList = [...prevFetchedTokens, ...tokensFromOlbBackend];
         const notFetchedMints = this.getNotFetchedTokensList(notSortedTokensList);
         return {

package/src/lib/adapter/adapters/utils/solana-utils/utility-funcs.d.ts

@@ -1,2 +1,2 @@
 import { VersionedTransaction } from '@solana/web3.js';
-export declare function convertB64DataToTx(base64Data: string): VersionedTransaction;
+export declare function convertB64DataToTx(txData: string): VersionedTransaction;

package/src/lib/adapter/adapters/utils/solana-utils/utility-funcs.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertB64DataToTx = convertB64DataToTx;
 const web3_js_1 = require("@solana/web3.js");
-function convertB64DataToTx(base64Data) {
-    const bufferData = base64Data.startsWith('0x') ? Buffer.from(base64Data.slice(2), 'hex') : Buffer.from(base64Data, 'base64');
+function convertB64DataToTx(txData) {
+    const bufferData = txData.startsWith('0x') ? Buffer.from(txData.slice(2), 'hex') : Buffer.from(txData, 'base64');
     const tx = web3_js_1.VersionedTransaction.deserialize(bufferData);
     return tx;
 }

package/src/lib/adapter/adapters/utils/solana-utils/solana-api-service.d.ts

@@ -1,18 +0,0 @@
-import { HttpClient } from '@cryptorubic/core';
-import { Connection } from '@solana/web3.js';
-import { SolanaAdapterConfig } from '../../models/solana-adapter-config';
-export declare class SolanaApiService {
-    private httpClient;
-    private readonly connection;
-    private readonly HELIUS_API_URL;
-    private readonly HELIUS_API_KEY;
-    constructor(httpClient: HttpClient, connection: Connection, solanaConfig: SolanaAdapterConfig);
-    /**
-     * @returns ComputedUnitsLimit - like gasLimit in evm
-     */
-    getConsumedUnitsLimit(txData: string): Promise<number>;
-    /**
-     * @returns ComputedUnitsPrice - like gasPrice in evm
-     */
-    getConsumedUnitsPrice(txData: string): Promise<number>;
-}