@subwallet/extension-base 1.3.45-1 → 1.3.47-0

package/cjs/services/subscan-service/index.js

@@ -7,37 +7,18 @@ exports.SubscanService = void 0;
 var _SWError = require("@subwallet/extension-base/background/errors/SWError");
 var _constants = require("@subwallet/extension-base/koni/api/nft/ordinal_nft/constants");
 var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
+var _base = require("@subwallet/extension-base/strategy/api-request-strategy/context/base");
+var _apiRequestStrategyV = require("@subwallet/extension-base/strategy/api-request-strategy-v2");
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
 const QUERY_ROW = 100;
-class SubscanService {
-  callRate = 2; // limit per interval check
-  limitRate = 2; // max rate per interval check
-  intervalCheck = 1000; // interval check in ms
-  maxRetry = 9; // interval check in ms
-  rollbackRateTime = 30 * 1000; // rollback rate time in ms
-  timeoutRollbackRate = undefined;
-  requestMap = {};
-  nextId = 0;
-  isRunning = false;
-  getId() {
-    return this.nextId++;
-  }
+class SubscanService extends _apiRequestStrategyV.BaseApiRequestStrategyV2 {
   constructor(subscanChainMap, options) {
+    const context = new _base.BaseApiRequestContext(options);
+    super(context);
     this.subscanChainMap = subscanChainMap;
-    this.callRate = (options === null || options === void 0 ? void 0 : options.limitRate) || this.callRate;
-    this.limitRate = (options === null || options === void 0 ? void 0 : options.limitRate) || this.limitRate;
-    this.intervalCheck = (options === null || options === void 0 ? void 0 : options.intervalCheck) || this.intervalCheck;
-    this.maxRetry = (options === null || options === void 0 ? void 0 : options.maxRetry) || this.maxRetry;
-  }
-  reduceLimitRate() {
-    clearTimeout(this.timeoutRollbackRate);
-    this.callRate = Math.ceil(this.limitRate / 2);
-    this.timeoutRollbackRate = setTimeout(() => {
-      this.callRate = this.limitRate;
-    }, this.rollbackRateTime);
   }
   getApiUrl(chain, path) {
     const subscanChain = this.subscanChainMap[chain];
@@ -55,61 +36,9 @@ class SubscanService {
       body: JSON.stringify(body)
     });
   }
-  addRequest(run, ordinal) {
-    const newId = this.getId();
-    return new Promise((resolve, reject) => {
-      this.requestMap[newId] = {
-        id: newId,
-        status: 'pending',
-        retry: -1,
-        ordinal,
-        run,
-        resolve,
-        reject
-      };
-      if (!this.isRunning) {
-        this.process();
-      }
-    });
-  }
-  process() {
-    this.isRunning = true;
-    const maxRetry = this.maxRetry;
-    const interval = setInterval(() => {
-      const remainingRequests = Object.values(this.requestMap);
-      if (remainingRequests.length === 0) {
-        this.isRunning = false;
-        clearInterval(interval);
-        return;
-      }
-
-      // Get first this.limit requests base on id
-      const requests = remainingRequests.filter(request => request.status !== 'running').sort((a, b) => a.id - b.id).sort((a, b) => a.ordinal - b.ordinal).slice(0, this.callRate);
-
-      // Start requests
-      requests.forEach(request => {
-        request.status = 'running';
-        request.run().then(rs => {
-          request.resolve(rs);
-        }).catch(e => {
-          const error = JSON.parse(e.message);
-
-          // Limit rate
-          if (error.code === 20008) {
-            if (request.retry < maxRetry) {
-              request.status = 'pending';
-              request.retry++;
-              this.reduceLimitRate();
-            } else {
-              // Reject request
-              request.reject(new _SWError.SWError('MAX_RETRY', String(e)));
-            }
-          } else {
-            request.reject(new _SWError.SWError('UNKNOWN', String(e)));
-          }
-        });
-      });
-    }, this.intervalCheck);
+  isRateLimited(e) {
+    const error = JSON.parse(e.message);
+    return error.code === 20008;
   }
   checkSupportedSubscanChain(chain) {
     return !!this.subscanChainMap[chain];
@@ -120,6 +49,7 @@ class SubscanService {
 
   // Implement Subscan API
   getMultiChainBalance(address) {
+    const hashKey = this.createKeyHash(['multi_chain_balance', address]);
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl('polkadot', 'api/scan/multiChain/account'), {
         address
@@ -129,7 +59,7 @@ class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    }, 1);
+    }, 1, undefined, hashKey);
   }
   getCrowdloanContributions(relayChain, address) {
     let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -147,9 +77,9 @@ class SubscanService {
       return jsonData.data;
     }, 2);
   }
