@subwallet/extension-base 1.3.69-0 → 1.3.71-0

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -356,7 +356,6 @@ const subscribePSP22Balance = _ref4 => {
       }
     });
   };
-
   getTokenBalances();
   const interval = setInterval(getTokenBalances, _constants.SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
@@ -572,8 +571,8 @@ const subscribeSubnetAlphaPallet = async _ref9 => {
     }
     for (const chainAsset of Object.values(tokenMap)) {
       const netuid = (0, _utils2._getAssetNetuid)(chainAsset);
-      const items = Object.entries(converted).map(_ref10 => {
-        let [address, stakeMap] = _ref10;
+      const items = Object.entries(converted).map(_ref0 => {
+        let [address, stakeMap] = _ref0;
         const value = stakeMap[netuid] || (0, _bignumber.default)(0);
         return {
           address: address,

package/cjs/services/balance-service/helpers/subscribe/ton/utils.js

@@ -57,10 +57,8 @@ async function retryTonTxStatus(fn, options) {
       await new Promise(resolve => setTimeout(resolve, options.delay)); // wait for delay period, then recall the fn()
     }
   }
-
   throw lastError; // throw only last error, in case no successful result from fn()
 }
-
 function getMessageTxStatus(txByMsgInfo) {
   var _txDetailInfo$descrip, _txDetailInfo$descrip2, _txDetailInfo$descrip3, _txDetailInfo$descrip4, _txDetailInfo$descrip5, _txDetailInfo$descrip6, _txDetailInfo$out_msg, _txDetailInfo$out_msg2;
   const txDetailInfo = txByMsgInfo.transactions[0];
@@ -86,7 +84,6 @@ async function getJettonTxStatus(tonApi, jettonTransferMsgHash) {
     const jettonInternalTransferTxInfoRaw = await tonApi.getTxByInMsg(jettonInternalTransferHash);
     return getMessageTxStatus(jettonInternalTransferTxInfoRaw); // Jetton Internal Transfer success -> Receiver successfully receiver fund!
   }
-
   return false;
 }
 async function estimateTonTxFee(tonApi, messages, walletContract, _seqno) {

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

@@ -472,7 +472,7 @@ class BalanceService {
     const assetMap = this.state.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
       const type = (0, _keyring.getKeypairTypeByAddress)(address);
-      const typeValid = [..._types3.SubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
+      const typeValid = [..._types3.AllSubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
       if (typeValid) {
         return this.state.subscanService.getMultiChainBalance(address).catch(e => {
           console.error(e);
@@ -553,12 +553,10 @@ class BalanceService {
           var _currentAssetSettings2;
           const chainSlug = tokenSlug.split('-')[0];
           const chainState = this.state.chainService.getChainStateByKey(chainSlug);
-          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
-
-          // Cancel if chain is turned off by user
-          if (chainState && chainState.manualTurnOff) {
+          if (chainState !== null && chainState !== void 0 && chainState.manualTurnOff) {
             continue;
           }
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
           if (existedKey && !((_currentAssetSettings2 = currentAssetSettings[existedKey]) !== null && _currentAssetSettings2 !== void 0 && _currentAssetSettings2.visible)) {
             needEnableChains.push(chainSlug);
             needActiveTokens.push(existedKey);
@@ -774,7 +772,7 @@ class BalanceService {
       const assetMap = this.state.chainService.getAssetRegistry();
       const addresses = _uiKeyring.default.getPairs().map(account => account.address);
       const evmAddresses = addresses.filter(address => [..._types3.EthereumKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
-      const substrateAddresses = addresses.filter(address => [..._types3.SubstrateKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
+      const substrateAddresses = addresses.filter(address => [..._types3.AllSubstrateKeypairTypes].includes((0, _keyring.getKeypairTypeByAddress)(address)));
       const [nonZeroBalanceEvmToken, nonZeroBalanceSubstrateToken] = await Promise.all([this.evmDetectBalanceToken(evmAddresses), this.substrateDetectBalanceToken(substrateAddresses)]);
       const substrateDetectChain = this.substrateDetectBalanceChain();
       const evmDetectChain = await this.evmDetectBalanceChain();
@@ -803,6 +801,104 @@ class BalanceService {
     }
   }
 
-  /** optimize token area **/
+  /** Return token slugs with balance in evm chain - only work with evm addresses & pure evm chains  **/
+  async getEvmTokensBalanceByChain(address, chainSlug) {
+    const tokenBalanceSlugs = await _subwalletServicesSdk.default.balanceDetectionApi.getSwEvmTokenBalanceByChain(address, chainSlug);
+    return tokenBalanceSlugs;
+  }
+
+  /** Return token slugs with balance in substrate chain - only work with substrate chains that have subscanSlug **/
+  async getSubstrateTokensBalanceByChain(address, chainSlug, assetsByChain) {
+    const tokenBalanceSlugs = [];
+    const balanceData = await this.state.subscanService.getMultiChainBalance(address);
+    if (!balanceData) {
+      return [];
+    }
+    for (const datum of balanceData) {
+      const {
+        balance,
+        bonded,
+        category,
+        locked,
+        network,
+        symbol
+      } = datum;
+      const chain = this.state.chainService.detectBalanceChainSlugMap[network];
+      if (chain !== chainSlug) {
+        continue;
+      }
+      const isBalanceEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
+      if (isBalanceEmpty) {
+        continue;
+      }
+      const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+      const existedKey = Object.keys(assetsByChain).find(v => v.toLowerCase() === tokenKey.toLowerCase());
+      if (existedKey) {
+        tokenBalanceSlugs.push(existedKey);
+      }
+    }
+    return tokenBalanceSlugs;
+  }
+  getCurrentAccountAddressByChain(chainInfo) {
+    const proxyId = this.state.keyringService.context.currentAccount.proxyId;
+    const addresses = this.state.keyringService.context.addressesByProxyId(proxyId);
+    if ((0, _utils._isPureEvmChain)(chainInfo)) {
+      const evmAddress = addresses.find(address => {
+        const type = (0, _keyring.getKeypairTypeByAddress)(address);
+        return [..._types3.EthereumKeypairTypes].includes(type);
+      });
+      if (evmAddress) {
+        return evmAddress;
+      }
+    }
+    if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
+      const substrateAddress = addresses.find(address => {
+        const type = (0, _keyring.getKeypairTypeByAddress)(address);
+        return [..._types3.AllSubstrateKeypairTypes, ..._types3.EthereumKeypairTypes].includes(type);
+      });
+      if (substrateAddress) {
+        return substrateAddress;
+      }
+    }
+    return undefined;
+  }
+
+  /** re-detect balance & enable custom, priority tokens when enabling chain again **/
+  async updatePriorityAssetsByChain(chainSlug, visible) {
+    const currentAssetSettings = await this.state.chainService.getAssetSettings();
+    const assetsByChain = this.state.chainService.getFungibleTokensByChain(chainSlug);
+    const priorityTokensMap = this.state.chainService.value.priorityTokens || {};
+    const chainInfo = this.state.chainService.getChainInfoByKey(chainSlug);
+    const address = this.getCurrentAccountAddressByChain(chainInfo);
+    const tokenSlugsWithBalance = [];
+    if (address && !(0, _utils._isCustomChain)(chainInfo.slug)) {
+      if ((0, _utils._isPureEvmChain)(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getEvmTokensBalanceByChain(address, chainSlug)));
+      } else if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getSubstrateTokensBalanceByChain(address, chainSlug, assetsByChain)));
+      }
+    }
+    tokenSlugsWithBalance.forEach(tokenSlug => {
+      currentAssetSettings[tokenSlug] = {
+        visible: true
+      };
+    });
+    const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
+    for (const asset of Object.values(assetsByChain)) {
+      if (visible) {
+        const isPriorityToken = priorityTokensList.includes(asset.slug) || (0, _utils._isCustomAsset)(asset.slug);
+        if (isPriorityToken || (0, _utils._isNativeToken)(asset)) {
+          currentAssetSettings[asset.slug] = {
+            visible: true
+          };
+        }
+      } else {
+        currentAssetSettings[asset.slug] = {
+          visible: false
+        };
+      }
+    }
+    this.state.chainService.setAssetSettings(currentAssetSettings);
+  }
 }
 exports.BalanceService = BalanceService;

package/cjs/services/balance-service/transfer/bitcoin-transfer.js

@@ -83,7 +83,6 @@ async function createBitcoinTransaction(params) {
             script: pair.bitcoin.output,
             value: input.value // UTXO value in satoshis
           },
-
           tapInternalKey: pair.bitcoin.internalPubkey // X-only public key (32 bytes)
         });
       } else {

package/cjs/services/balance-service/transfer/cardano-transfer.js

@@ -10,8 +10,7 @@ var _types = require("@subwallet/chain-list/types");
 var _utils = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _subwalletServicesSdk = _interopRequireDefault(require("@subwallet-monorepos/subwallet-services-sdk"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 var POPULAR_CARDANO_ERROR_PHRASE;

package/cjs/services/balance-service/transfer/smart-contract.js

@@ -74,7 +74,6 @@ async function getEVMTransactionObject(props) {
     });
     gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
   }
-
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (feeCombine.maxFeePerGas) {

package/cjs/services/balance-service/transfer/token.js

@@ -167,7 +167,6 @@ const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) => {
         // estimate value
         bounce: false // anyMode
       });
-
       estimatedFee = new _bignumber.default((await (0, _utils2.estimateTonTxFee)(tonApi, [mockMessage], mockWalletContract)).toString());
     } else {
       var _paymentInfo$partialF;
@@ -185,7 +184,6 @@ const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) => {
       const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
       estimatedFee = new _bignumber.default((paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0'); // todo: should handle error case instead of setting fee to 0
     }
-
     return estimatedFee;
   } catch (e) {
     console.error('error mocking tx fee', e);

package/cjs/services/balance-service/transfer/ton-transfer.js

@@ -64,7 +64,6 @@ async function createTonNativeTransaction(_ref2) {
     value: (0, _core.fromNano)(value),
     bounce: false // todo: check and update the send bounced logic
   });
-
   const messagePayload = (0, _utils.cellToBase64Str)((0, _utils.messageRelaxedToCell)(messages));
   const estimateExternalFee = await (0, _utils.estimateTonTxFee)(tonApi, [messages], walletContract);
   const transactionObject = {

package/cjs/services/balance-service/transfer/xcm/snowBridge.js

@@ -63,7 +63,6 @@ async function getSnowBridgeEvmTransfer(tokenInfo, originChainInfo, destinationC
   } catch (e) {
     gasLimit = 200000; // todo: handle this better
   }
-
   transactionConfig.gas = gasLimit;
   return transactionConfig;
 }

package/cjs/services/chain-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -30,9 +30,18 @@ const _PREDEFINED_SINGLE_MODES = {
 };
 exports._PREDEFINED_SINGLE_MODES = _PREDEFINED_SINGLE_MODES;
 const _PURE_EVM_CHAINS = ['binance', 'binance_test', 'ethereum', 'ethereum_goerli', 'astarEvm', 'shidenEvm', 'shibuyaEvm', 'crabEvm', 'pangolinEvm', 'cloverEvm', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam', 'watr_network_evm'];
+exports._PURE_EVM_CHAINS = _PURE_EVM_CHAINS;
+const _GOVERNANCE_CHAIN_GROUP = {
+  polkadot: ['statemint', 'bifrost_dot', 'hydradx_main', 'ajunaPolkadot', 'astar', 'phala', 'litentry', 'acala', 'centrifuge', 'interlay', 'laos_network'],
+  kusama: ['statemine', 'bifrost', 'basilisk', 'karura', 'kintsugi'],
+  westend_assethub: ['westend_assethub'],
+  paseo: ['paseo_assethub'],
+  solo: ['vara_network', 'zkverify'],
+  testnet: ['zkverify_testnet']
+};
 
 // Get balance----------------------------------------------------------------------------------------------------------
-exports._PURE_EVM_CHAINS = _PURE_EVM_CHAINS;
+exports._GOVERNANCE_CHAIN_GROUP = _GOVERNANCE_CHAIN_GROUP;
 const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
@@ -139,6 +148,8 @@ const _EXPECTED_BLOCK_TIME = {
   statemint: 6,
   statemine: 6,
   polkadex: 12,
+  westend_assethub: 6,
+  paseo_assethub: 6,
   ternoa: 6,
   ternoa_alphanet: 6,
   westend: 6,
@@ -149,8 +160,8 @@ const _EXPECTED_BLOCK_TIME = {
   vara_testnet: 3,
   goldberg_testnet: 20,
   polimec: 12,
-  bifrost: 13,
-  // expect 12 but actual 13
+  bifrost: 6,
+  // bifrost kusama
   moonbeam: 12,
   moonriver: 12,
   moonbase: 6,

package/cjs/services/chain-service/handler/CardanoApi.js

@@ -26,6 +26,9 @@ class CardanoApi {
   connectionStatusSubject = new _rxjs.BehaviorSubject(_types._ChainConnectionStatus.DISCONNECTED);
   isApiReady = false;
   isApiReadyOnce = false;
+
+  // todo: add api with interface BlockFrostAPI to remove isTestnet check
+
   constructor(chainSlug, apiUrl, _ref) {
     let {
       isTestnet,
@@ -68,7 +71,6 @@ class CardanoApi {
     this.apiUrl = apiUrl;
     // this.api = this.createProvider();
   }
-
   async recoverConnect() {
     await this.disconnect();
     this.connect();

package/cjs/services/chain-service/handler/SubstrateApi.js

@@ -288,7 +288,6 @@ class SubstrateApi {
     // this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
     // this.apiDefaultTxSudo = (api.tx.system && api.tx.system.setCode) || this.apiDefaultTx;
   }
-
   async makeRpcQuery(_ref) {
     let {
       args,
@@ -330,7 +329,6 @@ class SubstrateApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
       return (await this.api[section][module][method]()).toPrimitive(); // todo: improve this
     }
-
     if (isStateQuery) {
       if (!this.api[section][module]) {
         return undefined;

package/cjs/services/chain-service/handler/light-client/index.js

@@ -7,8 +7,7 @@ exports.getSubstrateConnectProvider = getSubstrateConnectProvider;
 exports.relayChainSpecs = exports.paraChainSpecs = void 0;
 var Sc = _interopRequireWildcard(require("@substrate/connect"));
 var _rpcProvider = require("@polkadot/rpc-provider");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 

package/cjs/services/chain-service/health-check/index.js

@@ -30,7 +30,6 @@ async function checkSubstrateEndpoint(endpoint, timeout) {
     await wsProvider.disconnect(); // disconnect from the endpoint after the health check is complete
   }
 }
-
 async function checkEvmEndpoint(endpoint, timeout) {
   try {
     const web3 = new _web.default(endpoint);

package/cjs/services/chain-service/health-check/utils/new-utils/chain-asset-validate.js

@@ -20,7 +20,6 @@ function validateTokenHasValueByChain(chainAsset) {
   }
   return isTestnet !== chainAsset.hasValue; // todo: also check multichainAsset hasValue if has.
 }
-
 function validateNativeInfoByChain(chainAsset) {
   var _chainInfo$evmInfo, _chainInfo$substrateI, _chainInfo$bitcoinInf, _chainInfo$evmInfo2, _chainInfo$substrateI2, _chainInfo$bitcoinInf2, _chainInfo$evmInfo3, _chainInfo$substrateI3, _chainInfo$bitcoinInf3;
   const chainInfo = _chainList.ChainInfoMap[chainAsset.originChain];

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

@@ -55,6 +55,9 @@ class ChainService {
     assetRegistry: {},
     assetRefMap: {}
   };
+
+  // to save chain, token settings from user
+
   lockChainInfoMap = false; // prevent unwanted changes (edit, enable, disable) to chainInfoMap
 
   get mantaPay() {
@@ -730,7 +733,6 @@ class ChainService {
       .catch(e => console.error('Error enabling popular tokens:', e)); // Log error if enabling fails
     }
   }
-
   handleLatestSufficientChains(latestSufficientChains) {
     this.sufficientChainsSubject.next(latestSufficientChains);
     this.logger.log('Finished updating latest supported sufficient chains');
@@ -1234,8 +1236,8 @@ class ChainService {
       }
 
       // Fill in the missing chainState and storageData (new chains never before seen)
-      Object.entries(mergedChainInfoMap).forEach(_ref10 => {
-        let [slug, chainInfo] = _ref10;
+      Object.entries(mergedChainInfoMap).forEach(_ref0 => {
+        let [slug, chainInfo] = _ref0;
         if (!(slug in this.dataMap.chainStateMap)) {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
@@ -1346,8 +1348,8 @@ class ChainService {
     // Fill out zk assets from finalAssetRegistry if not supported
     if (!_utils2.MODULE_SUPPORT.MANTA_ZK) {
       const zkAssets = [];
-      Object.entries(finalAssetRegistry).forEach(_ref11 => {
-        let [slug, assets] = _ref11;
+      Object.entries(finalAssetRegistry).forEach(_ref1 => {
+        let [slug, assets] = _ref1;
         if ((0, _utils._isMantaZkAsset)(assets)) {
           zkAssets.push(slug);
           delete finalAssetRegistry[slug];
@@ -1380,7 +1382,18 @@ class ChainService {
 
       // Enable chain if not before
       if (!targetChainState.active) {
+        var _currentAssetSettings;
         targetChainState.active = true;
+
+        // enable native token
+        const nativeAsset = this.getNativeTokenInfo(chainSlug);
+        const currentAssetSettings = await this.getAssetSettings();
+        if (!((_currentAssetSettings = currentAssetSettings[nativeAsset.slug]) !== null && _currentAssetSettings !== void 0 && _currentAssetSettings.visible)) {
+          currentAssetSettings[nativeAsset.slug] = {
+            visible: true
+          };
+          this.setAssetSettings(currentAssetSettings);
+        }
       }
 
       // It auto detects the change of api url to create new instance or reuse existed one
@@ -1884,27 +1897,6 @@ class ChainService {
     });
     this.setAssetSettings(assetSettings);
   }
-  async updatePriorityAssetsByChain(chainSlug, visible) {
-    const currentAssetSettings = await this.getAssetSettings();
-    const assetsByChain = this.getFungibleTokensByChain(chainSlug);
-    const priorityTokensMap = this.priorityTokensSubject.value || {};
-    const priorityTokensList = priorityTokensMap.token && typeof priorityTokensMap.token === 'object' ? Object.keys(priorityTokensMap.token) : [];
-    for (const asset of Object.values(assetsByChain)) {
-      if (visible) {
-        const isPriorityToken = priorityTokensList.includes(asset.slug);
-        if (isPriorityToken || (0, _utils._isNativeToken)(asset)) {
-          currentAssetSettings[asset.slug] = {
-            visible: true
-          };
-        }
-      } else {
-        currentAssetSettings[asset.slug] = {
-          visible: false
-        };
-      }
-    }
-    this.setAssetSettings(currentAssetSettings);
-  }
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }

package/cjs/services/chain-service/utils/index.js

@@ -259,7 +259,6 @@ function _isEqualContractAddress(address1, address2) {
   if ((0, _utilCrypto.isEthereumAddress)(address1) && (0, _utilCrypto.isEthereumAddress)(address2)) {
     return address1.toLowerCase() === address2.toLowerCase(); // EVM address is case-insensitive
   }
-
   return address2 === address1;
 }
 function _isEqualSmartContractAsset(asset1, asset2) {
@@ -399,12 +398,10 @@ function _isSmartContractToken(tokenInfo) {
 function _isChainSubstrateCompatible(chainInfo) {
   return !!chainInfo.substrateInfo; // fallback to Ethereum
 }
-
 function _getEvmChainId(chainInfo) {
   var _chainInfo$evmInfo;
   return (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId; // fallback to Ethereum
 }
-
 function _getSubstrateParaId(chainInfo) {
   var _chainInfo$substrateI;
   return ((_chainInfo$substrateI = chainInfo.substrateInfo) === null || _chainInfo$substrateI === void 0 ? void 0 : _chainInfo$substrateI.paraId) || -1;
@@ -445,8 +442,8 @@ function _isChainSupportEvmERC20(chainInfo) {
   return ((_chainInfo$evmInfo3 = chainInfo.evmInfo) === null || _chainInfo$evmInfo3 === void 0 ? void 0 : (_chainInfo$evmInfo3$s = _chainInfo$evmInfo3.supportSmartContract) === null || _chainInfo$evmInfo3$s === void 0 ? void 0 : _chainInfo$evmInfo3$s.includes(_types._AssetType.ERC20)) || false;
 }
 function _isChainSupportWasmPSP22(chainInfo) {
-  var _chainInfo$substrateI10, _chainInfo$substrateI11;
-  return ((_chainInfo$substrateI10 = chainInfo.substrateInfo) === null || _chainInfo$substrateI10 === void 0 ? void 0 : (_chainInfo$substrateI11 = _chainInfo$substrateI10.supportSmartContract) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.includes(_types._AssetType.PSP22)) || false;
+  var _chainInfo$substrateI0, _chainInfo$substrateI1;
+  return ((_chainInfo$substrateI0 = chainInfo.substrateInfo) === null || _chainInfo$substrateI0 === void 0 ? void 0 : (_chainInfo$substrateI1 = _chainInfo$substrateI0.supportSmartContract) === null || _chainInfo$substrateI1 === void 0 ? void 0 : _chainInfo$substrateI1.includes(_types._AssetType.PSP22)) || false;
 }
 function _isAssetHubChain(chainInfo) {
   return ['statemint', 'statemine'].includes(chainInfo.slug);
@@ -455,12 +452,12 @@ function _isAssetHubToken(token) {
   return ['statemint', 'statemine'].includes(token.originChain);
 }
 function _isChainSupportGRC20(chainInfo) {
-  var _chainInfo$substrateI12, _chainInfo$substrateI13;
-  return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_types._AssetType.GRC20)) || false;
+  var _chainInfo$substrateI10, _chainInfo$substrateI11;
+  return ((_chainInfo$substrateI10 = chainInfo.substrateInfo) === null || _chainInfo$substrateI10 === void 0 ? void 0 : (_chainInfo$substrateI11 = _chainInfo$substrateI10.supportSmartContract) === null || _chainInfo$substrateI11 === void 0 ? void 0 : _chainInfo$substrateI11.includes(_types._AssetType.GRC20)) || false;
 }
 function _isChainSupportVFT(chainInfo) {
-  var _chainInfo$substrateI14, _chainInfo$substrateI15;
-  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : (_chainInfo$substrateI15 = _chainInfo$substrateI14.supportSmartContract) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.includes(_types._AssetType.VFT)) || false;
+  var _chainInfo$substrateI12, _chainInfo$substrateI13;
+  return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_types._AssetType.VFT)) || false;
 }
 const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
@@ -515,28 +512,36 @@ function _getChainNativeTokenBasicInfo(chainInfo) {
     return defaultTokenInfo;
   }
   if (chainInfo.substrateInfo) {
-    // substrate by default
     return {
+      ...defaultTokenInfo,
       symbol: chainInfo.substrateInfo.symbol,
       decimals: chainInfo.substrateInfo.decimals
     };
-  } else if (chainInfo.evmInfo) {
+  }
+  if (chainInfo.evmInfo) {
     return {
+      ...defaultTokenInfo,
       symbol: chainInfo.evmInfo.symbol,
       decimals: chainInfo.evmInfo.decimals
     };
-  } else if (chainInfo.tonInfo) {
+  }
+  if (chainInfo.tonInfo) {
     return {
+      ...defaultTokenInfo,
       symbol: chainInfo.tonInfo.symbol,
       decimals: chainInfo.tonInfo.decimals
     };
-  } else if (chainInfo.cardanoInfo) {
+  }
+  if (chainInfo.cardanoInfo) {
     return {
+      ...defaultTokenInfo,
       symbol: chainInfo.cardanoInfo.symbol,
       decimals: chainInfo.cardanoInfo.decimals
     };
-  } else if (chainInfo.bitcoinInfo) {
+  }
+  if (chainInfo.bitcoinInfo) {
     return {
+      ...defaultTokenInfo,
       symbol: chainInfo.bitcoinInfo.symbol,
       decimals: chainInfo.bitcoinInfo.decimals
     };
@@ -565,7 +570,6 @@ function _isTokenEvmSmartContract(tokenInfo) {
 function _isTokenTonSmartContract(tokenInfo) {
   return [_types._AssetType.TEP74].includes(tokenInfo.assetType); // add TEP-62 when supporting
 }
-
 function _isCIP26Token(tokenInfo) {
   return [_types._AssetType.CIP26].includes(tokenInfo.assetType);
 }
@@ -593,12 +597,12 @@ function _getXcmAssetType(tokenInfo) {
   return ((_tokenInfo$metadata9 = tokenInfo.metadata) === null || _tokenInfo$metadata9 === void 0 ? void 0 : _tokenInfo$metadata9.assetType) || '';
 }
 function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata10;
-  return ((_tokenInfo$metadata10 = tokenInfo.metadata) === null || _tokenInfo$metadata10 === void 0 ? void 0 : _tokenInfo$metadata10.assetId) || '-1';
+  var _tokenInfo$metadata0;
+  return ((_tokenInfo$metadata0 = tokenInfo.metadata) === null || _tokenInfo$metadata0 === void 0 ? void 0 : _tokenInfo$metadata0.assetId) || '-1';
 }
 function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata11;
-  return (_tokenInfo$metadata11 = tokenInfo.metadata) === null || _tokenInfo$metadata11 === void 0 ? void 0 : _tokenInfo$metadata11.multilocation;
+  var _tokenInfo$metadata1;
+  return (_tokenInfo$metadata1 = tokenInfo.metadata) === null || _tokenInfo$metadata1 === void 0 ? void 0 : _tokenInfo$metadata1.multilocation;
 }
 function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;
@@ -608,12 +612,12 @@ function _isRelayChain(chainInfo) {
   return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
 }
 function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI16;
-  return ((_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.chainType) === _types._SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI14;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _types._SubstrateChainType.RELAYCHAIN;
 }
 function _isSubstrateParaChain(chainInfo) {
-  var _chainInfo$substrateI17;
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.chainType) === _types._SubstrateChainType.PARACHAIN;
+  var _chainInfo$substrateI15;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI15 = chainInfo.substrateInfo) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.chainType) === _types._SubstrateChainType.PARACHAIN;
 }
 function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo4;
@@ -667,8 +671,8 @@ function _getBlockExplorerFromChain(chainInfo) {
     var _chainInfo$tonInfo;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$tonInfo = chainInfo.tonInfo) === null || _chainInfo$tonInfo === void 0 ? void 0 : _chainInfo$tonInfo.blockExplorer;
   } else {
-    var _chainInfo$substrateI18;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.blockExplorer;
+    var _chainInfo$substrateI16;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.blockExplorer;
   }
   if (!blockExplorer) {
     return undefined;
@@ -700,8 +704,8 @@ const _isAssetAutoEnable = chainAsset => {
 };
 exports._isAssetAutoEnable = _isAssetAutoEnable;
 function _getCrowdloanUrlFromChain(chainInfo) {
-  var _chainInfo$substrateI19;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI19 = chainInfo.substrateInfo) === null || _chainInfo$substrateI19 === void 0 ? void 0 : _chainInfo$substrateI19.crowdloanUrl) || '';
+  var _chainInfo$substrateI17;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.crowdloanUrl) || '';
 }
 function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_types2._CUSTOM_PREFIX);
@@ -739,8 +743,8 @@ function _isMantaZkAsset(chainAsset) {
   return _constants._MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_constants._ZK_ASSET_PREFIX);
 }
 function _getChainExistentialDeposit(chainInfo) {
-  var _chainInfo$substrateI20;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI20 = chainInfo.substrateInfo) === null || _chainInfo$substrateI20 === void 0 ? void 0 : _chainInfo$substrateI20.existentialDeposit) || '0';
+  var _chainInfo$substrateI18;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.existentialDeposit) || '0';
 }
 function _getAssetExistentialDeposit(chainAsset) {
   return (chainAsset === null || chainAsset === void 0 ? void 0 : chainAsset.minAmount) || '0';
@@ -872,7 +876,7 @@ const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) => {
     type: accountType
   } = accountInfo;
   if (accountChainType === _types3.AccountChainType.SUBSTRATE) {
-    return _isPureSubstrateChain(chainInfo) && _types4.SubstrateKeypairTypes.includes(accountType);
+    return _isPureSubstrateChain(chainInfo) && _types4.AllSubstrateKeypairTypes.includes(accountType);
   }
   if (accountChainType === _types3.AccountChainType.ETHEREUM) {
     if (accountSignMode === _types3.AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {