rubic-sdk 5.50.5-alpha.solana.4 → 5.50.5-alpha.solana.40

package/lib/common/tokens/token.d.ts

@@ -6,6 +6,7 @@ export type TokenStruct<T extends BlockchainName = BlockchainName> = {
     name: string;
     symbol: string;
     decimals: number;
+    image?: string;
 };
 /**
  * Contains main token's fields.
@@ -29,6 +30,7 @@ export declare class Token<T extends BlockchainName = BlockchainName> {
     readonly name: string;
     readonly symbol: string;
     readonly decimals: number;
+    readonly image: string | undefined;
     get isNative(): boolean;
     get isWrapped(): boolean;
     constructor(tokenStruct: TokenStruct<T>);

package/lib/common/tokens/token.js

@@ -39,7 +39,8 @@ class Token {
             ...tokenBaseStruct,
             name: tokenInfo.name,
             symbol: tokenInfo.symbol,
-            decimals: parseInt(tokenInfo.decimals)
+            decimals: parseInt(tokenInfo.decimals),
+            ...('image' in tokenInfo && { image: tokenInfo.image })
         });
     }
     /**
@@ -66,7 +67,8 @@ class Token {
                 blockchain,
                 name: tokenInfo.name,
                 symbol: tokenInfo.symbol,
-                decimals: parseInt(tokenInfo.decimals)
+                decimals: parseInt(tokenInfo.decimals),
+                ...('image' in tokenInfo && { image: tokenInfo.image })
             });
         });
     }
@@ -96,6 +98,7 @@ class Token {
         this.name = tokenStruct.name;
         this.symbol = tokenStruct.symbol;
         this.decimals = tokenStruct.decimals;
+        this.image = tokenStruct.image;
     }
     isEqualTo(token) {
         return (token.blockchain === this.blockchain && (0, blockchain_1.compareAddresses)(token.address, this.address));

package/lib/common/tokens/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/common/tokens/token.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/common/tokens/token.ts"],"names":[],"mappings":"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"}

package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/models/solana-transaction-options.d.ts

@@ -4,4 +4,5 @@ export interface SolanaTransactionOptions extends BasicTransactionOptions {
      * Encoded data, which will be executed in transaction.
      */
     data?: string;
+    fromAddress: string;
 }

package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.d.ts

@@ -7,6 +7,8 @@ export declare class SolanaWeb3Private extends Web3Private {
     private readonly solanaWeb3;
     protected readonly Web3Pure: typeof SolanaWeb3Pure;
     getBlockchainName(): Promise<BlockchainName | undefined>;
-    sendTransaction(options?: SolanaTransactionOptions): Promise<string>;
+    sendTransaction(options: SolanaTransactionOptions): Promise<string>;
+    private updatePriorityFee;
+    private encodeNumberToArrayLE;
     constructor(solanaWeb3: SolanaWeb3);
 }

package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.js

