@subwallet/extension-base 1.3.70-2 → 1.3.72-0

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'];
@@ -573,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);
 }
@@ -601,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;
@@ -616,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;
@@ -675,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;
@@ -708,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);
@@ -747,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';
@@ -880,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) {

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

@@ -12,7 +12,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = process.env.PATCH_CHAIN_LIST_URL || (PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev');
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.122'; // update this when build chain-list
+const ChainListVersion = '0.2.123'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 exports.ChainListVersion = ChainListVersion;

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

@@ -141,6 +141,14 @@ class BasePoolHandler {
 
   /** Subscribe pool info */
 
+  /** Subscribe pool position */
+
+  /** Get pool reward */
+
+  /** Get pool reward history */
+
+  /** Get pool target */
+
   /* Subscribe data */
 
   /* Join action */
@@ -276,6 +284,24 @@ 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) {
@@ -291,6 +317,12 @@ 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/cjs/services/earning-service/handlers/lending/base.js

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

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

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

package/cjs/services/earning-service/handlers/liquid-staking/base.js

@@ -76,7 +76,6 @@ class BaseLiquidStakingPoolHandler extends _special.default {
       if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
         errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.INVALID_ACTIVE_STAKE)); // TODO
       }
-
       if (poolPosition.unstakings.length > maxUnstakeRequest) {
         errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.EXCEED_MAX_UNSTAKING, (0, _i18next.t)('bg.EARNING.services.service.earning.liquidStaking.maxUnstakeTimes', {
           replace: {
@@ -88,7 +87,6 @@ class BaseLiquidStakingPoolHandler extends _special.default {
     if (bnRemainingStake.lt(_util.BN_ZERO)) {
       errors.push(new _TransactionError.TransactionError(_types.StakingTxErrorType.INVALID_ACTIVE_STAKE)); // TODO
     }
-
     return Promise.resolve(errors);
   }
 

package/cjs/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -161,7 +161,6 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
 
         // const bnTotalBalance = bnActiveBalance.add(bnUnstakingBalance);
       }
-
       const unlockingMap = {};
 
       // TODO: review unstaking info vtokenMinting.userUnlockLedger
@@ -213,7 +212,6 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
             });
           });
         }
-
         const activeToTotalBalance = exchangeRate.multipliedBy(bnActiveBalance.toString());
         const totalBalance = activeToTotalBalance.plus(unlockBalance.toString());
         const result = {

package/cjs/services/earning-service/handlers/liquid-staking/parallel.js

@@ -138,7 +138,6 @@ class ParallelLiquidStakingPoolHandler extends _base.default {
             });
           }
         }
-
         const result = {
           ...this.baseInfo,
           type: this.type,

package/cjs/services/earning-service/handlers/native-staking/astar.js

@@ -200,7 +200,6 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
         }
       }
     }
-
     const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
     if (unlockingChunks.length > 0) {
       for (const unlockingChunk of unlockingChunks) {
@@ -219,7 +218,6 @@ class AstarNativeStakingPoolHandler extends _basePara.default {
         });
       }
     }
