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

package/services/substrate-proxy-service/index.js

@@ -0,0 +1,159 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
+import { reformatAddress } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
+import { txTypeToSubstrateProxyMap } from "./constant.js";
+export default class SubstrateProxyAccountService {
+  constructor(state) {
+    this.state = state;
+  }
+  getSubstrateApi(chain) {
+    return this.state.getSubstrateApi(chain);
+  }
+
+  // Get proxied accounts for a main account
+  // Get when view details or perform transaction
+  async getSubstrateProxyAccountGroup(request) {
+    var _substrateApi$api$con, _substrateApi$api$con2;
+    const {
+      address,
+      chain,
+      excludedSubstrateProxyAccounts,
+      type
+    } = request;
+    const substrateApi = this.getSubstrateApi(chain);
+    await substrateApi.isReady;
+
+    // Get proxied accounts from on-chain data
+    const result = await substrateApi.api.query.proxy.proxies(address);
+    const baseDeposit = ((_substrateApi$api$con = substrateApi.api.consts.proxy.proxyDepositBase) === null || _substrateApi$api$con === void 0 ? void 0 : _substrateApi$api$con.toString()) || '0';
+    const factorDeposit = ((_substrateApi$api$con2 = substrateApi.api.consts.proxy.proxyDepositFactor) === null || _substrateApi$api$con2 === void 0 ? void 0 : _substrateApi$api$con2.toString()) || '0';
+    const deposit = new BigN(baseDeposit).plus(factorDeposit);
+    const [_substrateProxyAccounts, currentSubstrateProxyDeposit] = result.toPrimitive();
+
+    // Mapping on-chain data to our defined type
+    let substrateProxyAccounts = (_substrateProxyAccounts || []).map(account => {
+      const proxyId = this.state.keyringService.context.belongUnifiedAccount(account.delegate) || reformatAddress(account.delegate);
+      return {
+        substrateProxyAddress: account.delegate,
+        substrateProxyType: account.proxyType,
+        delay: account.delay,
+        proxyId
+      };
+    });
+    if (type) {
+      const allowedSet = new Set([...(txTypeToSubstrateProxyMap[type] || []), 'Any']);
+      substrateProxyAccounts = substrateProxyAccounts.filter(p => allowedSet.has(p.substrateProxyType));
+    }
+    if (excludedSubstrateProxyAccounts && excludedSubstrateProxyAccounts.length > 0) {
+      substrateProxyAccounts = substrateProxyAccounts.filter(p => {
+        return !excludedSubstrateProxyAccounts.some(excluded => excluded.address === p.substrateProxyAddress && excluded.substrateProxyType === p.substrateProxyType);
+      });
+    }
+    const estimateSubstrateProxyDeposit = new BigN(currentSubstrateProxyDeposit).plus(factorDeposit);
+    return {
+      substrateProxyAccounts,
+      substrateProxyDeposit: new BigN(currentSubstrateProxyDeposit).gt(0) ? estimateSubstrateProxyDeposit.toFixed() : deposit.toFixed()
+    };
+  }
+
+  // Linking proxy account with main account
+  async addSubstrateProxyAccounts(data) {
+    const {
+      address,
+      chain,
+      substrateProxyAddress,
+      substrateProxyType
+    } = data;
+    if (address === substrateProxyAddress) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    const substrateApi = this.getSubstrateApi(chain);
+    await substrateApi.isReady;
+
+    // Currently we not support delay time
+    return substrateApi.api.tx.proxy.addProxy(substrateProxyAddress, substrateProxyType, 0);
+  }
+
+  // Validate adding proxy account
+  async validateAddSubstrateProxyAccount(params, signerSubstrateProxyAddress) {
+    var _substrateApi$api$con3, _substrateApi$api$con4, _substrateApi$api$con5, _substrateApi$api$con6;
+    const {
+      address,
+      chain,
+      substrateProxyType
+    } = params;
+    const substrateApi = this.getSubstrateApi(chain);
+    await substrateApi.isReady;
+    const addProxyTx = substrateApi.api.tx.proxy.addProxy;
+    const proxyTypeArg = addProxyTx.meta.args.find(arg => arg.name.toString() === 'proxyType');
+    if (proxyTypeArg) {
+      const typeName = proxyTypeArg.type.toString();
+      const proxyTypeEnum = substrateApi.api.registry.createType(typeName);
+      const variants = proxyTypeEnum.defKeys;
+      if (!variants.includes(substrateProxyType)) {
+        return [new TransactionError(BasicTxErrorType.UNSUPPORTED, 'This proxy type is not supported on the chosen network. Select another one and try again')];
+      }
+    }
+    if (!substrateApi.api.tx.proxy || !substrateApi.api.tx.proxy.addProxy) {
+      return [new TransactionError(BasicTxErrorType.UNSUPPORTED)];
+    }
+
+    // Validate max proxies accounts limit
+    const maxSubstrateProxies = ((_substrateApi$api$con3 = substrateApi.api.consts.proxy.maxProxies) === null || _substrateApi$api$con3 === void 0 ? void 0 : (_substrateApi$api$con4 = _substrateApi$api$con3.toNumber) === null || _substrateApi$api$con4 === void 0 ? void 0 : _substrateApi$api$con4.call(_substrateApi$api$con3)) || 0;
+    const currentProxiesRaw = await substrateApi.api.query.proxy.proxies(address);
+    const [proxyList] = currentProxiesRaw.toPrimitive();
+    if (proxyList.length >= maxSubstrateProxies) {
+      return [new TransactionError(BasicTxErrorType.INVALID_PARAMS, `Maximum number of proxies reached: ${maxSubstrateProxies}`)];
+    }
+
+    // Ensure enough balance for deposit + fee
+    const transferableBalance = await this.state.balanceService.getTransferableBalance(address, chain);
+    const bnTransferableBalance = new BigN(transferableBalance.value);
+    const feeInfo = await substrateApi.api.tx.proxy.addProxy(params.substrateProxyAddress, params.substrateProxyType, 0).paymentInfo(address);
+    const estimatedFee = new BigN(feeInfo.partialFee.toString());
+    const baseDeposit = ((_substrateApi$api$con5 = substrateApi.api.consts.proxy.proxyDepositBase) === null || _substrateApi$api$con5 === void 0 ? void 0 : _substrateApi$api$con5.toString()) || '0';
+    const factorDeposit = ((_substrateApi$api$con6 = substrateApi.api.consts.proxy.proxyDepositFactor) === null || _substrateApi$api$con6 === void 0 ? void 0 : _substrateApi$api$con6.toString()) || '0';
+    const requiredDeposit = proxyList.length === 0 ? new BigN(baseDeposit).plus(factorDeposit) : new BigN(factorDeposit);
+    const totalRequired = new BigN(requiredDeposit).plus(!signerSubstrateProxyAddress ? estimatedFee : 0);
+    if (bnTransferableBalance.lt(totalRequired)) {
+      return [new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE)];
+    }
+    return [];
+  }
+
+  // Removing linked proxy accounts from main account
+  async removeSubstrateProxyAccounts(data) {
+    const {
+      chain,
+      isRemoveAll,
+      selectedSubstrateProxyAccounts
+    } = data;
+    const substrateApi = this.getSubstrateApi(chain);
+    await substrateApi.isReady;
+    const api = substrateApi.api;
+    if (isRemoveAll) {
+      return api.tx.proxy.removeProxies();
+    }
+    if (!selectedSubstrateProxyAccounts.length) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    if (selectedSubstrateProxyAccounts.length === 1) {
+      const {
+        delay,
+        substrateProxyAddress,
+        substrateProxyType
+      } = selectedSubstrateProxyAccounts[0];
+      return api.tx.proxy.removeProxy(substrateProxyAddress, substrateProxyType, delay);
+    }
+    const removeProxies = selectedSubstrateProxyAccounts.map(({
+      delay,
+      substrateProxyAddress,
+      substrateProxyType
+    }) => api.tx.proxy.removeProxy(substrateProxyAddress, substrateProxyType, delay));
+    return api.tx.utility.batchAll(removeProxies);
+  }
+}

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)];
     }

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

