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

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

@@ -69,7 +69,6 @@ export default class BaseLiquidStakingPoolHandler extends BaseSpecialStakingPool
       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.liquidStaking.maxUnstakeTimes', {
           replace: {
@@ -81,7 +80,6 @@ export default class BaseLiquidStakingPoolHandler extends BaseSpecialStakingPool
     if (bnRemainingStake.lt(BN_ZERO)) {
       errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE)); // TODO
     }
-
     return Promise.resolve(errors);
   }
 

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

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

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

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

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

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

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

@@ -8,6 +8,49 @@ import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 import TaoNativeStakingPoolHandler, { DEFAULT_DTAO_MINBOND } from "./tao.js";
+
+// 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/services/earning-service/handlers/native-staking/energy.js

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

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

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

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

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

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

@@ -134,9 +134,9 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
   /* 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);
@@ -236,23 +236,22 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
         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();
@@ -294,10 +293,10 @@ export default class RelayNativeStakingPoolHandler extends BaseNativeStakingPool
     };
   }
   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/services/earning-service/handlers/special.js

@@ -274,6 +274,13 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
    * @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/services/history-service/subsquid-multi-chain-history.js

@@ -38,7 +38,6 @@ export let 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/services/keyring-service/context/handlers/Derive.js

@@ -4,12 +4,12 @@
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { CommonAccountErrorType, DeriveErrorType, SWCommonAccountError, SWDeriveError } from '@subwallet/extension-base/types';
 import { createAccountProxyId, derivePair, findSoloNextDerive, findUnifiedNextDerive, getSoloDerivationInfo, parseUnifiedSuriToDerivationPath, validateDerivationPath } from '@subwallet/extension-base/utils';
-import { BitcoinKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
+import { BitcoinKeypairTypes, DefaultSubstrateKeypairTypes, EthereumKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';
 import { t } from 'i18next';
 import { assert } from '@polkadot/util';
 import { AccountBaseHandler } from "./Base.js";
-const validDeriveKeypairTypes = [...SubstrateKeypairTypes, ...EthereumKeypairTypes, 'ton', 'cardano', ...BitcoinKeypairTypes];
+const validDeriveKeypairTypes = [...DefaultSubstrateKeypairTypes, ...EthereumKeypairTypes, 'ton', 'cardano', ...BitcoinKeypairTypes];
 
 /**
  * @class AccountDeriveHandler

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AccountBaseHandler } from '@subwallet/extension-base/services/keyring-service/context/handlers/Base';
+import { isTWAccount } from '@subwallet/extension-base/services/keyring-service/utils';
 import { AccountChainType, SUPPORTED_ACCOUNT_CHAIN_TYPES } from '@subwallet/extension-base/types';
 import { createAccountProxyId, getDefaultKeypairTypeFromAccountChainType, getSuri } from '@subwallet/extension-base/utils';
 import { generateRandomString } from '@subwallet/extension-base/utils/getId';
@@ -26,7 +27,8 @@ export class AccountMigrationHandler extends 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 => !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);

package/services/keyring-service/context/handlers/Mnemonic.d.ts

@@ -9,7 +9,7 @@ export declare const SEED_LENGTHS: number[];
  * */
 export declare class AccountMnemonicHandler extends AccountBaseHandler {
     mnemonicCreateV2({ length, mnemonic: _seed, type }: RequestMnemonicCreateV2): Promise<ResponseMnemonicCreateV2>;
-    mnemonicValidateV2({ mnemonic }: RequestMnemonicValidateV2): ResponseMnemonicValidateV2;
+    mnemonicValidateV2(request: RequestMnemonicValidateV2): ResponseMnemonicValidateV2;
     accountsCreateSuriV2(request: RequestAccountCreateSuriV2): ResponseAccountCreateSuriV2;
     exportAccountProxyMnemonic({ password, proxyId }: RequestExportAccountProxyMnemonic): ResponseExportAccountProxyMnemonic;
 }

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

@@ -41,9 +41,11 @@ export class AccountMnemonicHandler extends AccountBaseHandler {
   }
 
   /* Validate seed */