-  getExtrinsicsList(chain, address) {
-    let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    let blockRange = arguments.length > 3 ? arguments[3] : undefined;
+  getExtrinsicsList(groupId, chain, address) {
+    let page = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    let blockRange = arguments.length > 4 ? arguments[4] : undefined;
     const _blockRange = (() => {
       if (!blockRange || !blockRange.to) {
         return null;
@@ -168,10 +98,10 @@ class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    }, 0);
+    }, 0, groupId);
   }
-  async fetchAllPossibleExtrinsicItems(chain, address, cbAfterEachRequest) {
-    let limit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+  async fetchAllPossibleExtrinsicItems(groupId, chain, address, cbAfterEachRequest) {
+    let limit = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
       page: 10,
       record: 1000
     };
@@ -183,7 +113,7 @@ class SubscanService {
     };
     const resultMap = {};
     const _getExtrinsicItems = async page => {
-      const res = await this.getExtrinsicsList(chain, address, page, blockRange);
+      const res = await this.getExtrinsicsList(groupId, chain, address, page, blockRange);
       if (!res || !res.count || !res.extrinsics || !res.extrinsics.length) {
         return;
       }
@@ -192,7 +122,7 @@ class SubscanService {
       }
       const extrinsics = res.extrinsics;
       const extrinsicIndexes = extrinsics.map(item => item.extrinsic_index);
-      const extrinsicParams = await this.getExtrinsicParams(chain, extrinsicIndexes, 0);
+      const extrinsicParams = await this.getExtrinsicParams(groupId, chain, extrinsicIndexes, 0);
       for (const data of extrinsicParams) {
         const {
           extrinsic_index: extrinsicIndex,
@@ -224,10 +154,10 @@ class SubscanService {
     await _getExtrinsicItems(0);
     return Object.values(resultMap);
   }
-  getTransfersList(chain, address) {
-    let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    let direction = arguments.length > 3 ? arguments[3] : undefined;
-    let blockRange = arguments.length > 4 ? arguments[4] : undefined;
+  getTransfersList(groupId, chain, address) {
+    let page = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    let direction = arguments.length > 4 ? arguments[4] : undefined;
+    let blockRange = arguments.length > 5 ? arguments[5] : undefined;
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), {
         page,
@@ -242,10 +172,10 @@ class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    }, 0);
+    }, 0, groupId);
   }
-  async fetchAllPossibleTransferItems(chain, address, direction, cbAfterEachRequest) {
-    let limit = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
+  async fetchAllPossibleTransferItems(groupId, chain, address, direction, cbAfterEachRequest) {
+    let limit = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {
       page: 10,
       record: 1000
     };
@@ -257,7 +187,7 @@ class SubscanService {
     };
     const resultMap = {};
     const _getTransferItems = async page => {
-      const res = await this.getTransfersList(chain, address, page, direction, blockRange);
+      const res = await this.getTransfersList(groupId, chain, address, page, direction, blockRange);
       if (!res || !res.count || !res.transfers || !res.transfers.length) {
         return;
       }
@@ -287,8 +217,9 @@ class SubscanService {
     await _getTransferItems(0);
     return resultMap;
   }
-  getRewardHistoryList(chain, address) {
-    let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  getRewardHistoryList(groupId, chain, address) {
+    let page = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+    const hashKey = this.createKeyHash([chain, 'reward_slash', address, page]);
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/account/reward_slash'), {
         page,
@@ -308,9 +239,9 @@ class SubscanService {
         };
       }
       return jsonData.data;
-    }, 2);
+    }, 2, groupId, hashKey);
   }
-  getAccountRemarkEvents(chain, address) {
+  getAccountRemarkEvents(groupId, chain, address) {
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/events'), {
         ..._constants.BASE_FETCH_ORDINAL_EVENT_DATA,
@@ -321,10 +252,10 @@ class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data.events;
-    }, 3);
+    }, 3, groupId);
   }
