@cryptorubic/web3 0.8.4 → 0.8.5-alpha.1

package/package.json

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

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

@@ -23,4 +23,5 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
      */
     getTokensBalances(address: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SolanaBlockchainName>[]>;
+    callForTokensInfoNew(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SolanaBlockchainName>[]>;
 }

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

@@ -4,6 +4,7 @@ exports.SolanaAdapter = exports.NATIVE_SOLANA_MINT_ADDRESS = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const abstract_adapter_1 = require("./abstract-adapter");
 const web3_js_1 = require("@solana/web3.js");
+const utl_sdk_1 = require("@solflare-wallet/utl-sdk");
 const core_1 = require("@cryptorubic/core");
 const web3_pure_1 = require("../../utils/web3-pure");
 const bignumber_js_1 = require("bignumber.js");
@@ -71,6 +72,32 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         });
     }
     async callForTokensInfo(tokenAddresses) {
+        const nativeToken = core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.SOLANA];
+        const nativeTokenIndex = tokenAddresses.findIndex((address) => web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.SOLANA, address));
+        const filteredTokenAddresses = tokenAddresses.filter((_, index) => index !== nativeTokenIndex);
+        // only native token in tokenAddresses
+        if (!filteredTokenAddresses.length) {
+            return [nativeToken];
+        }
+        const mints = filteredTokenAddresses.map((address) => new web3_js_1.PublicKey(address));
+        const tokenSdk = new utl_sdk_1.Client();
+        const tokensMint = await tokenSdk.fetchMints(mints);
+        const tokens = tokensMint.map((token) => {
+            return new core_1.Token({
+                address: token.address.toString(),
+                blockchain: core_1.BLOCKCHAIN_NAME.SOLANA,
+                decimals: token.decimals,
+                name: token.name,
+                symbol: token.symbol
+            });
+        });
+        if (nativeTokenIndex === -1) {
+            return tokens;
+        }
+        tokens.splice(nativeTokenIndex, 0, nativeToken);
+        return tokens;
+    }
+    async callForTokensInfoNew(tokenAddresses) {
         const nativeToken = core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.SOLANA];
         const nativeTokenIndex = tokenAddresses.findIndex((address) => web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.SOLANA, address));
         const filteredTokenAddresses = tokenAddresses.filter((_, index) => index !== nativeTokenIndex);

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

@@ -109,6 +109,12 @@ class SolanaTokensService {
         const notFetchedTokensList = this.initialMints.filter((mint) => !fetchedTokensMap.get(mint.toString()));
         return notFetchedTokensList;
     }
+    // private getNotFetchedTokensList(tokensList: SolanaToken[]): PublicKey[] {
+    //     const notFetchedTokensList = this.initialMints.filter((mint) =>
+    //         tokensList.every((token) => !compareAddresses(token.address, mint.toString()))
+    //     );
+    //     return notFetchedTokensList;
+    // }
     async getTokensList(tokenAddresses) {
         try {
             const queryParams = tokenAddresses.length > 1 ? { addresses: tokenAddresses.join(',') } : { query: tokenAddresses[0] };