-
     if (nominationList.length === 0 && unstakingList.length === 0) {
       return {
         balanceToken: this.nativeToken.slug,

package/cjs/services/earning-service/handlers/native-staking/dtao.js

@@ -12,11 +12,52 @@ var _utils = require("@subwallet/extension-base/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _util = require("@polkadot/util");
 var _tao = _interopRequireWildcard(require("./tao"));
-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
 
+// interface ApiResponse {
+//   data: SubnetData[];
+// }
+
+// interface PoolData {
+//   netuid: number;
+//   name: string;
+//   symbol: string;
+// }
+
+// interface PoolApiResponse {
+//   data: PoolData[];
+// }
+
+// const SUBNET_API_URL = 'https://dash.taostats.io/api/subnet';
+// const POOL_API_URL = 'https://dash.taostats.io/api/dtao/pool';
+
+// export async function fetchSubnetData () {
+//   try {
+//     const [subnetResponse, poolResponse] = await Promise.all([
+//       fetch(SUBNET_API_URL).then((res) => res.json()) as Promise<ApiResponse>,
+//       fetch(POOL_API_URL).then((res) => res.json()) as Promise<PoolApiResponse>
+//     ]);
+
+//     const poolMap = new Map(poolResponse.data.map((pool) => [pool.netuid, pool]));
+
+//     const filteredSubnets = subnetResponse.data.filter((subnet) => subnet.netuid !== 0);
+
+//     const mergedData = filteredSubnets.map((subnet) => ({
+//       ...subnet,
+//       name: poolMap.get(subnet.netuid)?.name || 'Unknown',
+//       symbol: poolMap.get(subnet.netuid)?.symbol || 'Unknown'
+//     }));
+
+//     return mergedData;
+//   } catch (err) {
+//     console.error('Error:', err);
+
+//     return [];
+//   }
+// }
+
 const getAlphaToTaoMapping = async substrateApi => {
   const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
   if (!allSubnets || allSubnets.length === 0) {

package/cjs/services/earning-service/handlers/native-staking/energy.js

@@ -158,7 +158,6 @@ class EnergyNativeStakingPoolHandler extends _basePara.default {
           }
         }
       }
-
       const bnStake = new _util.BN(nomination.amount);
       const bnUnstakeBalance = unstakingMap[nomination.owner] ? new _util.BN(unstakingMap[nomination.owner].claimable) : _util.BN_ZERO;
       const bnActiveStake = bnStake.sub(bnUnstakeBalance);

package/cjs/services/earning-service/handlers/native-staking/mythos.js

@@ -112,7 +112,6 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
           // tvl: totalStake.toString(),
           // inflation
         },
-
         maxPoolMembers: parseInt(maxStakers)
       };
       callback(data);
@@ -347,7 +346,6 @@ class MythosNativeStakingPoolHandler extends _basePara.default {
     }
     extrinsicList.push(...[substrateApi.api.tx.collatorStaking.unstakeFrom(selectedTarget), substrateApi.api.tx.collatorStaking.unlock(null) // ignore amount to unlock all
     ]);
-
     return [_KoniTypes.ExtrinsicType.STAKING_UNBOND, substrateApi.api.tx.utility.batchAll(extrinsicList)];
   }
 

package/cjs/services/earning-service/handlers/native-staking/para-chain.js

@@ -88,7 +88,6 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
       if (unvestedAllocation) {
         totalIssuance.add(unvestedAllocation); // for Turing network, read more at https://hackmd.io/@sbAqOuXkRvyiZPOB3Ryn6Q/Sypr3ZJh5
       }
-
       const inflationConfig = _inflation.toHuman();
       const inflation = (0, _utils.getParaCurrentInflation)((0, _utils3.parseRawNumber)(totalStake.toString()), inflationConfig);
       const eraTime = _constants._STAKING_ERA_LENGTH_MAP[this.chain] || _constants._STAKING_ERA_LENGTH_MAP.default; // in hours
@@ -185,7 +184,6 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
           }
         }
       }
-
       const bnStake = new _util.BN(delegation.amount);
       const bnUnstakeBalance = unstakingMap[delegation.owner] ? new _util.BN(unstakingMap[delegation.owner].claimable) : _util.BN_ZERO;
       const bnActiveStake = bnStake.sub(bnUnstakeBalance);

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -141,9 +141,9 @@ class RelayNativeStakingPoolHandler extends _base.default {
   /* Subscribe pool position */
 
   async parseNominatorMetadata(chainInfo, address, substrateApi, ledger, currentEra, minStake) {
-    var _substrateApi$api$que7, _substrateApi$api$que8, _substrateApi$api$que9, _substrateApi$api$que10, _substrateApi$api$que11, _substrateApi$api$que12;
+    var _substrateApi$api$que7, _substrateApi$api$que8, _substrateApi$api$que9, _substrateApi$api$que0, _substrateApi$api$que1, _substrateApi$api$que10;
     const chain = chainInfo.slug;
-    const [_nominations, _bonded, _activeEra] = await Promise.all([(_substrateApi$api$que7 = substrateApi.api.query) === null || _substrateApi$api$que7 === void 0 ? void 0 : (_substrateApi$api$que8 = _substrateApi$api$que7.staking) === null || _substrateApi$api$que8 === void 0 ? void 0 : _substrateApi$api$que8.nominators(address), (_substrateApi$api$que9 = substrateApi.api.query) === null || _substrateApi$api$que9 === void 0 ? void 0 : (_substrateApi$api$que10 = _substrateApi$api$que9.staking) === null || _substrateApi$api$que10 === void 0 ? void 0 : _substrateApi$api$que10.bonded(address), (_substrateApi$api$que11 = substrateApi.api.query) === null || _substrateApi$api$que11 === void 0 ? void 0 : (_substrateApi$api$que12 = _substrateApi$api$que11.staking) === null || _substrateApi$api$que12 === void 0 ? void 0 : _substrateApi$api$que12.activeEra()]);
+    const [_nominations, _bonded, _activeEra] = await Promise.all([(_substrateApi$api$que7 = substrateApi.api.query) === null || _substrateApi$api$que7 === void 0 ? void 0 : (_substrateApi$api$que8 = _substrateApi$api$que7.staking) === null || _substrateApi$api$que8 === void 0 ? void 0 : _substrateApi$api$que8.nominators(address), (_substrateApi$api$que9 = substrateApi.api.query) === null || _substrateApi$api$que9 === void 0 ? void 0 : (_substrateApi$api$que0 = _substrateApi$api$que9.staking) === null || _substrateApi$api$que0 === void 0 ? void 0 : _substrateApi$api$que0.bonded(address), (_substrateApi$api$que1 = substrateApi.api.query) === null || _substrateApi$api$que1 === void 0 ? void 0 : (_substrateApi$api$que10 = _substrateApi$api$que1.staking) === null || _substrateApi$api$que10 === void 0 ? void 0 : _substrateApi$api$que10.activeEra()]);
     const unlimitedNominatorRewarded = substrateApi.api.consts.staking.maxExposurePageSize !== undefined;
     const _maxNominatorRewardedPerValidator = (substrateApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const maxNominatorRewardedPerValidator = unlimitedNominatorRewarded ? undefined : parseInt(_maxNominatorRewardedPerValidator);
@@ -243,23 +243,22 @@ class RelayNativeStakingPoolHandler extends _base.default {
         activeStake: '0' // relaychain allocates stake accordingly
       });
     }));