-  getExtrinsicParams(chain, extrinsicIndexes) {
-    let ordinal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3;
+  getExtrinsicParams(groupId, chain, extrinsicIndexes) {
+    let ordinal = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3;
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/extrinsic/params'), {
         extrinsic_index: extrinsicIndexes
@@ -334,7 +265,7 @@ class SubscanService {
       }
       const jsonData = await rs.json();
       return jsonData.data;
-    }, ordinal);
+    }, ordinal, groupId);
   }
 
   // Singleton

package/cjs/services/transaction-service/utils.js

@@ -46,13 +46,19 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('taostats.io')) {
     return 'account';
   }
+  if (explorerLink.includes('tonviewer.com')) {
+    return '';
+  }
+  if (explorerLink.includes('devnet-explorer.mosaicchain.io')) {
+    return 'accounts';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {
   if ((0, _utils._isPureEvmChain)(chainInfo) || (0, _utils._isPureBitcoinChain)(chainInfo)) {
     return 'tx';
   }
-  if ((0, _utils._isPureCardanoChain)(chainInfo)) {
+  if ((0, _utils._isPureCardanoChain)(chainInfo) || (0, _utils._isPureTonChain)(chainInfo)) {
     return 'transaction';
   }
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
@@ -61,6 +67,9 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['gen6_public'].includes(chainInfo.slug)) {
     return '#/extrinsics';
   }
+  if (['mosaicTest'].includes(chainInfo.slug)) {
+    return 'transactions';
+  }
   const explorerLink = (0, _utils._getBlockExplorerFromChain)(chainInfo);
   if (explorerLink && explorerLink.includes('statescan.io')) {
     return '#/extrinsics';

package/cjs/strategy/api-request-strategy/index.js

@@ -56,6 +56,7 @@ class BaseApiRequestStrategy {
         request.status = 'running';
         request.run().then(rs => {
           request.resolve(rs);
+          delete this.requestMap[request.id];
         }).catch(e => {
           const isRateLimited = this.isRateLimited(e);
 

package/cjs/strategy/api-request-strategy/utils/index.js

@@ -21,8 +21,8 @@ const postRequest = function (url, body, headers) {
 };
 exports.postRequest = postRequest;
 const getRequest = (url, params, headers) => {
-  const queryString = params ? Object.keys(params).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`).join('&') : '';
-  const _url = `${url}?${queryString}`;
+  const q = new URLSearchParams(params);
+  const _url = `${url}?${q.toString()}`;
   return (0, _crossFetch.default)(_url, {
     method: 'GET',
     headers: headers || {

package/cjs/strategy/api-request-strategy-v2/index.js

@@ -0,0 +1,138 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BaseApiRequestStrategyV2 = void 0;
+var _SWError = require("@subwallet/extension-base/background/errors/SWError");
+var _constants = require("@subwallet/extension-base/constants");
+var _tsMd = require("ts-md5");
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+class BaseApiRequestStrategyV2 {
+  nextId = 0;
+  groupId = 0;
+  isRunning = false;
+  requestMap = {};
+  processInterval = undefined;
+  canceledGroupIds = new Set();
+  cacheMap = new Map();
+  getId() {
+    return this.nextId++;
+  }
+  constructor(context) {
+    this.context = context;
+  }
+  getGroupId() {
+    return this.groupId++;
+  }
+  createKeyHash(keys) {
+    return _tsMd.Md5.hashStr(JSON.stringify([this.constructor.name, ...keys]));
+  }
+  addRequest(run, ordinal, _groupId, keyHash) {
+    const newId = this.getId();
+    const groupId = _groupId !== null && _groupId !== void 0 ? _groupId : this.getGroupId();
+    if (this.canceledGroupIds.has(groupId)) {
+      return Promise.reject(new _SWError.SWError('CANCELED', 'Request has been canceled'));
+    }
+    return new Promise((resolve, reject) => {
+      this.requestMap[newId] = {
+        cacheKey: keyHash,
+        groupId,
+        id: newId,
+        ordinal,
+        reject,
+        resolve,
+        retry: -1,
+        run,
+        status: 'pending'
+      };
+      if (!this.isRunning) {
+        this.process();
+      }
+    });
+  }
+  process() {
+    this.stop();
+    this.isRunning = true;
+    const maxRetry = this.context.maxRetry;
+    const interval = setInterval(() => {
+      const remainingRequests = Object.values(this.requestMap);
+      if (remainingRequests.length === 0) {
+        this.isRunning = false;
+        clearInterval(interval);
+        return;
+      }
+      console.log('[ApiRequestStrategyV2] Processing requests...', remainingRequests.map(r => r.groupId));
+
+      // Get first this.limit requests base on id
+      const requests = remainingRequests.filter(request => request.status !== 'running').sort((a, b) => a.id - b.id).sort((a, b) => a.ordinal - b.ordinal).slice(0, this.context.callRate);
+
+      // Start requests
+      requests.forEach(request => {
+        request.status = 'running';
+        if (request.cacheKey) {
+          if (this.cacheMap.has(request.cacheKey)) {
+            const resp = this.cacheMap.get(request.cacheKey);
+            request.resolve(resp);
+            console.log('[ApiRequestStrategyV2] Cache hit for request', request.id, 'with cache key', request.cacheKey);
+            delete this.requestMap[request.id];
+            return;
+          }
+        }
+        request.run().then(rs => {
+          request.resolve(rs);
+          if (request.cacheKey) {
+            this.cacheMap.set(request.cacheKey, rs);
+            setTimeout(() => {
+              if (request.cacheKey) {
+                this.cacheMap.delete(request.cacheKey);
+              }
+            }, _constants.BASE_MINUTE_INTERVAL);
+          }
+          delete this.requestMap[request.id];
+        }).catch(e => {
+          const isRateLimited = this.isRateLimited(e);
+
+          // Limit rate
+          if (isRateLimited) {
+            if (request.retry < maxRetry) {
+              request.status = 'pending';
+              request.retry++;
+              this.context.reduceLimitRate();
+            } else {
+              // Reject request
+              request.reject(new _SWError.SWError('MAX_RETRY', String(e)));
+            }
+          } else {
+            request.reject(new _SWError.SWError('UNKNOWN', String(e)));
+          }
+        });
+      });
+    }, this.context.intervalCheck);
+    this.processInterval = interval;
+  }
+  stop() {
+    clearInterval(this.processInterval);
+    this.processInterval = undefined;
+  }
+  cancelGroupRequest(groupId) {
+    Object.values(this.requestMap).forEach(request => {
+      if (request.groupId === groupId) {
+        request.reject(new _SWError.SWError('CANCELED', 'Request has been canceled'));
+      }
+      this.canceledGroupIds.add(groupId);
+    });
+    this.requestMap = Object.fromEntries(Object.entries(this.requestMap).filter(_ref => {
+      let [_, request] = _ref;
+      return request.groupId !== groupId;
+    }));
+  }
+  setContext(context) {
+    this.stop();
+    this.context = context;
+    this.process();
+  }
+}
+exports.BaseApiRequestStrategyV2 = BaseApiRequestStrategyV2;

package/cjs/strategy/api-request-strategy-v2/types.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/types/account/info/keyring.js

@@ -55,6 +55,7 @@ exports.AccountSignMode = AccountSignMode;
   AccountSignMode["QR"] = "qr";
   AccountSignMode["LEGACY_LEDGER"] = "legacy-ledger";
   AccountSignMode["GENERIC_LEDGER"] = "generic-ledger";
+  AccountSignMode["ECDSA_SUBSTRATE_LEDGER"] = "ecdsa-substrate-ledger";
   AccountSignMode["READ_ONLY"] = "readonly";
   AccountSignMode["ALL_ACCOUNT"] = "all";
   AccountSignMode["INJECTED"] = "injected";

package/cjs/utils/account/analyze.js

@@ -64,7 +64,7 @@ const _analyzeAddress = async (data, accountProxies, contacts, chainInfo, substr
   for (const accountProxy of accountProxies) {
     const _name = accountProxy.name.trim().toLowerCase();
     const nameCondition = isNameValid(_data, _name);
-    const filterAccounts = accountProxy.accounts.filter(account => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, account.chainType, account.type));
+    const filterAccounts = accountProxy.accounts.filter(account => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, account));
     for (const account of filterAccounts) {
       const addressCondition = isStrValidWithAddress(_data, account, chainInfo);
       const condition = nameCondition !== 'invalid' ? nameCondition : addressCondition;
@@ -92,7 +92,10 @@ const _analyzeAddress = async (data, accountProxies, contacts, chainInfo, substr
       }
     }
   }
-  const filterContacts = contacts.filter(contact => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, contact.chainType, (0, _keyring.getKeypairTypeByAddress)(contact.address)));
+  const filterContacts = contacts.filter(contact => (0, _utils._isChainInfoCompatibleWithAccountInfo)(chainInfo, {
+    chainType: contact.chainType,
+    type: (0, _keyring.getKeypairTypeByAddress)(contact.address)
+  }));
 
   // Filter address book addresses
   for (const contact of filterContacts) {

package/cjs/utils/account/common.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAccountChainTypeForAddress = exports._reformatAddressWithChain = void 0;
+exports.getAccountJsonByAddress = exports.getAccountChainTypeForAddress = exports.filterAddressByChainInfo = exports._reformatAddressWithChain = void 0;
 exports.getAddressesByChainType = getAddressesByChainType;
 exports.getAddressesByChainTypeMap = getAddressesByChainTypeMap;
 exports.isAccountAll = isAccountAll;
@@ -16,6 +16,7 @@ var _types = require("@subwallet/extension-base/types");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _validate = require("@subwallet/keyring/utils/address/validate");
+var _uiKeyring = require("@subwallet/ui-keyring");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -141,4 +142,94 @@ const modifyAccountName = (type, name, modify) => {
   }
   return network ? [name, network].join(' - ') : name;
 };
-exports.modifyAccountName = modifyAccountName;
+
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+exports.modifyAccountName = modifyAccountName;
+const getAccountJsonByAddress = address => {
+  try {
+    const pair = _uiKeyring.keyring.getPair(address);
+    if (pair) {
+      return (0, _utils2.pairToAccount)(pair);
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+};
+
+/** Filter addresses to subscribe by chain info */
+exports.getAccountJsonByAddress = getAccountJsonByAddress;
+const filterAddressByChainInfo = (addresses, chainInfo) => {
+  const {
+    _bitcoin,
+    bitcoin,
+    cardano,
+    evm,
+    substrate,
+    ton
+  } = getAddressesByChainTypeMap(addresses, chainInfo);
+  if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+    const [fetchList, unFetchList] = processEvmAndSubstrateAddresses(evm, chainInfo);
+    return [fetchList, [...unFetchList, ...bitcoin, ...ton, ...substrate, ...cardano, ..._bitcoin].flat()];
+  } else if ((0, _utils._isChainBitcoinCompatible)(chainInfo)) {
+    return [bitcoin, [...evm, ...substrate, ...ton, ...cardano, ..._bitcoin].flat()];
+  } else if ((0, _utils._isChainTonCompatible)(chainInfo)) {
+    return [ton, [...bitcoin, ...evm, ...substrate, ...cardano, ..._bitcoin].flat()];
+  } else if ((0, _utils._isChainCardanoCompatible)(chainInfo)) {
+    return [cardano, [...bitcoin, ...evm, ...substrate, ...ton, ..._bitcoin].flat()];
+  } else {
+    const [fetchList, unFetchList] = processEvmAndSubstrateAddresses(substrate, chainInfo);
+    return [fetchList, [...unFetchList, ...bitcoin, ...evm, ...ton, ...cardano, ..._bitcoin].flat()];
+  }
+};
+exports.filterAddressByChainInfo = filterAddressByChainInfo;
+const processEvmAndSubstrateAddresses = (addressList, chainInfo) => {
+  const fetchList = [];
+  const unFetchList = [];
+  const isEvm = (0, _utilCrypto.isEthereumAddress)(addressList[0]);
+  addressList.forEach(address => {
+    const account = getAccountJsonByAddress(address);
+    if (account) {
+      if (account.isHardware) {
+        if (isEvm) {
+          if (account.isGeneric && account.isSubstrateECDSA) {
+            if ((0, _utils._isSubstrateEvmCompatibleChain)(chainInfo)) {
+              fetchList.push(address);
+            } else {
+              unFetchList.push(address);
+            }
+          } else {
+            fetchList.push(address);
+          }
+        } else {
+          if (account.isGeneric) {
+            fetchList.push(address);
+          } else {
+            const availGen = account.availableGenesisHashes || [];
+            const gen = (0, _utils._getSubstrateGenesisHash)(chainInfo);
+            if (availGen.includes(gen)) {
+              fetchList.push(address);
+            } else {
+              unFetchList.push(address);
+            }
+          }
+        }
+      } else {
+        fetchList.push(address);
+      }
+    } else {
+      fetchList.push(address);
+    }
+  });
+  return [fetchList, unFetchList];
+};

package/cjs/utils/account/transform.js

@@ -71,6 +71,9 @@ const getAccountSignMode = (address, _meta) => {
       if (meta.isExternal) {
         if (meta.isHardware) {
           if (meta.isGeneric) {
+            if (meta.isSubstrateECDSA) {
+              return _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER;
+            }
             return _types2.AccountSignMode.GENERIC_LEDGER;
           } else {
             return _types2.AccountSignMode.LEGACY_LEDGER;
@@ -244,6 +247,11 @@ const getAccountTransactionActions = (signMode, networkType, type, _meta, _speci
       result.push(...CLAIM_AVAIL_BRIDGE);
     }
     return result;
+  } else if (signMode === _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {
+    // Only for account substrate with ECDSA scheme format
+    const result = [];
+    result.push(...BASE_TRANSFER_ACTIONS, ...NATIVE_STAKE_ACTIONS, ...POOL_STAKE_ACTIONS, _KoniTypes.ExtrinsicType.TRANSFER_XCM, _KoniTypes.ExtrinsicType.SWAP, _KoniTypes.ExtrinsicType.CROWDLOAN);
+    return result;
   }
   return [];
 };
@@ -380,6 +388,7 @@ const convertAccountProxyType = accountSignMode => {
   switch (accountSignMode) {
     case _types2.AccountSignMode.GENERIC_LEDGER:
     case _types2.AccountSignMode.LEGACY_LEDGER:
+    case _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER:
       return _types2.AccountProxyType.LEDGER;
     case _types2.AccountSignMode.QR:
       return _types2.AccountProxyType.QR;
@@ -490,6 +499,7 @@ const _combineAccounts = (accounts, modifyPairs, accountProxies) => {
       switch (account.signMode) {
         case _types2.AccountSignMode.GENERIC_LEDGER:
         case _types2.AccountSignMode.LEGACY_LEDGER:
+        case _types2.AccountSignMode.ECDSA_SUBSTRATE_LEDGER:
           specialChain = account.specialChain;
           break;
       }

package/cjs/utils/asset.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterAssetsByChainAndType = exports.filterAlphaAssetsByChain = void 0;
+exports.isSubstrateEcdsaLedgerAssetSupported = exports.filterAssetsByChainAndType = exports.filterAlphaAssetsByChain = void 0;
 var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -31,4 +31,11 @@ const filterAlphaAssetsByChain = (chainAssetMap, chain) => {
   });
   return result;
 };
-exports.filterAlphaAssetsByChain = filterAlphaAssetsByChain;
+exports.filterAlphaAssetsByChain = filterAlphaAssetsByChain;
+const isSubstrateEcdsaLedgerAssetSupported = (chainsAsset, chainInfo) => {
+  if (!(0, _utils._isSubstrateEvmCompatibleChain)(chainInfo)) {
+    return false;
+  }
+  return (0, _utils._isNativeToken)(chainsAsset) || !(0, _utils._getContractAddressOfToken)(chainsAsset);
+};
+exports.isSubstrateEcdsaLedgerAssetSupported = isSubstrateEcdsaLedgerAssetSupported;

package/cjs/utils/gear/combine.js

@@ -22,7 +22,8 @@ function getGRC20ContractPromise(apiPromise, contractAddress) {
   const gearApi = apiPromise;
   return new _grc.GRC20(gearApi, contractAddress);
 }
-function getVFTContractPromise(apiPromise, contractAddress) {
-  const gearApi = apiPromise;
-  return new _vft.VFT(gearApi, contractAddress);
+function getVFTContractPromise(api) {
+  let contractAddress = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0x';
+  const sails = _vft.sailsCache.get();
+  return new _vft.VFT(api, contractAddress, sails);
 }