@@ -12,15 +12,21 @@ class SolanaWeb3Private extends web3_private_1.Web3Private {
     async getBlockchainName() {
         return blockchain_name_1.BLOCKCHAIN_NAME.SOLANA;
     }
-    async sendTransaction(options = {}) {
+    async sendTransaction(options) {
         try {
             const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.SOLANA);
             const decodedData = options.data.startsWith('0x')
                 ? Buffer.from(options.data.slice(2), 'hex')
                 : utils_1.base64.decode(options.data);
-            const tx = web3_js_1.VersionedTransaction.deserialize(decodedData);
             const { blockhash } = await web3Public.getRecentBlockhash();
+            const tx = web3_js_1.VersionedTransaction.deserialize(decodedData);
             tx.message.recentBlockhash = blockhash;
+            const [computedUnitsPrice, computedUnitsLimit] = await Promise.all([
+                web3Public.getConsumedUnitsPrice(tx),
+                web3Public.simulateTransaction(tx)
+            ]);
+            console.log('sendTransaction_SOLANA', { computedUnitsPrice, computedUnitsLimit });
+            this.updatePriorityFee(tx, computedUnitsPrice, computedUnitsLimit);
             const { signature } = await this.solanaWeb3.signAndSendTransaction(tx);
             options.onTransactionHash?.(signature);
             return signature;
@@ -30,6 +36,29 @@ class SolanaWeb3Private extends web3_private_1.Web3Private {
             throw evm_web3_private_1.EvmWeb3Private.parseError(err);
         }
     }
+    updatePriorityFee(tx, computeUnitPrice, computeUnitLimit) {
+        const computeBudgetOfset = 1;
+        const computeUnitPriceData = tx.message.compiledInstructions[1].data;
+        const encodedPrice = this.encodeNumberToArrayLE(computeUnitPrice, 8);
+        for (let i = 0; i < encodedPrice.length; i++) {
+            computeUnitPriceData[i + computeBudgetOfset] = encodedPrice[i];
+        }
+        if (computeUnitLimit) {
+            const computeUnitLimitData = tx.message.compiledInstructions[0].data;
+            const encodedLimit = this.encodeNumberToArrayLE(computeUnitLimit, 4);
+            for (let i = 0; i < encodedLimit.length; i++) {
+                computeUnitLimitData[i + computeBudgetOfset] = encodedLimit[i];
+            }
+        }
+    }
+    encodeNumberToArrayLE(num, arraySize) {
+        const result = new Uint8Array(arraySize);
+        for (let i = 0; i < arraySize; i++) {
+            result[i] = Number(num & 0xff);
+            num >>= 8;
+        }
+        return result;
+    }
     constructor(solanaWeb3) {
         super(solanaWeb3.publicKey?.toString() || '');
         this.solanaWeb3 = solanaWeb3;

package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-web3-private.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AACvD,4CAA0C;AAC1C,gFAA6F;AAC7F,8HAAyH;AAGzH,qGAAiG;AACjG,sHAAiH;AACjH,yDAAsD;AAGtD,MAAa,iBAAkB,SAAQ,0BAAW;IAGvC,KAAK,CAAC,iBAAiB;QAC1B,OAAO,iCAAe,CAAC,MAAM,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,UAAoC,EAAE;QAC/D,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,MAAM,CAAC,CAAC;YACpF,MAAM,WAAW,GAAG,OAAO,CAAC,IAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC9C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;gBAC5C,CAAC,CAAC,cAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;YAEnC,MAAM,EAAE,GAAG,8BAAoB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACzD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAC5D,EAAE,CAAC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;YAEvC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;YACvE,OAAO,CAAC,iBAAiB,EAAE,CAAC,SAAS,CAAC,CAAC;YACvC,OAAO,SAAS,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;YAChD,MAAM,iCAAc,CAAC,UAAU,CAAC,GAAgB,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;IAED,YAA6B,UAAsB;QAC/C,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QADrB,eAAU,GAAV,UAAU,CAAY;QA1BhC,aAAQ,GAAG,iCAAc,CAAC;IA4B7C,CAAC;CACJ;AA9BD,8CA8BC"}
+{"version":3,"file":"solana-web3-private.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.ts"],"names":[],"mappings":"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"}

package/lib/core/blockchain/web3-public-service/web3-public/models/supported-token-field.d.ts

@@ -1 +1 @@
-export type SupportedTokenField = 'decimals' | 'symbol' | 'name';
+export type SupportedTokenField = 'decimals' | 'symbol' | 'name' | 'image';

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/models/solana-token.d.ts

@@ -1,3 +1,4 @@
+import { PublicKey } from '@solana/web3.js';
 export interface SolanaToken {
     name: string;
     symbol: string;
@@ -7,3 +8,8 @@ export interface SolanaToken {
     decimals: number | null;
     holders?: number | null;
 }
+export interface SolanaTokensFetchingResp {
+    tokensList: SolanaToken[];
+    notFetchedMints: PublicKey[];
+    hasNotFetchedTokens: boolean;
+}

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.d.ts

@@ -1,14 +1,8 @@
 import { SolanaToken } from '../models/solana-token';
-interface TokenList {
-    preparedTokens: SolanaToken[];
-    addresses: string[];
-}
 export declare class SolanaTokensApiService {
     private static readonly apiEndpoint;
     private static readonly xApiKey;
     static getTokensList(tokenAddresses: string[]): Promise<{
         content: SolanaToken[];
     }>;
-    static prepareTokens(tokenAddresses: string[]): TokenList;
 }
-export {};

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaTokensApiService = void 0;
-const blockchain_1 = require("../../../../../../common/utils/blockchain");
 const injector_1 = require("../../../../../injector/injector");
 class SolanaTokensApiService {
     static getTokensList(tokenAddresses) {
@@ -11,36 +10,6 @@ class SolanaTokensApiService {
             }
         });
     }
-    static prepareTokens(tokenAddresses) {
-        const preparedTokens = [
-            {
-                name: 'Happy Cat',
-                symbol: 'HAPPY',
-                logoURI: null,
-                address: 'HAPPYwgFcjEJDzRtfWE6tiHE9zGdzpNky2FvjPHsvvGZ',
-                decimals: 9
-            },
-            {
-                name: 'Just a chill guy',
-                symbol: 'CHILLGUY',
-                logoURI: 'https://ipfs.io/ipfs/Qmckb3nWWHyoJKtX3FeagfmDZXNVqiXM4nKkYsTnygm2Ah',
-                address: 'Df6yfrKC8kZE3KNkrHERKzAetSxbrWeniQfyJY4Jpump',
-                decimals: 6
-            }
-        ];
-        return tokenAddresses.reduce((list, address) => {
-            const existedToken = preparedTokens.find(token => (0, blockchain_1.compareAddresses)(token.address, address));
-            return existedToken
-                ? {
-                    preparedTokens: [...list.preparedTokens, existedToken],
-                    addresses: list.addresses
-                }
-                : {
-                    preparedTokens: list.preparedTokens,
-                    addresses: [...list.addresses, address]
-                };
-        }, { preparedTokens: [], addresses: [] });
-    }
 }
 exports.SolanaTokensApiService = SolanaTokensApiService;
 SolanaTokensApiService.apiEndpoint = 'https://x-api.rubic.exchange/sol_token_list';

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-tokens-api-service.js","sourceRoot":"","sources":["../../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.ts"],"names":[],"mappings":";;;AAAA,4DAA+D;AAC/D,yDAAsD;AAStD,MAAa,sBAAsB;IAKxB,MAAM,CAAC,aAAa,CAAC,cAAwB;QAChD,OAAO,mBAAQ,CAAC,UAAU,CAAC,IAAI,CAC3B,GAAG,IAAI,CAAC,WAAW,uBAAuB,EAC1C,EAAE,SAAS,EAAE,cAAc,EAAE,EAC7B;YACI,OAAO,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,OAAO;aACvB;SACJ,CACJ,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,cAAwB;QAChD,MAAM,cAAc,GAAG;YACnB;gBACI,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,8CAA8C;gBACvD,QAAQ,EAAE,CAAC;aACd;YACD;gBACI,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,qEAAqE;gBAC9E,OAAO,EAAE,8CAA8C;gBACvD,QAAQ,EAAE,CAAC;aACd;SACJ,CAAC;QACF,OAAO,cAAc,CAAC,MAAM,CACxB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACd,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC7C,IAAA,6BAAgB,EAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,CAAC;YACF,OAAO,YAAY;gBACf,CAAC,CAAC;oBACI,cAAc,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC;oBACtD,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC5B;gBACH,CAAC,CAAC;oBACI,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;iBAC1C,CAAC;QACZ,CAAC,EACD,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAe,CACrD,CAAC;IACN,CAAC;;AAnDL,wDAoDC;AAnD2B,kCAAW,GAAG,6CAA6C,CAAC;AAE5D,8BAAO,GAAG,8CAA8C,CAAC"}
+{"version":3,"file":"solana-tokens-api-service.js","sourceRoot":"","sources":["../../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAItD,MAAa,sBAAsB;IAKxB,MAAM,CAAC,aAAa,CAAC,cAAwB;QAChD,OAAO,mBAAQ,CAAC,UAAU,CAAC,IAAI,CAC3B,GAAG,IAAI,CAAC,WAAW,uBAAuB,EAC1C,EAAE,SAAS,EAAE,cAAc,EAAE,EAC7B;YACI,OAAO,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,OAAO;aACvB;SACJ,CACJ,CAAC;IACN,CAAC;;AAfL,wDAgBC;AAf2B,kCAAW,GAAG,6CAA6C,CAAC;AAE5D,8BAAO,GAAG,8CAA8C,CAAC"}

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.d.ts

@@ -0,0 +1,14 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+import { SolanaToken } from '../models/solana-token';
+export declare class SolanaTokensService {
+    private connection;
+    private tokensOrder;
+    private initialMints;
+    constructor(connection: Connection);
+    fetchTokensData(mints: PublicKey[]): Promise<SolanaToken[]>;
+    private fetchTokensFromBackend;
+    private fetchTokensFromMetaplex;
+    private fetchTokensFromSplApi;
+    private sortTokensByIdx;
+    private getNotFetchedTokensList;
+}

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.js

@@ -0,0 +1,106 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaTokensService = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const utl_sdk_1 = require("@solflare-wallet/utl-sdk");
+const blockchain_1 = require("../../../../../../common/utils/blockchain");
+const p_timeout_1 = __importDefault(require("../../../../../../common/utils/p-timeout"));
+const solana_tokens_api_service_1 = require("./solana-tokens-api-service");
+class SolanaTokensService {
+    constructor(connection) {
+        // key - address of token, value - idx of token in initial tokensAddress
+        this.tokensOrder = {};
+        this.initialMints = [];
+        this.connection = connection;
+    }
+    async fetchTokensData(mints) {
+        const tokensAddresses = mints.map(mint => mint.toString());
+        this.initialMints = mints;
+        this.tokensOrder = tokensAddresses.reduce((acc, address, idx) => ({ ...acc, [address.toLowerCase()]: idx }), {});
+        const fromBackend = await this.fetchTokensFromBackend(mints);
+        if (!fromBackend.hasNotFetchedTokens)
+            return this.sortTokensByIdx(fromBackend.tokensList);
+        const fromMetaplex = await this.fetchTokensFromMetaplex(fromBackend.notFetchedMints, fromBackend.tokensList);
+        const backendWithMetaplexTokens = this.sortTokensByIdx([
+            ...fromBackend.tokensList,
+            ...fromMetaplex.tokensList
+        ]);
+        if (!fromMetaplex.hasNotFetchedTokens)
+            return backendWithMetaplexTokens;
+        const fromSplApi = await this.fetchTokensFromSplApi(fromMetaplex.notFetchedMints, backendWithMetaplexTokens);
+        return this.sortTokensByIdx([
+            ...fromBackend.tokensList,
+            ...fromMetaplex.tokensList,
+            ...fromSplApi.tokensList
+        ]);
+    }
+    async fetchTokensFromBackend(mints) {
+        try {
+            const tokensAddresses = mints.map(mint => mint.toString());
+            const { content: notSortedTokensList } = await (0, p_timeout_1.default)(solana_tokens_api_service_1.SolanaTokensApiService.getTokensList(tokensAddresses), 4000, new Error('Api Timeout!'));
+            const notFetchedMints = this.getNotFetchedTokensList(notSortedTokensList);
+            return {
+                tokensList: notSortedTokensList,
+                notFetchedMints,
+                hasNotFetchedTokens: notFetchedMints.length > 0
+            };
+        }
+        catch {
+            return {
+                tokensList: [],
+                notFetchedMints: [...mints],
+                hasNotFetchedTokens: true
+            };
+        }
+    }
+    async fetchTokensFromMetaplex(mints, prevTokensList) {
+        const config = new utl_sdk_1.UtlConfig({
+            connection: this.connection,
+            timeout: 5000
+        });
+        const tokenSDK = new utl_sdk_1.Client(config);
+        const metaplexTokens = await tokenSDK.getFromMetaplex(mints).catch(() => []);
+        const notSortedTokensList = [...prevTokensList, ...metaplexTokens];
+        const notFetchedMints = this.getNotFetchedTokensList(notSortedTokensList);
+        return {
+            tokensList: metaplexTokens,
+            notFetchedMints,
+            hasNotFetchedTokens: notFetchedMints.length > 0
+        };
+    }
+    async fetchTokensFromSplApi(mints, prevTokensList) {
+        const splApiResp = await Promise.all(mints.map(mint => (0, spl_token_1.getMint)(this.connection, mint, 'confirmed'))).catch(() => []);
+        const splApiTokens = splApiResp.filter(Boolean).map(token => ({
+            name: `Token ${token.address.toString().slice(0, 10)}`,
+            symbol: `Token ${token.address.toString().slice(0, 10)}`,
+            logoURI: null,
+            decimals: token.decimals,
+            address: token.address.toString(),
+            verified: token.isInitialized
+        }));
+        const notSortedTokensList = [...prevTokensList, ...splApiTokens];
+        const notFetchedMints = this.getNotFetchedTokensList(notSortedTokensList);
+        return {
+            tokensList: notSortedTokensList,
+            notFetchedMints,
+            hasNotFetchedTokens: notFetchedMints.length > 0
+        };
+    }
+    sortTokensByIdx(notSortedList) {
+        const sortedList = [];
+        for (const token of notSortedList) {
+            const originalIdx = this.tokensOrder[token.address.toLowerCase()];
+            sortedList[originalIdx] = token;
+        }
+        return sortedList;
+    }
+    getNotFetchedTokensList(tokensList) {
+        const notFetchedTokensList = this.initialMints.filter(mint => tokensList.every(token => !(0, blockchain_1.compareAddresses)(token.address, mint.toString())));
+        return notFetchedTokensList;
+    }
+}
+exports.SolanaTokensService = SolanaTokensService;
+//# sourceMappingURL=solana-tokens-service.js.map

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solana-tokens-service.js","sourceRoot":"","sources":["../../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.ts"],"names":[],"mappings":"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"}

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.d.ts

@@ -1,4 +1,4 @@
-import { BlockhashWithExpiryBlockHeight, Connection } from '@solana/web3.js';
+import { BlockhashWithExpiryBlockHeight, Connection, VersionedTransaction } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
 import { Web3PrimitiveType } from '../../../models/web3-primitive-type';
 import { ContractMulticallResponse } from '../models/contract-multicall-response';
@@ -13,13 +13,25 @@ import { AbiItem } from 'web3-utils';
  */
 export declare class SolanaWeb3Public extends Web3Public {
     private readonly connection;
+    private readonly HELIUS_API_URL;
+    private readonly MAX_TRANSFER_COST;
     constructor(connection: Connection);
+    /**
+     * @returns ComputedUnitsLimit - like gasLimit in evm
+     */
+    simulateTransaction(tx: VersionedTransaction): Promise<number>;
+    /**
+     * @returns ComputedUnitsPrice - like gasPrice in evm
+     */
+    getConsumedUnitsPrice(tx: VersionedTransaction): Promise<number>;
+    getLastComputeUnits(): Promise<BigNumber>;
     getBlockNumber(): Promise<number>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(_contractAbi: AbiItem[], _contractsData: {
         contractAddress: string;
         methodsData: MethodData[];
     }[]): Promise<ContractMulticallResponse<Output>[][]>;
     getTransactionStatus(hash: string): Promise<TxStatus>;
+    callForTokenInfo(tokenAddress: string, tokenFields?: SupportedTokenField[]): Promise<Partial<Record<SupportedTokenField, string>>>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>, tokenFields?: SupportedTokenField[]): Promise<Partial<Record<SupportedTokenField, string>>[]>;
     getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
     getTokenBalance(address: string, tokenAddress: string): Promise<BigNumber>;
@@ -29,8 +41,6 @@ export declare class SolanaWeb3Public extends Web3Public {
         gasPrice?: string;
         gas?: string;
     }): Promise<T>;
-    private fetchMints;
-    private hasNotFetchedTokens;
     healthCheck(timeoutMs?: number): Promise<boolean>;
     /**
      * Gets balance of multiple tokens.

package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.js

@@ -1,10 +1,4 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -12,18 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaWeb3Public = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const utl_sdk_1 = require("@solflare-wallet/utl-sdk");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const utils_1 = require("ethers/lib/utils");
 const rxjs_1 = require("rxjs");
 const native_tokens_1 = require("../../../../../common/tokens/constants/native-tokens");
-const blockchain_1 = require("../../../../../common/utils/blockchain");
-const decorators_1 = require("../../../../../common/utils/decorators");
 const native_solana_mint_address_1 = require("../../../constants/solana/native-solana-mint-address");
 const blockchain_name_1 = require("../../../models/blockchain-name");
 const tx_status_1 = require("../models/tx-status");
 const web3_public_1 = require("../web3-public");
 const solana_web3_pure_1 = require("../../../web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure");
-const solana_tokens_api_service_1 = require("./services/solana-tokens-api-service");
+const injector_1 = require("../../../../injector/injector");
+const solana_tokens_service_1 = require("./services/solana-tokens-service");
 /**
  * Class containing methods for calling contracts in order to obtain information from the blockchain.
  * To send transaction or execute contract method use {@link Web3Private}.
@@ -32,6 +25,56 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
     constructor(connection) {
         super(blockchain_name_1.BLOCKCHAIN_NAME.SOLANA);
         this.connection = connection;
+        this.HELIUS_API_URL = 'https://mainnet.helius-rpc.com';
+        this.MAX_TRANSFER_COST = 10000;
+    }
+    /**
+     * @returns ComputedUnitsLimit - like gasLimit in evm
+     */
+    async simulateTransaction(tx) {
+        const DEFAULT_CU_LIMIT = 600000;
+        try {
+            const resp = await this.connection.simulateTransaction(tx, {
+                replaceRecentBlockhash: true
+            });
+            return resp.value.unitsConsumed || DEFAULT_CU_LIMIT;
+        }
+        catch (err) {
+            console.error('Solana_simulateTransaction_Error ==> ', err);
+            return DEFAULT_CU_LIMIT;
+        }
+    }
+    /**
+     * @returns ComputedUnitsPrice - like gasPrice in evm
+     */
+    async getConsumedUnitsPrice(tx) {
+        const resp = await injector_1.Injector.httpClient.post(`${this.HELIUS_API_URL}/?api-key=f6b96e37-e267-4b67-8790-84bdf8748c39`, {
+            jsonrpc: '2.0',
+            id: '1',
+            method: 'getPriorityFeeEstimate',
+            params: [
+                {
+                    transaction: utils_1.base58.encode(tx.serialize()), // Pass the serialized transaction in Base58
+                    options: { priorityLevel: 'VeryHigh' }
+                }
+            ]
+        });
+        return resp.result.priorityFeeEstimate;
+    }
+    /* like gasLimit in evm */
+    async getLastComputeUnits() {
+        const latestSlot = await this.connection.getSlot();
+        const block = await this.connection.getParsedBlock(latestSlot, {
+            transactionDetails: 'full',
+            maxSupportedTransactionVersion: 0
+        });
+        const onlyDeFiSwaps = block.transactions.filter(tx => Number(tx.meta?.computeUnitsConsumed) > this.MAX_TRANSFER_COST);
+        const maxUnits = onlyDeFiSwaps.reduce((maxUnits, tx) => {
+            const computeUnits = Number(tx.meta?.computeUnitsConsumed);
+            return maxUnits > computeUnits ? maxUnits : computeUnits;
+        }, 0);
+        console.log('%cLAST_BLOCK ===> ', 'color: pink; font-size: 20px;', { block, maxUnits });
+        return new bignumber_js_1.default(maxUnits);
     }
     getBlockNumber() {
         return this.connection.getBlockHeight('finalized');
@@ -56,25 +99,33 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
             return tx_status_1.TX_STATUS.PENDING;
         }
     }
