@rabby-wallet/rabby-api 0.6.15-alpha.1 → 0.6.15-alpha.2

package/dist/index.d.ts

@@ -71,6 +71,7 @@ export declare class OpenApiService {
         timeAt?: number;
         dateAt?: string;
     }) => Promise<TokenItem[]>;
+    _customListToken: (uuids: string[], id: string, isTestnet?: boolean) => Promise<TokenItem[]>;
     customListToken: (uuids: string[], id: string) => Promise<TokenItem[]>;
     listChainAssets: (id: string) => Promise<AssetItem[]>;
     listNFT: (id: string, isAll?: boolean) => Promise<NFTItem[]>;

package/dist/index.js

@@ -12,7 +12,6 @@ import rateLimit from 'axios-rate-limit';
 import { ethErrors } from 'eth-rpc-errors';
 import { getChain, INITIAL_OPENAPI_URL, CHAINS, SIGN_HDS, genSignParams, INITIAL_TESTNET_OPENAPI_URL, getChainByNetwork, } from './utils';
 import * as sign from '@rabby-wallet/rabby-sign/umd/sign-wasm-rabby';
-import { TESTNET_CHAINS_LIST } from '@debank/common';
 const maxRPS = 500;
 export class OpenApiService {
     constructor({ store, adapter }) {
@@ -295,16 +294,37 @@ export class OpenApiService {
                 } }, this._getRequestOptions(params.chainId)));
             return data === null || data === void 0 ? void 0 : data.filter((token) => getChain(token.chain));
         });
-        this.customListToken = (uuids, id) => __awaiter(this, void 0, void 0, function* () {
-            const chain = TESTNET_CHAINS_LIST.find((item) => {
-                return uuids === null || uuids === void 0 ? void 0 : uuids.find((uuid) => uuid.split(':')[0] === item.serverId);
-            });
+        this._customListToken = (uuids, id, isTestnet = false) => __awaiter(this, void 0, void 0, function* () {
+            if ((uuids === null || uuids === void 0 ? void 0 : uuids.length) || !id) {
+                return [];
+            }
             const { data } = yield this.request.post('/v1/user/specific_token_list', {
                 id,
                 uuids,
-            }, this._getRequestOptions(chain === null || chain === void 0 ? void 0 : chain.serverId));
+            }, isTestnet && this.store.testnetHost
+                ? { baseURL: this.store.testnetHost }
+                : undefined);
             return data === null || data === void 0 ? void 0 : data.filter((token) => getChain(token.chain));
         });
+        this.customListToken = (uuids, id) => __awaiter(this, void 0, void 0, function* () {
+            const mainnetIds = [];
+            const testnetIds = [];
+            uuids.forEach((uuid) => {
+                const serverId = uuid.split(':')[0];
+                const chain = getChain(serverId);
+                if (chain === null || chain === void 0 ? void 0 : chain.isTestnet) {
+                    testnetIds.push(uuid);
+                }
+                else {
+                    mainnetIds.push(uuid);
+                }
+            });
+            const res = yield Promise.all([
+                this._customListToken(mainnetIds, id),
+                this._customListToken(testnetIds, id, true),
+            ]);
+            return res.flat();
+        });
         this.listChainAssets = (id) => __awaiter(this, void 0, void 0, function* () {
             const { data } = yield this.request.get('/v1/user/simple_protocol_list', {
                 params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-api",
-  "version": "0.6.15-alpha.1",
+  "version": "0.6.15-alpha.2",
   "main": "dist/index.js",
   "files": [
     "dist"