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

package/services/balance-service/index.js

@@ -7,12 +7,12 @@ import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAcrossbridgeTransferProcessFromEvm, getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _getChainNativeTokenSlug, _isCustomAsset, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenSlug, _isChainSubstrateCompatible, _isCustomAsset, _isCustomChain, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
 import { BalanceType } from '@subwallet/extension-base/types';
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
-import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
+import { AllSubstrateKeypairTypes, EthereumKeypairTypes } from '@subwallet/keyring/types';
 import keyring from '@subwallet/ui-keyring';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import BigN from 'bignumber.js';
@@ -458,7 +458,7 @@ export class BalanceService {
     const assetMap = this.state.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
       const type = getKeypairTypeByAddress(address);
-      const typeValid = [...SubstrateKeypairTypes, ...EthereumKeypairTypes].includes(type);
+      const typeValid = [...AllSubstrateKeypairTypes, ...EthereumKeypairTypes].includes(type);
       if (typeValid) {
         return this.state.subscanService.getMultiChainBalance(address).catch(e => {
           console.error(e);
@@ -539,12 +539,10 @@ export 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);
@@ -760,7 +758,7 @@ export class BalanceService {
       const assetMap = this.state.chainService.getAssetRegistry();
       const addresses = keyring.getPairs().map(account => account.address);
       const evmAddresses = addresses.filter(address => [...EthereumKeypairTypes].includes(getKeypairTypeByAddress(address)));
-      const substrateAddresses = addresses.filter(address => [...SubstrateKeypairTypes].includes(getKeypairTypeByAddress(address)));
+      const substrateAddresses = addresses.filter(address => [...AllSubstrateKeypairTypes].includes(getKeypairTypeByAddress(address)));
       const [nonZeroBalanceEvmToken, nonZeroBalanceSubstrateToken] = await Promise.all([this.evmDetectBalanceToken(evmAddresses), this.substrateDetectBalanceToken(substrateAddresses)]);
       const substrateDetectChain = this.substrateDetectBalanceChain();
       const evmDetectChain = await this.evmDetectBalanceChain();
@@ -788,5 +786,103 @@ export 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 subwalletApiSdk.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 (_isPureEvmChain(chainInfo)) {
+      const evmAddress = addresses.find(address => {
+        const type = getKeypairTypeByAddress(address);
+        return [...EthereumKeypairTypes].includes(type);
+      });
+      if (evmAddress) {
+        return evmAddress;
+      }
+    }
+    if (_isChainSubstrateCompatible(chainInfo)) {
+      const substrateAddress = addresses.find(address => {
+        const type = getKeypairTypeByAddress(address);
+        return [...AllSubstrateKeypairTypes, ...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 && !_isCustomChain(chainInfo.slug)) {
+      if (_isPureEvmChain(chainInfo)) {
+        tokenSlugsWithBalance.push(...(await this.getEvmTokensBalanceByChain(address, chainSlug)));
+      } else if (_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) || _isCustomAsset(asset.slug);
+        if (isPriorityToken || _isNativeToken(asset)) {
+          currentAssetSettings[asset.slug] = {
+            visible: true
+          };
+        }
+      } else {
+        currentAssetSettings[asset.slug] = {
+          visible: false
+        };
+      }
+    }
+    this.state.chainService.setAssetSettings(currentAssetSettings);
+  }
 }

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

@@ -76,7 +76,6 @@ export 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/services/balance-service/transfer/smart-contract.js

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

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

@@ -158,7 +158,6 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
         // estimate value
         bounce: false // anyMode
       });
-
       estimatedFee = new BigN((await estimateTonTxFee(tonApi, [mockMessage], mockWalletContract)).toString());
     } else {
       var _paymentInfo$partialF;
@@ -176,7 +175,6 @@ export const getTransferMockTxFee = async (address, chainInfo, tokenInfo, api) =
       const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
       estimatedFee = new BigN((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/services/balance-service/transfer/ton-transfer.js

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

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

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

package/services/chain-service/constants.d.ts

@@ -10,6 +10,14 @@ export declare const _API_OPTIONS_CHAIN_GROUP: {
 };
 export declare const _PREDEFINED_SINGLE_MODES: Record<string, SingleModeJson>;
 export declare const _PURE_EVM_CHAINS: string[];
+export declare const _GOVERNANCE_CHAIN_GROUP: {
+    polkadot: string[];
+    kusama: string[];
+    westend_assethub: string[];
+    paseo: string[];
+    solo: string[];
+    testnet: string[];
+};
 export declare const _BALANCE_CHAIN_GROUP: {
     kintsugi: string[];
     genshiro: string[];

package/services/chain-service/constants.js

@@ -20,6 +20,14 @@ export const _PREDEFINED_SINGLE_MODES = {
   }
 };
 export const _PURE_EVM_CHAINS = ['binance', 'binance_test', 'ethereum', 'ethereum_goerli', 'astarEvm', 'shidenEvm', 'shibuyaEvm', 'crabEvm', 'pangolinEvm', 'cloverEvm', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam', 'watr_network_evm'];
+export 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----------------------------------------------------------------------------------------------------------
 
@@ -126,6 +134,8 @@ export const _EXPECTED_BLOCK_TIME = {
   statemint: 6,
   statemine: 6,
   polkadex: 12,
+  westend_assethub: 6,
+  paseo_assethub: 6,
   ternoa: 6,
   ternoa_alphanet: 6,
   westend: 6,
@@ -136,8 +146,8 @@ export 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/services/chain-service/handler/CardanoApi.js

@@ -21,6 +21,9 @@ export class CardanoApi {
   connectionStatusSubject = new BehaviorSubject(_ChainConnectionStatus.DISCONNECTED);
   isApiReady = false;
   isApiReadyOnce = false;
+
+  // todo: add api with interface BlockFrostAPI to remove isTestnet check
+
   constructor(chainSlug, apiUrl, {
     isTestnet,
     providerName
@@ -62,7 +65,6 @@ export class CardanoApi {
     this.apiUrl = apiUrl;
     // this.api = this.createProvider();
   }
-
   async recoverConnect() {
     await this.disconnect();
     this.connect();

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

@@ -281,7 +281,6 @@ export class SubstrateApi {
     // this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
     // this.apiDefaultTxSudo = (api.tx.system && api.tx.system.setCode) || this.apiDefaultTx;
   }
-
   async makeRpcQuery({
     args,
     method,
@@ -322,7 +321,6 @@ export 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/services/chain-service/health-check/index.js

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

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

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

package/services/chain-service/index.d.ts

@@ -170,7 +170,6 @@ export declare class ChainService {
     getAssetSettings(): Promise<Record<string, AssetSetting>>;
     updateAssetSetting(assetSlug: string, assetSetting: AssetSetting, autoEnableNativeToken?: boolean): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
-    updatePriorityAssetsByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
     getAssetLogoMap(): Record<string, string>;
     subscribeAssetLogoMap(): BehaviorSubject<Record<string, string>>;

package/services/chain-service/index.js

@@ -12,7 +12,7 @@ import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-
 import { TonChainHandler } from '@subwallet/extension-base/services/chain-service/handler/TonChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetOriginChain, _getTokenOnChainAssetId, _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainBitcoinCompatible, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetOriginChain, _getTokenOnChainAssetId, _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainBitcoinCompatible, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { MYTHOS_MIGRATION_KEY } from '@subwallet/extension-base/services/migration-service/scripts';
 import { convertUtxoRawToUtxo } from '@subwallet/extension-base/services/request-service/helper';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
@@ -43,6 +43,9 @@ export class ChainService {
     assetRegistry: {},
     assetRefMap: {}
   };
+
+  // to save chain, token settings from user
+
   lockChainInfoMap = false; // prevent unwanted changes (edit, enable, disable) to chainInfoMap
 
   get mantaPay() {
@@ -708,7 +711,6 @@ export 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');
@@ -1352,7 +1354,18 @@ export 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
@@ -1855,27 +1868,6 @@ export 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 || _isNativeToken(asset)) {
-          currentAssetSettings[asset.slug] = {
-            visible: true
-          };
-        }
-      } else {
-        currentAssetSettings[asset.slug] = {
-          visible: false
-        };
-      }
-    }
-    this.setAssetSettings(currentAssetSettings);
-  }
   subscribeAssetSettings() {
     return this.assetSettingSubject;
   }

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

@@ -6,7 +6,7 @@ import { ChainType } from '@subwallet/extension-base/background/KoniTypes';
 import { _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _CUSTOM_PREFIX, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { AccountChainType, AccountSignMode } from '@subwallet/extension-base/types';
-import { BitcoinMainnetKeypairTypes, BitcoinTestnetKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
+import { AllSubstrateKeypairTypes, BitcoinMainnetKeypairTypes, BitcoinTestnetKeypairTypes, CardanoKeypairTypes, EthereumKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export function _isCustomChain(slug) {
   if (slug.length === 0) {
@@ -34,7 +34,6 @@ export function _isEqualContractAddress(address1, address2) {
   if (isEthereumAddress(address1) && isEthereumAddress(address2)) {
     return address1.toLowerCase() === address2.toLowerCase(); // EVM address is case-insensitive
   }
-
   return address2 === address1;
 }
 export function _isEqualSmartContractAsset(asset1, asset2) {
@@ -174,12 +173,10 @@ export function _isSmartContractToken(tokenInfo) {
 export function _isChainSubstrateCompatible(chainInfo) {
   return !!chainInfo.substrateInfo; // fallback to Ethereum
 }
-
 export function _getEvmChainId(chainInfo) {
   var _chainInfo$evmInfo;
   return (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId; // fallback to Ethereum
 }
-
 export function _getSubstrateParaId(chainInfo) {
   var _chainInfo$substrateI;
   return ((_chainInfo$substrateI = chainInfo.substrateInfo) === null || _chainInfo$substrateI === void 0 ? void 0 : _chainInfo$substrateI.paraId) || -1;
@@ -220,8 +217,8 @@ export 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(_AssetType.ERC20)) || false;
 }
 export 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(_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(_AssetType.PSP22)) || false;
 }
 export function _isAssetHubChain(chainInfo) {
   return ['statemint', 'statemine'].includes(chainInfo.slug);
@@ -230,12 +227,12 @@ export function _isAssetHubToken(token) {
   return ['statemint', 'statemine'].includes(token.originChain);
 }
 export 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(_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(_AssetType.GRC20)) || false;
 }
 export 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(_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(_AssetType.VFT)) || false;
 }
 export const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
@@ -289,28 +286,36 @@ export 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
     };
@@ -339,7 +344,6 @@ export function _isTokenEvmSmartContract(tokenInfo) {
 export function _isTokenTonSmartContract(tokenInfo) {
   return [_AssetType.TEP74].includes(tokenInfo.assetType); // add TEP-62 when supporting
 }
-
 export function _isCIP26Token(tokenInfo) {
   return [_AssetType.CIP26].includes(tokenInfo.assetType);
 }
@@ -367,12 +371,12 @@ export function _getXcmAssetType(tokenInfo) {
   return ((_tokenInfo$metadata9 = tokenInfo.metadata) === null || _tokenInfo$metadata9 === void 0 ? void 0 : _tokenInfo$metadata9.assetType) || '';
 }
 export 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';
 }
 export 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;
 }
 export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;
@@ -382,12 +386,12 @@ export function _isRelayChain(chainInfo) {
   return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
 }
 export function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI16;
-  return ((_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.chainType) === _SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI14;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _SubstrateChainType.RELAYCHAIN;
 }
 export 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) === _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) === _SubstrateChainType.PARACHAIN;
 }
 export function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo4;
@@ -441,8 +445,8 @@ export 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;
@@ -473,8 +477,8 @@ export const _isAssetAutoEnable = chainAsset => {
   return chainAsset.metadata ? !!chainAsset.metadata.autoEnable : false;
 };
 export 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) || '';
 }
 export function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_CUSTOM_PREFIX);
@@ -510,8 +514,8 @@ export function _isMantaZkAsset(chainAsset) {
   return _MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_ZK_ASSET_PREFIX);
 }
 export 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';
 }
 export function _getAssetExistentialDeposit(chainAsset) {
   return (chainAsset === null || chainAsset === void 0 ? void 0 : chainAsset.minAmount) || '0';
@@ -640,7 +644,7 @@ export const _isChainInfoCompatibleWithAccountInfo = (chainInfo, accountInfo) =>
     type: accountType
   } = accountInfo;
   if (accountChainType === AccountChainType.SUBSTRATE) {
-    return _isPureSubstrateChain(chainInfo) && SubstrateKeypairTypes.includes(accountType);
+    return _isPureSubstrateChain(chainInfo) && AllSubstrateKeypairTypes.includes(accountType);
   }
   if (accountChainType === AccountChainType.ETHEREUM) {
     if (accountSignMode === AccountSignMode.ECDSA_SUBSTRATE_LEDGER) {

package/services/earning-service/handlers/base.js

@@ -133,6 +133,14 @@ export default class BasePoolHandler {
 
   /** Subscribe pool info */
 
+  /** Subscribe pool position */
+
+  /** Get pool reward */
+
+  /** Get pool reward history */
+
+  /** Get pool target */
+
   /* Subscribe data */
 
   /* Join action */
@@ -268,6 +276,24 @@ export default class BasePoolHandler {
 
   /** Validate param to join the pool */
 
+  /* Validate */
+
+  /* Submit */
+
+  /** Create `transaction` to join the pool step-by-step */
+
+  /* Submit */
+
+  /* Join action */
+
+  /* Leave action */
+
+  /** Validate param to leave the pool */
+
+  /** Create `transaction` to leave the pool normal (default unstake) */
+
+  /** Create `transaction` to leave the pool fast (swap token) */
+
   /** Create `transaction` to leave the pool */
   async handleYieldLeave(fastLeave, amount, address, selectedTarget, netuid, slippage) {
     if (fastLeave) {
@@ -283,6 +309,12 @@ export default class BasePoolHandler {
 
   /** Create `transaction` to withdraw unstaked amount */
 
+  /** Create `transaction` to cancel unstake */
+
+  /** Create `transaction` to claim reward */
+
+  /** Change earning validator */
+
   /** Check handler can handle slug */
   canHandleSlug(slug) {
     return this.slug === slug;

package/services/earning-service/handlers/lending/base.js

@@ -52,7 +52,6 @@ export default class BaseLendingPoolHandler extends BaseSpecialStakingPoolHandle
       if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
         errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE)); // TODO
       }
-
       if (poolPosition.unstakings.length > maxUnstakeRequest) {
         errors.push(new TransactionError(StakingTxErrorType.EXCEED_MAX_UNSTAKING, t('bg.EARNING.services.service.earning.lending.maxUnstakeTimes', {
           replace: {
@@ -64,7 +63,6 @@ export default class BaseLendingPoolHandler extends BaseSpecialStakingPoolHandle
     if (bnRemainingStake.lt(0)) {
       errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE)); // TODO
     }
-
     return Promise.resolve(errors);
   }
 

package/services/earning-service/handlers/liquid-staking/acala.js

@@ -249,7 +249,6 @@ export default class AcalaLiquidStakingPoolHandler extends BaseLiquidStakingPool
     // Min target amount
     weightedMinAmount // should always set a min target to prevent unexpected result
     );
-
     return [ExtrinsicType.REDEEM_LDOT, extrinsic];
   }
   async handleYieldUnstake(amount, address, selectedTarget) {