-    async callForTokensInfo(tokenAddresses, tokenFields = ['decimals', 'symbol', 'name']) {
+    async callForTokenInfo(tokenAddress, tokenFields = ['decimals', 'symbol', 'name', 'image']) {
+        return (await this.callForTokensInfo([tokenAddress], tokenFields))[0];
+    }
+    async callForTokensInfo(tokenAddresses, tokenFields = ['decimals', 'symbol', 'name', 'image']) {
         const nativeTokenIndex = tokenAddresses.findIndex(address => this.Web3Pure.isNativeAddress(address));
         const filteredTokenAddresses = tokenAddresses.filter((_, index) => index !== nativeTokenIndex);
-        const { preparedTokens, addresses } = solana_tokens_api_service_1.SolanaTokensApiService.prepareTokens(filteredTokenAddresses);
-        const mints = addresses.map(address => new web3_js_1.PublicKey(address));
-        const tokensMint = await this.fetchMints(mints);
-        const fetchedTokens = tokensMint.map(token => {
-            const entries = tokenFields.map(field => [field, token?.[field]]);
-            return Object.fromEntries(entries);
-        });
-        const tokens = [...fetchedTokens, ...preparedTokens];
-        if (nativeTokenIndex === -1) {
-            return tokens;
-        }
         const blockchainNativeToken = native_tokens_1.nativeTokensList[this.blockchainName];
         const nativeToken = {
             ...blockchainNativeToken,
             decimals: blockchainNativeToken.decimals.toString()
         };
+        // only native token in array
+        if (!filteredTokenAddresses.length && nativeTokenIndex !== -1) {
+            return [nativeToken];
+        }
+        const mints = filteredTokenAddresses.map(address => new web3_js_1.PublicKey(address));
+        const tokensMint = await new solana_tokens_service_1.SolanaTokensService(this.connection).fetchTokensData(mints);
+        const tokens = tokensMint.map(token => {
+            const data = tokenFields.reduce((acc, fieldName) => ({
+                ...acc,
+                [fieldName]: fieldName === 'image' ? token.logoURI : token[fieldName]
+            }), {});
+            return data;
+        });
+        if (nativeTokenIndex === -1) {
+            return tokens;
+        }
         tokens.splice(nativeTokenIndex, 0, nativeToken);
         return tokens;
     }
@@ -94,52 +145,6 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
     async callContractMethod(_contractAddress, _contractAbi, _methodName, _methodArguments = [], _options = {}) {
         throw new Error('Method call is not supported');
     }
-    async fetchMints(mints) {
-        const tokensAddresses = mints.map(mint => mint.toString());
-        let tokensList = [];
-        let notFetchedList = [];
-        const m = await (0, spl_token_1.getMint)(this.connection, mints[0], 'confirmed');
-        const tokenData = await (0, spl_token_1.getTokenMetadata)(this.connection, mints[0], 'confirmed').catch(err => err);
-        const rpcResp = await this.connection
-            .getAccountInfo(mints[0], 'confirmed')
-            .catch(err => err);
-        console.log(`%cMINT`, 'color: aqua; font-sie: 20px;', { mint: m, tokenData, rpcResp });
-        try {
-            const { content } = await solana_tokens_api_service_1.SolanaTokensApiService.getTokensList(tokensAddresses);
-            tokensList = content;
-            notFetchedList = mints.filter(mint => tokensList.some(token => !(0, blockchain_1.compareAddresses)(token.address, mint.toString())));
-        }
-        catch { }
-        if (!this.hasNotFetchedTokens(notFetchedList))
-            return tokensList;
-        const config = new utl_sdk_1.UtlConfig({
-            connection: this.connection,
-            timeout: 5000
-        });
-        const tokenSDK = new utl_sdk_1.Client(config);
-        const metaplexTokens = await tokenSDK.getFromMetaplex(notFetchedList);
-        notFetchedList = mints.filter(mint => [...tokensList, ...metaplexTokens].some(token => !(0, blockchain_1.compareAddresses)(token.address, mint.toString())));
-        if (!this.hasNotFetchedTokens(notFetchedList))
-            return [...tokensList, ...metaplexTokens];
-        // const splApiResp = await Promise.all(
-        notFetchedList.map(mint => (0, spl_token_1.getTokenMetadata)(this.connection, mint, 'confirmed'));
-        // );
-        // const splApiTokens = splApiResp.filter(Boolean).map(
-        //     token =>
-        //         ({
-        //             name: token!.name,
-        //             symbol: token!.symbol,
-        //             logoURI: token!.uri,
-        //             decimals: Number(token?.additionalMetadata?.[0]?.[0] || 9),
-        //             address: token!.mint.toString(),
-        //             verified: true
-        //         } as SolanaToken)
-        // );
-        return [...tokensList, ...metaplexTokens];
-    }
-    hasNotFetchedTokens(notFetchedList) {
-        return notFetchedList.length > 0;
-    }
     healthCheck(timeoutMs = 4000) {
         const request = this.connection.getBalanceAndContext(new web3_js_1.PublicKey('DVLwQbEaw5txuduQwvfbNP3sXvjawHqaoMuGMKZx15bQ'), 'confirmed');
         return (0, rxjs_1.firstValueFrom)((0, rxjs_1.from)(request).pipe((0, rxjs_1.timeout)(timeoutMs), (0, rxjs_1.map)(result => Boolean(result)), (0, rxjs_1.catchError)((err) => {
@@ -194,7 +199,4 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
     }
 }
 exports.SolanaWeb3Public = SolanaWeb3Public;
-__decorate([
-    decorators_1.Cache
-], SolanaWeb3Public.prototype, "callForTokensInfo", null);
 //# sourceMappingURL=solana-web3-public.js.map