-
     return nominationList;
   }
   async subscribePoolPosition(useAddresses, resultCallback) {
-    var _substrateApi$api$que13;
+    var _substrateApi$api$que11;
     let cancel = false;
     const substrateApi = await this.substrateApi.isReady;
     const defaultInfo = this.baseInfo;
     const chainInfo = this.chainInfo;
-    const unsub = await ((_substrateApi$api$que13 = substrateApi.api.query.staking) === null || _substrateApi$api$que13 === void 0 ? void 0 : _substrateApi$api$que13.ledger.multi(useAddresses, async ledgers => {
+    const unsub = await ((_substrateApi$api$que11 = substrateApi.api.query.staking) === null || _substrateApi$api$que11 === void 0 ? void 0 : _substrateApi$api$que11.ledger.multi(useAddresses, async ledgers => {
       if (cancel) {
         unsub === null || unsub === void 0 ? void 0 : unsub();
         return;
       }
       if (ledgers) {
-        var _substrateApi$api$que14, _substrateApi$api$que15, _substrateApi$api$que16, _substrateApi$api$que17, _substrateApi$api$que18, _substrateApi$api$que19, _substrateApi$api$que20, _substrateApi$api$que21, _substrateApi$api$der, _substrateApi$api$der2;
-        const [_currentEra, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_substrateApi$api$que14 = substrateApi.api.query) === null || _substrateApi$api$que14 === void 0 ? void 0 : (_substrateApi$api$que15 = _substrateApi$api$que14.staking) === null || _substrateApi$api$que15 === void 0 ? void 0 : _substrateApi$api$que15.currentEra(), ((_substrateApi$api$que16 = substrateApi.api.query) === null || _substrateApi$api$que16 === void 0 ? void 0 : (_substrateApi$api$que17 = _substrateApi$api$que16.staking) === null || _substrateApi$api$que17 === void 0 ? void 0 : _substrateApi$api$que17.minimumActiveStake) && ((_substrateApi$api$que18 = substrateApi.api.query) === null || _substrateApi$api$que18 === void 0 ? void 0 : (_substrateApi$api$que19 = _substrateApi$api$que18.staking) === null || _substrateApi$api$que19 === void 0 ? void 0 : _substrateApi$api$que19.minimumActiveStake()), (_substrateApi$api$que20 = substrateApi.api.query) === null || _substrateApi$api$que20 === void 0 ? void 0 : (_substrateApi$api$que21 = _substrateApi$api$que20.staking) === null || _substrateApi$api$que21 === void 0 ? void 0 : _substrateApi$api$que21.minNominatorBond(), (_substrateApi$api$der = substrateApi.api.derive) === null || _substrateApi$api$der === void 0 ? void 0 : (_substrateApi$api$der2 = _substrateApi$api$der.session) === null || _substrateApi$api$der2 === void 0 ? void 0 : _substrateApi$api$der2.progress()]);
+        var _substrateApi$api$que12, _substrateApi$api$que13, _substrateApi$api$que14, _substrateApi$api$que15, _substrateApi$api$que16, _substrateApi$api$que17, _substrateApi$api$que18, _substrateApi$api$que19, _substrateApi$api$der, _substrateApi$api$der2;
+        const [_currentEra, _minimumActiveStake, _minNominatorBond] = await Promise.all([(_substrateApi$api$que12 = substrateApi.api.query) === null || _substrateApi$api$que12 === void 0 ? void 0 : (_substrateApi$api$que13 = _substrateApi$api$que12.staking) === null || _substrateApi$api$que13 === void 0 ? void 0 : _substrateApi$api$que13.currentEra(), ((_substrateApi$api$que14 = substrateApi.api.query) === null || _substrateApi$api$que14 === void 0 ? void 0 : (_substrateApi$api$que15 = _substrateApi$api$que14.staking) === null || _substrateApi$api$que15 === void 0 ? void 0 : _substrateApi$api$que15.minimumActiveStake) && ((_substrateApi$api$que16 = substrateApi.api.query) === null || _substrateApi$api$que16 === void 0 ? void 0 : (_substrateApi$api$que17 = _substrateApi$api$que16.staking) === null || _substrateApi$api$que17 === void 0 ? void 0 : _substrateApi$api$que17.minimumActiveStake()), (_substrateApi$api$que18 = substrateApi.api.query) === null || _substrateApi$api$que18 === void 0 ? void 0 : (_substrateApi$api$que19 = _substrateApi$api$que18.staking) === null || _substrateApi$api$que19 === void 0 ? void 0 : _substrateApi$api$que19.minNominatorBond(), (_substrateApi$api$der = substrateApi.api.derive) === null || _substrateApi$api$der === void 0 ? void 0 : (_substrateApi$api$der2 = _substrateApi$api$der.session) === null || _substrateApi$api$der2 === void 0 ? void 0 : _substrateApi$api$der2.progress()]);
         const currentEra = _currentEra.toString();
         const minActiveStake = (_minimumActiveStake === null || _minimumActiveStake === void 0 ? void 0 : _minimumActiveStake.toString()) || '0';
         const minNominatorBond = _minNominatorBond.toString();
@@ -301,10 +300,10 @@ class RelayNativeStakingPoolHandler extends _base.default {
     };
   }
   async checkAccountHaveStake(useAddresses) {
-    var _substrateApi$api$que22, _substrateApi$api$que23, _substrateApi$api$que24;
+    var _substrateApi$api$que20, _substrateApi$api$que21, _substrateApi$api$que22;
     const result = [];
     const substrateApi = await this.substrateApi.isReady;
-    const ledgers = await ((_substrateApi$api$que22 = substrateApi.api.query.staking) === null || _substrateApi$api$que22 === void 0 ? void 0 : (_substrateApi$api$que23 = _substrateApi$api$que22.ledger) === null || _substrateApi$api$que23 === void 0 ? void 0 : (_substrateApi$api$que24 = _substrateApi$api$que23.multi) === null || _substrateApi$api$que24 === void 0 ? void 0 : _substrateApi$api$que24.call(_substrateApi$api$que23, useAddresses));
+    const ledgers = await ((_substrateApi$api$que20 = substrateApi.api.query.staking) === null || _substrateApi$api$que20 === void 0 ? void 0 : (_substrateApi$api$que21 = _substrateApi$api$que20.ledger) === null || _substrateApi$api$que21 === void 0 ? void 0 : (_substrateApi$api$que22 = _substrateApi$api$que21.multi) === null || _substrateApi$api$que22 === void 0 ? void 0 : _substrateApi$api$que22.call(_substrateApi$api$que21, useAddresses));
     if (ledgers) {
       for (let i = 0; i < useAddresses.length; i++) {
         const address = useAddresses[i];

package/cjs/services/earning-service/handlers/special.js

@@ -281,6 +281,13 @@ class BaseSpecialStakingPoolHandler extends _base.default {
    * @return Fee of the submitting step
    * */
 
+  /**
+   * @async
+   * @function getSubmitStepFee
+   * @description Get submit step fee
+   * @return {Promise<YieldTokenBaseInfo>} Fee of the submitting step
+   * */
+
   async getSubmitStep(params) {
     const fee = await this.getSubmitStepFee(params);
     return [this.submitJoinStepInfo, fee];

package/cjs/services/history-service/subsquid-multi-chain-history.js

@@ -47,7 +47,6 @@ exports.SubsquidTransactionType = SubsquidTransactionType;
 const HISTORY_SUPPORT_TYPES = [SubsquidTransactionType.BalanceTransfer, SubsquidTransactionType.EthereumExecuted, SubsquidTransactionType.StakingBonded
 // SubsquidTransactionType.CrowdloanContributed // Not support because data indexer not enough data
 ];
-
 function parseData(anyData) {
   try {
     return JSON.parse(anyData);

package/cjs/services/keyring-service/context/handlers/Derive.js

@@ -15,7 +15,7 @@ var _Base = require("./Base");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const validDeriveKeypairTypes = [..._types2.SubstrateKeypairTypes, ..._types2.EthereumKeypairTypes, 'ton', 'cardano', ..._types2.BitcoinKeypairTypes];
+const validDeriveKeypairTypes = [..._types2.DefaultSubstrateKeypairTypes, ..._types2.EthereumKeypairTypes, 'ton', 'cardano', ..._types2.BitcoinKeypairTypes];
 
 /**
  * @class AccountDeriveHandler

package/cjs/services/keyring-service/context/handlers/Migration.js

@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SESSION_TIMEOUT = exports.AccountMigrationHandler = void 0;
 var _Base = require("@subwallet/extension-base/services/keyring-service/context/handlers/Base");
+var _utils = require("@subwallet/extension-base/services/keyring-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils = require("@subwallet/extension-base/utils");
+var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -34,7 +35,8 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
   async migrateUnifiedAndFetchEligibleSoloAccounts(request, setMigratingModeFn) {
     // Migrate unified -> unified
     const password = request.password;
-    const allAccountProxies = Object.values(this.state.accounts);
+    const _allAccountProxies = Object.values(this.state.accounts);
+    const allAccountProxies = _allAccountProxies.filter(acc => !(0, _utils.isTWAccount)(acc)); // Prevent migrate TrustWallet solo account
     const UACanBeMigrated = this.getUACanBeMigrated(allAccountProxies);
     const UACanBeMigratedSortedByParent = this.sortUAByParent(UACanBeMigrated); // master account must be migrated before derived account
     const migratedUnifiedAccountIds = await this.migrateUnifiedToUnifiedAccount(password, UACanBeMigratedSortedByParent, setMigratingModeFn);
@@ -82,9 +84,9 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
           proxyId
         }).result;
         const newChainTypes = Object.values(_types.AccountChainType).filter(type => !unifiedAccount.chainTypes.includes(type) && _types.SUPPORTED_ACCOUNT_CHAIN_TYPES.includes(type));
-        const keypairTypes = newChainTypes.flatMap(chainType => (0, _utils.getDefaultKeypairTypeFromAccountChainType)(chainType));
+        const keypairTypes = newChainTypes.flatMap(chainType => (0, _utils2.getDefaultKeypairTypeFromAccountChainType)(chainType));
         keypairTypes.forEach(type => {
-          const suri = (0, _utils.getSuri)(mnemonic, type);
+          const suri = (0, _utils2.getSuri)(mnemonic, type);
           const pair = _uiKeyring.keyring.createFromUri(suri, {}, type);
           const address = pair.address;
           modifiedPairs[address] = {
@@ -94,7 +96,7 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
           };
         });
         keypairTypes.forEach(type => {
-          const suri = (0, _utils.getSuri)(mnemonic, type);
+          const suri = (0, _utils2.getSuri)(mnemonic, type);
           const {
             derivePath
           } = (0, _utilCrypto.keyExtractSuri)(suri);
@@ -141,7 +143,7 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
         password,
         proxyId: oldProxyId
       }).result;
-      const upcomingProxyId = (0, _utils.createAccountProxyId)(mnemonic);
+      const upcomingProxyId = (0, _utils2.createAccountProxyId)(mnemonic);
       if (!rs[upcomingProxyId]) {
         rs[upcomingProxyId] = [];
       }
@@ -187,9 +189,9 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
         password,
         proxyId: firstAccountOldProxyId
       }).result;
-      const keypairTypes = _types.SUPPORTED_ACCOUNT_CHAIN_TYPES.flatMap(chainType => (0, _utils.getDefaultKeypairTypeFromAccountChainType)(chainType));
+      const keypairTypes = _types.SUPPORTED_ACCOUNT_CHAIN_TYPES.flatMap(chainType => (0, _utils2.getDefaultKeypairTypeFromAccountChainType)(chainType));
       keypairTypes.forEach(type => {
-        const suri = (0, _utils.getSuri)(mnemonic, type);
+        const suri = (0, _utils2.getSuri)(mnemonic, type);
         const pair = _uiKeyring.keyring.createFromUri(suri, {}, type);
         const address = pair.address;
         modifiedPairs[address] = {
@@ -205,7 +207,7 @@ class AccountMigrationHandler extends _Base.AccountBaseHandler {
       });
       const soloAccountProxyIds = [];
       keypairTypes.forEach(type => {
-        const suri = (0, _utils.getSuri)(mnemonic, type);
+        const suri = (0, _utils2.getSuri)(mnemonic, type);
         const {
           derivePath
         } = (0, _utilCrypto.keyExtractSuri)(suri);

package/cjs/services/keyring-service/context/handlers/Mnemonic.js

@@ -50,10 +50,11 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
   }
 
   /* Validate seed */
-  mnemonicValidateV2(_ref2) {
-    let {
-      mnemonic
-    } = _ref2;
+  mnemonicValidateV2(request) {
+    const {
+      mnemonic,
+      mnemonicType
+    } = request;
     const {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(mnemonic);
@@ -70,8 +71,13 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
       }));
       try {
         (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), (0, _i18next.t)('bg.ACCOUNT.services.keyring.handler.Mnemonic.invalidSeedPhraseTryAgain'));
-        mnemonicTypes = 'general';
-        pairTypes = ['sr25519', ..._types2.EthereumKeypairTypes, 'ton', ..._types2.CardanoKeypairTypes, ..._types2.BitcoinKeypairTypes];
+        if (mnemonicType === 'trust-wallet') {
+          mnemonicTypes = 'trust-wallet';
+          pairTypes = ['ed25519-tw'];
+        } else {
+          mnemonicTypes = 'general';
+          pairTypes = ['sr25519', ..._types2.EthereumKeypairTypes, 'ton', ..._types2.CardanoKeypairTypes, ..._types2.BitcoinKeypairTypes];
+        }
       } catch (e) {
         (0, _util.assert)((0, _utils2.tonMnemonicValidate)(phrase), (0, _i18next.t)('bg.ACCOUNT.services.keyring.handler.Mnemonic.invalidSeedPhraseTryAgain'));
         mnemonicTypes = 'ton';
@@ -87,10 +93,10 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
     pairTypes.forEach(type => {
       rs.addressMap[type] = _uiKeyring.keyring.createFromUri((0, _utils.getSuri)(mnemonic, type), {}, type).address;
     });
-    const exists = this.state.checkAddressExists(Object.values(rs.addressMap));
-    (0, _util.assert)(!exists, (0, _i18next.t)('bg.ACCOUNT.services.keyring.handler.Mnemonic.accountAlreadyExistsWithName', {
+    const existingAccount = this.state.checkAddressExists(Object.values(rs.addressMap));
+    (0, _util.assert)(!existingAccount, (0, _i18next.t)('bg.ACCOUNT.services.keyring.handler.Mnemonic.accountAlreadyExistsWithName', {
       replace: {
-        name: (exists === null || exists === void 0 ? void 0 : exists.name) || (exists === null || exists === void 0 ? void 0 : exists.address) || ''
+        name: (existingAccount === null || existingAccount === void 0 ? void 0 : existingAccount.name) || (existingAccount === null || existingAccount === void 0 ? void 0 : existingAccount.address) || ''
       }
     }));
     return rs;
@@ -103,12 +109,11 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
       name,
       password,
       suri: _suri,
-      type
+      types
     } = request;
     const addressDict = {};
     let changedAccount = false;
     const hasMasterPassword = _uiKeyring.keyring.keyring.hasMasterPassword;
-    const types = type ? [type] : ['sr25519', ..._types2.EthereumKeypairTypes, 'ton', ..._types2.CardanoKeypairTypes, ..._types2.BitcoinKeypairTypes];
     if (!hasMasterPassword) {
       if (!password) {
         throw Error((0, _i18next.t)('bg.ACCOUNT.services.keyring.handler.Mnemonic.eachAccountPasswordNeeded'));
@@ -183,11 +188,11 @@ class AccountMnemonicHandler extends _Base.AccountBaseHandler {
 
   /* Export mnemonic */
 
-  exportAccountProxyMnemonic(_ref3) {
+  exportAccountProxyMnemonic(_ref2) {
     let {
       password,
       proxyId
-    } = _ref3;
+    } = _ref2;
     const isUnified = this.state.isUnifiedAccount(proxyId);
     if (!isUnified) {
       const pair = _uiKeyring.keyring.getPair(proxyId);