@@ -39,7 +39,6 @@ async function fetchCheckApproval(request) {
     if (!output) {
       return undefined; // todo: recheck
     }
-
     chainId = dutchQuote.orderInfo.chainId;
     tokenIn = dutchQuote.orderInfo.input.token;
     tokenOut = output.token;
@@ -60,7 +59,6 @@ async function fetchCheckApproval(request) {
       tokenOutChainId: chainId // swap in-chain
     })
   });
-
   return await response.json();
 }
 export class UniswapHandler {
@@ -802,7 +800,6 @@ export class UniswapHandler {
     if (swap) {
       return this.swapBaseHandler.validateSwapOnlyProcess(params, swapIndex); // todo: create interface for input request
     }
-
     if (swapXcm) {
       return this.swapBaseHandler.validateSwapXcmProcess(params, swapIndex, bridgeIndex);
     }

package/services/transaction-service/event-parser/index.js

@@ -87,10 +87,10 @@ export function parseLiquidStakingEvents(historyItem, eventLogs, inputTokenInfo,
       if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
         var _record$event$data$9;
         if ((_record$event$data$9 = record.event.data[2]) !== null && _record$event$data$9 !== void 0 && _record$event$data$9.toString()) {
-          var _record$event$data$10;
+          var _record$event$data$0;
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           historyItem.fee = {
-            value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
+            value: ((_record$event$data$0 = record.event.data[2]) === null || _record$event$data$0 === void 0 ? void 0 : _record$event$data$0.toString()) || '0',
             symbol: nativeSymbol,
             decimals: nativeDecimals
           };
@@ -109,12 +109,12 @@ export function parseLiquidStakingFastUnstakeEvents(historyItem, eventLogs, chai
     const section = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'tokens' : 'balances';
     const eventMethod = extrinsicType === ExtrinsicType.REDEEM_QDOT ? 'withdrawn' : 'withdraw';
     if (record.event.section === section && record.event.method.toLowerCase() === eventMethod) {
-      var _record$event$data$11;
-      if ((_record$event$data$11 = record.event.data[2]) !== null && _record$event$data$11 !== void 0 && _record$event$data$11.toString()) {
-        var _record$event$data$12;
+      var _record$event$data$1;
+      if ((_record$event$data$1 = record.event.data[2]) !== null && _record$event$data$1 !== void 0 && _record$event$data$1.toString()) {
+        var _record$event$data$10;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         historyItem.fee = {
-          value: ((_record$event$data$12 = record.event.data[2]) === null || _record$event$data$12 === void 0 ? void 0 : _record$event$data$12.toString()) || '0',
+          value: ((_record$event$data$10 = record.event.data[2]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };

package/services/transaction-service/index.js

@@ -15,7 +15,7 @@ import { getBaseTransactionInfo, getTransactionId, isBitcoinTransaction, isCarda
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { BasicTxErrorType, StepStatus, YieldPoolType } from '@subwallet/extension-base/types';
-import { anyNumberToBN, pairToAccount, reformatAddress } from '@subwallet/extension-base/utils';
+import { anyNumberToBN, isSameAddress, pairToAccount, reformatAddress } from '@subwallet/extension-base/utils';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
@@ -120,18 +120,26 @@ export default class TransactionService {
     const isNonNativeTokenPayFee = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug);
     const nonNativeTokenPayFeeInfo = isNonNativeTokenPayFee ? this.state.chainService.getAssetBySlug(tokenPayFeeSlug) : undefined;
     const priceMap = (await this.state.priceService.getPrice()).priceMap;
+
+    // Get signer account
+    let signer = address;
+    const signerSubstrateProxyAddress = transactionInput.signerSubstrateProxyAddress;
     if (!transactionInput.skipFeeRecalculation) {
-      validationResponse.estimateFee = await estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee);
+      validationResponse.estimateFee = await estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee, signerSubstrateProxyAddress);
     }
     const chainInfoMap = this.state.chainService.getChainInfoMap();
+    let substrateProxyAccountNativeTokenAvailable;
+    if (signerSubstrateProxyAddress && !isSameAddress(signerSubstrateProxyAddress, address)) {
+      signer = signerSubstrateProxyAddress;
+      substrateProxyAccountNativeTokenAvailable = await this.state.balanceService.getTransferableBalance(signerSubstrateProxyAddress, chain, nativeTokenInfo.slug, extrinsicType);
+    }
 
     // Check account signing transaction
-
-    checkSigningAccountForTransaction(validationResponse, chainInfoMap);
+    checkSigningAccountForTransaction(validationResponse, chainInfoMap, signer);
     const nativeTokenAvailable = await this.state.balanceService.getBalanceByType(address, chain, nativeTokenInfo.slug, transactionInput.balanceType, extrinsicType);
 
     // Check available balance against transaction fee
-    checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable);
+    checkBalanceWithTransactionFee(validationResponse, transactionInput, nativeTokenInfo, nativeTokenAvailable, substrateProxyAccountNativeTokenAvailable);
 
     // Warnings Ton address if bounceable and not active
     // if (transaction && isTonTransaction(transaction) && tonApi) {
@@ -746,8 +754,10 @@ export default class TransactionService {
       // Will be added in next step
       nonce: nonce !== null && nonce !== void 0 ? nonce : 0,
       startBlock: startBlock || 0,
-      processId: (_transaction$step3 = transaction.step) === null || _transaction$step3 === void 0 ? void 0 : _transaction$step3.processId
+      processId: (_transaction$step3 = transaction.step) === null || _transaction$step3 === void 0 ? void 0 : _transaction$step3.processId,
+      substrateProxyAddresses: []
     };
+    const substrateProxyHistories = [];
     const nativeAsset = _getChainNativeTokenBasicInfo(chainInfo);
     const baseNativeAmount = {
       value: '0',
@@ -1114,6 +1124,55 @@ export default class TransactionService {
           };
           break;
         }
+      case ExtrinsicType.ADD_SUBSTRATE_PROXY_ACCOUNT:
+        {
+          const data = parseTransactionData(transaction.data);
+          const substrateProxyAddress = data.substrateProxyAddress;
+          historyItem.substrateProxyAddresses = [substrateProxyAddress];
+          substrateProxyHistories.push({
+            ...historyItem,
+            substrateProxyAddresses: [substrateProxyAddress]
+          });
+          try {
+            const substrateProxyAccount = keyring.getPair(substrateProxyAddress);
+            if (substrateProxyAccount) {
+              substrateProxyHistories.push({
+                ...historyItem,
+                address: substrateProxyAccount.address,
+                direction: TransactionDirection.RECEIVED,
+                substrateProxyAddresses: [substrateProxyAddress]
+              });
+            }
+          } catch (e) {
+            // skip
+          }
+          break;
+        }
+      case ExtrinsicType.REMOVE_SUBSTRATE_PROXY_ACCOUNT:
+        {
+          const data = parseTransactionData(transaction.data);
+          for (const substrateProxyItem of data.selectedSubstrateProxyAccounts || []) {
+            const substrateProxyAddress = substrateProxyItem.substrateProxyAddress;
+            substrateProxyHistories.push({
+              ...historyItem,
+              substrateProxyAddresses: [substrateProxyAddress]
+            });
+            try {
+              const substrateProxyAccount = keyring.getPair(substrateProxyAddress);
+              if (substrateProxyAccount) {
+                substrateProxyHistories.push({
+                  ...historyItem,
+                  address: substrateProxyAccount.address,
+                  direction: TransactionDirection.RECEIVED,
+                  substrateProxyAddresses: [substrateProxyAddress]
+                });
+              }
+            } catch (e) {
+              // skip
+            }
+          }
+          break;
+        }
       case ExtrinsicType.UNKNOWN:
         break;
     }
@@ -1141,7 +1200,7 @@ export default class TransactionService {
     } catch (e) {
       console.warn(e);
     }
-    return [historyItem];
+    return [historyItem, ...substrateProxyHistories];
   }
   onSigned({
     id
@@ -1721,12 +1780,13 @@ export default class TransactionService {
     });
     return emitter;
   }
-  signAndSendSubstrateTransaction({
+  async signAndSendSubstrateTransaction({
     address,
     chain,
     feeCustom,
     id,
     signAfterCreate,
+    signerSubstrateProxyAddress,
     step,
     tokenPayFeeSlug,
     transaction,
@@ -1743,7 +1803,15 @@ export default class TransactionService {
       extrinsicHash: id,
       processId: step === null || step === void 0 ? void 0 : step.processId
     };
-    const extrinsic = transaction;
+    let extrinsic = transaction;
+    let signer = address;
+    if (signerSubstrateProxyAddress && signerSubstrateProxyAddress !== address) {
+      const substrateApi = this.state.chainService.getSubstrateApi(chain);
+      await substrateApi.isReady;
+      signer = signerSubstrateProxyAddress;
+      extrinsic = substrateApi.api.tx.proxy.proxy(address, null, transaction);
+    }
+
     // const registry = extrinsic.registry;
     // const signedExtensions = registry.signedExtensions;
 
@@ -1753,7 +1821,7 @@ export default class TransactionService {
           const {
             signature,
             signedTransaction
-          } = await this.state.requestService.signInternalTransaction(id, address, url || EXTENSION_REQUEST_URL, payload, signAfterCreate);
+          } = await this.state.requestService.signInternalTransaction(id, signer, url || EXTENSION_REQUEST_URL, payload, signAfterCreate);
           return {
             id: new Date().getTime(),
             signature,
@@ -1775,7 +1843,7 @@ export default class TransactionService {
     //   }
     // }
 
-    extrinsic.signAsync(address, signerOption).then(async rs => {
+    extrinsic.signAsync(signer, signerOption).then(async rs => {
       // Emit signed event
       emitter.emit('signed', eventData);
 

package/services/transaction-service/types.d.ts

@@ -8,7 +8,7 @@ import EventEmitter from 'eventemitter3';
 import { TransactionConfig } from 'web3-core';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { EventRecord } from '@polkadot/types/interfaces';
-export interface SWTransactionBase extends ValidateTransactionResponse, Partial<Pick<BaseRequestSign, 'ignoreWarnings'>>, TransactionFee, SWTransactionEmitter {
+export interface SWTransactionBase extends ValidateTransactionResponse, Partial<Pick<BaseRequestSign, 'ignoreWarnings' | 'signerSubstrateProxyAddress'>>, TransactionFee, SWTransactionEmitter {
     id: string;
     url?: string;
     isInternal: boolean;
@@ -50,7 +50,7 @@ export interface SWTransactionEmitter {
     emitterTransaction?: TransactionEmitter;
 }
 declare type SwInputBase = Pick<SWTransactionBase, 'address' | 'url' | 'data' | 'extrinsicType' | 'chain' | 'chainType' | 'ignoreWarnings' | 'transferNativeAmount'> & Partial<Pick<SWTransactionBase, 'additionalValidator' | 'eventsHandler'>>;
-export interface SWTransactionInput extends SwInputBase, Partial<Pick<SWTransactionBase, 'estimateFee' | 'signAfterCreate' | 'isPassConfirmation' | 'step' | 'errorOnTimeOut' | 'xcmFeeDryRun'>>, TransactionFee {
+export interface SWTransactionInput extends SwInputBase, Partial<Pick<SWTransactionBase, 'estimateFee' | 'signAfterCreate' | 'isPassConfirmation' | 'step' | 'errorOnTimeOut' | 'xcmFeeDryRun' | 'signerSubstrateProxyAddress'>>, TransactionFee {
     id?: string;
     transaction?: SWTransactionBase['transaction'] | null;
     warnings?: SWTransactionBase['warnings'];

package/services/transaction-service/utils.js

@@ -25,6 +25,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('devnet-explorer.mosaicchain.io')) {
     return 'accounts';
   }
+  if (explorerLink.includes('mainnet-gw2.mosaicchain.io')) {
+    return 'accounts';
+  }
   if (explorerLink.includes('statescan.io')) {
     return '#/accounts';
   }
@@ -53,7 +56,7 @@ function getBlockExplorerAccountRoute(explorerLink) {
     return 'account';
   }
   if (explorerLink.includes('node.xode.net')) {
-    return 'account';
+    return 'polkadot/account';
   }
   if (explorerLink.includes('tonviewer.com')) {
     return '';
@@ -82,7 +85,10 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['edgeware', 'commune'].includes(chainInfo.slug)) {
     return 'extrinsics';
   }
-  if (['mosaicTest', 'polkadex'].includes(chainInfo.slug)) {
+  if (['xode'].includes(chainInfo.slug)) {
+    return 'polkadot/extrinsics';
+  }
+  if (['mosaicTest', 'polkadex', 'mosaic'].includes(chainInfo.slug)) {
     return 'transactions';
   }
   const explorerLink = _getBlockExplorerFromChain(chainInfo);
@@ -126,9 +132,6 @@ export function getExplorerLink(chainInfo, value, type) {
     if (chainInfo.slug === 'tangle') {
       return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}extrinsic/${value}${route}/${value}`;
     }
-    if (chainInfo.slug === 'xode') {
-      return `${explorerLink}${explorerLink.endsWith('/') ? '' : '/'}polkadot-chain-transaction?search=${value}`;
-    }
     if (['truth_network', 'aventus'].includes(chainInfo.slug)) {
       // getTransactionId(value)
       //   .then((transactionId) => {

package/services/wallet-connect-service/index.js

@@ -138,6 +138,9 @@ export default class WalletConnectService {
     var _classPrivateFieldLoo;
     return ((_classPrivateFieldLoo = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo === void 0 ? void 0 : _classPrivateFieldLoo.session.values) || [];
   }
+
+  // Remove old listener
+
   getSession(topic) {
     var _classPrivateFieldLoo2;
     const session = (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo2 === void 0 ? void 0 : _classPrivateFieldLoo2.session.get(topic);
@@ -191,7 +194,7 @@ export default class WalletConnectService {
     await ((_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo7 === void 0 ? void 0 : _classPrivateFieldLoo7.respond(response));
   }
   async resetWallet(resetAll) {
-    var _classPrivateFieldLoo8, _classPrivateFieldLoo10, _classPrivateFieldLoo12;
+    var _classPrivateFieldLoo8, _classPrivateFieldLoo0, _classPrivateFieldLoo10;
     _classPrivateFieldLooseBase(this, _removeListener)[_removeListener]();
 
     // Disconnect session
@@ -209,11 +212,11 @@ export default class WalletConnectService {
     }
 
     // Disconnect pair
-    const pairs = ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.pairing.values) || [];
+    const pairs = ((_classPrivateFieldLoo0 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo0 === void 0 ? void 0 : _classPrivateFieldLoo0.pairing.values) || [];
     for (const pair of pairs) {
       try {
-        var _classPrivateFieldLoo11;
-        await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.disconnect({
+        var _classPrivateFieldLoo1;
+        await ((_classPrivateFieldLoo1 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo1 === void 0 ? void 0 : _classPrivateFieldLoo1.disconnect({
           topic: pair.topic,
           reason: getSdkError('USER_DISCONNECTED')
         }));
@@ -221,12 +224,12 @@ export default class WalletConnectService {
         console.error(e);
       }
     }
-    const keys = (await ((_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.core.storage.getKeys())) || [];
+    const keys = (await ((_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo10 === void 0 ? void 0 : _classPrivateFieldLoo10.core.storage.getKeys())) || [];
     const deleteKeys = resetAll ? keys : keys.filter(key => key.startsWith('wc@'));
     for (const key of deleteKeys) {
       try {
-        var _classPrivateFieldLoo13;
-        await ((_classPrivateFieldLoo13 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.core.storage.removeItem(key));
+        var _classPrivateFieldLoo11;
+        await ((_classPrivateFieldLoo11 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo11 === void 0 ? void 0 : _classPrivateFieldLoo11.core.storage.removeItem(key));
       } catch (e) {
         console.error(e);
       }
@@ -235,8 +238,8 @@ export default class WalletConnectService {
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
   async disconnect(topic) {
-    var _classPrivateFieldLoo14;
-    await ((_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.disconnect({
+    var _classPrivateFieldLoo12;
+    await ((_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo12 === void 0 ? void 0 : _classPrivateFieldLoo12.disconnect({
       topic: topic,
       reason: getSdkError('USER_DISCONNECTED')
     }));
@@ -343,18 +346,18 @@ async function _onPingReply2({
   }
 }
 function _createListener2() {
-  var _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20;
-  (_classPrivateFieldLoo15 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_proposal', _classPrivateFieldLooseBase(this, _onSessionProposal)[_onSessionProposal].bind(this));
-  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_request', _classPrivateFieldLooseBase(this, _onSessionRequest)[_onSessionRequest].bind(this));
-  (_classPrivateFieldLoo17 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_ping', _classPrivateFieldLooseBase(this, _onPingReply)[_onPingReply].bind(this));
-  (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_event', data => console.log('event', data));
-  (_classPrivateFieldLoo19 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.on('session_update', data => console.log('update', data));
-  (_classPrivateFieldLoo20 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo20 === void 0 ? void 0 : _classPrivateFieldLoo20.on('session_delete', _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions].bind(this));
+  var _classPrivateFieldLoo13, _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18;
+  (_classPrivateFieldLoo13 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo13 === void 0 ? void 0 : _classPrivateFieldLoo13.on('session_proposal', _classPrivateFieldLooseBase(this, _onSessionProposal)[_onSessionProposal].bind(this));
+  (_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo14 === void 0 ? void 0 : _classPrivateFieldLoo14.on('session_request', _classPrivateFieldLooseBase(this, _onSessionRequest)[_onSessionRequest].bind(this));
+  (_classPrivateFieldLoo15 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo15 === void 0 ? void 0 : _classPrivateFieldLoo15.on('session_ping', _classPrivateFieldLooseBase(this, _onPingReply)[_onPingReply].bind(this));
+  (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo16 === void 0 ? void 0 : _classPrivateFieldLoo16.on('session_event', data => console.log('event', data));
+  (_classPrivateFieldLoo17 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo17 === void 0 ? void 0 : _classPrivateFieldLoo17.on('session_update', data => console.log('update', data));
+  (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo18 === void 0 ? void 0 : _classPrivateFieldLoo18.on('session_delete', _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions].bind(this));
 }
 function _removeListener2() {
   ALL_WALLET_CONNECT_EVENT.forEach(event => {
-    var _classPrivateFieldLoo21;
-    (_classPrivateFieldLoo21 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo21 === void 0 ? void 0 : _classPrivateFieldLoo21.removeAllListeners(event);
+    var _classPrivateFieldLoo19;
+    (_classPrivateFieldLoo19 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo19 === void 0 ? void 0 : _classPrivateFieldLoo19.removeAllListeners(event);
   });
 }
 function _checkClient2() {

package/services/wallet-connect-service/types.js

@@ -17,4 +17,4 @@ export let POLKADOT_SIGNING_METHODS;
 (function (POLKADOT_SIGNING_METHODS) {
   POLKADOT_SIGNING_METHODS["POLKADOT_SIGN_TRANSACTION"] = "polkadot_signTransaction";
   POLKADOT_SIGNING_METHODS["POLKADOT_SIGN_MESSAGE"] = "polkadot_signMessage";
-})(POLKADOT_SIGNING_METHODS || (POLKADOT_SIGNING_METHODS = {}));
+})(POLKADOT_SIGNING_METHODS || (POLKADOT_SIGNING_METHODS = {})); // payload and address

package/types/account/action/add/mnemonic.d.ts

@@ -1,6 +1,6 @@
 import { SeedLengths } from '@subwallet/extension-base/background/types';
 import { KeypairType } from '@subwallet/keyring/types';
-export declare type MnemonicType = 'general' | 'ton';
+export declare type MnemonicType = 'general' | 'trust-wallet' | 'ton';
 /**
  * @interface RequestMnemonicCreateV2
  * @description Represents a request to create a new mnemonic phrase.
@@ -36,6 +36,7 @@ export interface ResponseMnemonicCreateV2 {
  */
 export interface RequestMnemonicValidateV2 {
     mnemonic: string;
+    mnemonicType: MnemonicType;
 }
 /**
  * @interface ResponseMnemonicValidateV2
@@ -67,7 +68,7 @@ export interface RequestAccountCreateSuriV2 {
     name: string;
     password?: string;
     suri: string;
-    type?: KeypairType;
+    types: KeypairType[];
     isAllowed: boolean;
 }
 /**

package/types/account/info/keyring.js

@@ -95,4 +95,12 @@ export let AccountActions;
   AccountActions["EXPORT_JSON"] = "EXPORT_JSON";
   AccountActions["EXPORT_QR"] = "EXPORT_QR";
   AccountActions["TON_CHANGE_WALLET_CONTRACT_VERSION"] = "TON_CHANGE_WALLET_CONTRACT_VERSION";
-})(AccountActions || (AccountActions = {}));
+})(AccountActions || (AccountActions = {}));
+/**
+ * @interface AccountJson
+ * @extends AbstractAddressJson
+ * @extends AccountMetadataData
+ * @extends AccountActionData
+ * @prop {boolean} [isSubWallet] - Import from SubWallet
+ * @prop {boolean} [pendingMigrate] - Pending migrate password
+ * */

package/types/balance/index.js

@@ -18,4 +18,8 @@ export let BalanceType;
   BalanceType["TOTAL"] = "total";
   BalanceType["TOTAL_MINUS_RESERVED"] = "totalMinusReserved";
   BalanceType["KEEP_ALIVE"] = "keepAlive";
-})(BalanceType || (BalanceType = {}));
+})(BalanceType || (BalanceType = {}));
+/** Balance info of all tokens on an address */
+// Key is tokenSlug
+/** Balance info of all addresses */
+// Key is address