-  mnemonicValidateV2({
-    mnemonic
-  }) {
+  mnemonicValidateV2(request) {
+    const {
+      mnemonic,
+      mnemonicType
+    } = request;
     const {
       phrase
     } = keyExtractSuri(mnemonic);
@@ -60,8 +62,13 @@ export class AccountMnemonicHandler extends AccountBaseHandler {
       }));
       try {
         assert(mnemonicValidate(phrase), t('bg.ACCOUNT.services.keyring.handler.Mnemonic.invalidSeedPhraseTryAgain'));
-        mnemonicTypes = 'general';
-        pairTypes = ['sr25519', ...EthereumKeypairTypes, 'ton', ...CardanoKeypairTypes, ...BitcoinKeypairTypes];
+        if (mnemonicType === 'trust-wallet') {
+          mnemonicTypes = 'trust-wallet';
+          pairTypes = ['ed25519-tw'];
+        } else {
+          mnemonicTypes = 'general';
+          pairTypes = ['sr25519', ...EthereumKeypairTypes, 'ton', ...CardanoKeypairTypes, ...BitcoinKeypairTypes];
+        }
       } catch (e) {
         assert(tonMnemonicValidate(phrase), t('bg.ACCOUNT.services.keyring.handler.Mnemonic.invalidSeedPhraseTryAgain'));
         mnemonicTypes = 'ton';
@@ -77,10 +84,10 @@ export class AccountMnemonicHandler extends AccountBaseHandler {
     pairTypes.forEach(type => {
       rs.addressMap[type] = keyring.createFromUri(getSuri(mnemonic, type), {}, type).address;
     });
-    const exists = this.state.checkAddressExists(Object.values(rs.addressMap));
-    assert(!exists, t('bg.ACCOUNT.services.keyring.handler.Mnemonic.accountAlreadyExistsWithName', {
+    const existingAccount = this.state.checkAddressExists(Object.values(rs.addressMap));
+    assert(!existingAccount, 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;
@@ -93,12 +100,11 @@ export class AccountMnemonicHandler extends AccountBaseHandler {
       name,
       password,
       suri: _suri,
-      type
+      types
     } = request;
     const addressDict = {};
     let changedAccount = false;
     const hasMasterPassword = keyring.keyring.hasMasterPassword;
-    const types = type ? [type] : ['sr25519', ...EthereumKeypairTypes, 'ton', ...CardanoKeypairTypes, ...BitcoinKeypairTypes];
     if (!hasMasterPassword) {
       if (!password) {
         throw Error(t('bg.ACCOUNT.services.keyring.handler.Mnemonic.eachAccountPasswordNeeded'));

package/services/keyring-service/context/state.d.ts

@@ -1,9 +1,11 @@
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { AccountProxy, AccountProxyData, AccountProxyMap, AccountProxyStoreData, CurrentAccountInfo, ModifyPairStoreData } from '@subwallet/extension-base/types';
+import { KeypairType } from '@subwallet/keyring/types';
 import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 interface ExistsAccount {
     address: string;
     name: string;
+    relatedAccountTypes: KeypairType[];
 }
 export declare class AccountState {
     private readonly koniState;
@@ -70,6 +72,7 @@ export declare class AccountState {
     getAllAddresses(): string[];
     getProxyId(): string | null;
     getDecodedAddresses(accountProxy?: string, allowGetAllAccount?: boolean): string[];
+    getDecodedAccountTypes(accountProxyId: string): KeypairType[];
     /**
      * Account ref
      * @deprecated

package/services/keyring-service/context/state.js

@@ -279,15 +279,19 @@ export class AccountState {
           const belongsTo = this.belongUnifiedAccount(address);
           if (belongsTo) {
             const accountProxy = this.accountProxies[belongsTo];
+            const allAccountTypes = this.getDecodedAccountTypes(belongsTo); // get allAccountTypes of unified account of the account address
+
             return {
               address,
-              name: accountProxy.name
+              name: accountProxy.name,
+              relatedAccountTypes: allAccountTypes
             };
           } else {
             var _pair$meta;
             return {
               address,
-              name: ((_pair$meta = pair.meta) === null || _pair$meta === void 0 ? void 0 : _pair$meta.name) || address
+              name: ((_pair$meta = pair.meta) === null || _pair$meta === void 0 ? void 0 : _pair$meta.name) || address,
+              relatedAccountTypes: [pair.type]
             };
           }
         }
@@ -449,6 +453,20 @@ export class AccountState {
       return accountProxies[proxyId].accounts.map(account => account.address);
     }
   }
+  getDecodedAccountTypes(accountProxyId) {
+    if (!accountProxyId) {
+      return [];
+    }
+    if (accountProxyId === ALL_ACCOUNT_KEY) {
+      return []; // todo
+    }
+    const accountProxies = this.accounts;
+    if (!accountProxies[accountProxyId]) {
+      return [];
+    } else {
+      return accountProxies[accountProxyId].accounts.map(account => account.type);
+    }
+  }
 
   /* Get address for another service */
 
@@ -563,7 +581,7 @@ export class AccountState {
           metadata.suri = _parentSuri;
           needUpdateSet.add(address);
         }
-        const hasSuri = ('suri' in metadata);
+        const hasSuri = 'suri' in metadata;
         const lacksDerivationPath = !('derivationPath' in metadata);
         const isEthereumType = EthereumKeypairTypes.includes(pair.type);
         const isTonType = pair.type === 'ton';

package/services/keyring-service/utils.d.ts

@@ -1,2 +1,3 @@
 import { AccountProxy } from '@subwallet/extension-base/types';
 export declare const hasAnyAccountForMigration: (allAccountProxies: AccountProxy[]) => boolean;
+export declare const isTWAccount: (account: AccountProxy) => boolean;

package/services/keyring-service/utils.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { AccountProxyType } from '@subwallet/extension-base/types';
 export const hasAnyAccountForMigration = allAccountProxies => {
   for (const account of allAccountProxies) {
     if (account.isNeedMigrateUnifiedAccount) {
@@ -8,4 +9,12 @@ export const hasAnyAccountForMigration = allAccountProxies => {
     }
   }
   return false;
+};
+
+// Check if account is TrustWallet account
+export const isTWAccount = account => {
+  const isTWDerivation = account.suri === "m/44'/354'/0'/0'/0'";
+  const isTWSolo = account.accountType === AccountProxyType.SOLO;
+  const isTWKeyPairType = account.accounts[0].type === 'ed25519-tw';
+  return isTWDerivation && isTWSolo && isTWKeyPairType;
 };

package/services/mint-campaign-service/campaigns/UnlockDotCampaign.js

@@ -36,7 +36,6 @@ export default class UnlockDotCampaign {
       // } else {
       //   result = await this.getMinted(address, slug);
     }
-
     this.#transactionNftState[transactionId] = (_result = result) !== null && _result !== void 0 ? _result : {
       nftImage: ''
     };

package/services/nft-service/index.js

@@ -7,6 +7,12 @@ import { baseParseIPFSUrl } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes } from '@subwallet/keyring/types';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
+
+/**
+ * NFT detection service
+ * Responsible for managing NFT detection jobs per address
+ */
+
 function mapSdkToNftItem(rawInstance, chain, collectionId, owner) {
   var _rawInstance$token_ty, _rawInstance$token_ty2, _rawInstance$id;
   const metadata = rawInstance.metadata || {};

package/services/open-gov/handler.js

@@ -178,7 +178,6 @@ export default class BaseOpenGovHandler {
       const decimals = Number(_getAssetDecimals(this.nativeToken));
       estimatedFee = new BigN(0.001).multipliedBy(new BigN(10).pow(decimals)); // fallback 0.001
     }
-
     const availableBalance = new BigN(totalBalance.value).minus(estimatedFee);
     if (availableBalance.lte(0)) {
       return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, "You don't have enough tokens to proceed");
@@ -225,7 +224,6 @@ export default class BaseOpenGovHandler {
         estimatedFee = new BigN(0.001 * 10 ** _getAssetDecimals(this.nativeToken)); // fallback 0.001
       }
     }
-
     const availableBalance = new BigN(totalBalance.value).minus(estimatedFee);
     if (availableBalance.lte(0)) {
       return new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE, "You don't have enough tokens to proceed");

package/services/open-gov/interface.js

@@ -18,4 +18,7 @@ export let Conviction;
   Conviction["Locked4x"] = "Locked4x";
   Conviction["Locked5x"] = "Locked5x";
   Conviction["Locked6x"] = "Locked6x";
-})(Conviction || (Conviction = {}));
+})(Conviction || (Conviction = {})); // ----- Casting -----
+// ----- Delegating -----
+// ----- VotingFor -----
+// Unlock Vote

package/services/request-service/handler/CardanoRequestHandler.js

@@ -48,7 +48,6 @@ export default class CardanoRequestHandler {
     if (duplicated) {
       throw new Error('Cardano duplicate request'); // update this message.
     }
-
     confirmationType[id] = {
       id,
       url,

package/services/request-service/handler/EvmRequestHandler.js

@@ -201,7 +201,6 @@ export default class EvmRequestHandler {
       maxPriorityFeePerGas: anyNumberToBN(maxPriorityFeePerGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service
     };
-
     const tx = this.configToTransaction(params);
     await Promise.resolve();
     if (pair.isLocked) {

package/services/request-service/handler/TonRequestHandler.js

@@ -50,7 +50,6 @@ export default class TonRequestHandler {
     if (duplicated) {
       throw new Error('Ton duplicate request'); // update this message.
     }
-
     confirmationType[id] = {
       id,
       url,

package/services/setting-service/constants.js

@@ -29,7 +29,6 @@ export const DEFAULT_NOTIFICATION_SETUP = {
     // isHideAnnouncement: false
   }
 };
-
 export const DEFAULT_ACKNOWLEDGED_MIGRATION_STATUS = false;
 export const DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_PROGRESS = false;
 export const DEFAULT_UNIFIED_ACCOUNT_MIGRATION_IN_DONE = false;

package/services/storage-service/DatabaseService.js

@@ -461,11 +461,9 @@ export default class DatabaseService {
   async setMantaPayData(data) {
     await this._db.mantaPay.put(data); // just override if exist
   }
-
   async updateMantaPayData(key, data) {
     await this._db.mantaPay.update(key, data); // just override if exist
   }
-
   async getMantaPayData(key) {
     return this._db.mantaPay.get({
       key

package/services/storage-service/databases/index.js

@@ -3,6 +3,9 @@
 
 import Dexie from 'dexie';
 export const DEFAULT_DATABASE = 'SubWalletDB_v2';
+
+// TODO: refactor this
+
 export default class KoniDatabase extends Dexie {
   constructor(name = DEFAULT_DATABASE, schemaVersion = 11) {
     super(name);

package/services/swap-service/handler/asset-hub/handler.js

@@ -186,7 +186,6 @@ export class AssetHubSwapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, 1); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return this.swapBaseHandler.validateSwapXcmProcess(params, 1, 2);
     }

package/services/swap-service/handler/asset-hub/router.js

@@ -29,7 +29,6 @@ export class AssetHubRouter {
     //   return [assetFrom, nativeToken, assetTo];
     // }
   }
-
   async earlyValidateSwapValidation(request) {
     const substrateApi = await this.substrateApi.isReady;
     const paths = this.buildPath(request.pair);

package/services/swap-service/handler/chainflip-handler.js

@@ -87,7 +87,6 @@ export class ChainflipSwapHandler {
       // address to which assets are refunded
       retryDurationInBlocks: '100' // 100 blocks * 6 seconds = 10 minutes before deposits are refunded
     };
-
     const path = `/swap?${new URLSearchParams(depositParams).toString()}`;
     const response = await fetchFromProxyService(ProxyServiceRoute.CHAINFLIP, path, {
       method: 'GET'
@@ -255,7 +254,6 @@ export class ChainflipSwapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return [new TransactionError(BasicTxErrorType.INTERNAL_ERROR)];
     }

package/services/swap-service/handler/hydradx-handler.js

@@ -313,7 +313,6 @@ export class HydradxHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, 1); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return this.swapBaseHandler.validateSwapXcmProcess(params, 1, 2);
     }

package/services/swap-service/handler/kyber-handler.js

@@ -344,7 +344,6 @@ export class KyberHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return [new TransactionError(BasicTxErrorType.INTERNAL_ERROR)];
     }

package/services/swap-service/handler/simpleswap-handler.js

@@ -285,7 +285,6 @@ export class SimpleSwapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return [new TransactionError(BasicTxErrorType.INTERNAL_ERROR)];
     }