@subwallet/extension-base 1.3.22-0 → 1.3.23-0

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

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CardanoChainHandler = void 0;
+var _AbstractChainHandler = require("@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler");
+var _CardanoApi = require("@subwallet/extension-base/services/chain-service/handler/CardanoApi");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class CardanoChainHandler extends _AbstractChainHandler.AbstractChainHandler {
+  cardanoApiMap = {};
+
+  // eslint-disable-next-line no-useless-constructor
+  constructor(parent) {
+    super(parent);
+  }
+  getCardanoApiMap() {
+    return this.cardanoApiMap;
+  }
+  getCardanoApiByChain(chain) {
+    return this.cardanoApiMap[chain];
+  }
+  getApiByChain(chain) {
+    return this.getCardanoApiByChain(chain);
+  }
+  setCardanoApi(chain, cardanoApi) {
+    this.cardanoApiMap[chain] = cardanoApi;
+  }
+  async initApi(chainSlug, apiUrl) {
+    let {
+      isTestnet,
+      onUpdateStatus,
+      providerName
+    } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    const existed = this.getCardanoApiByChain(chainSlug);
+    if (existed) {
+      existed.connect();
+      if (apiUrl !== existed.apiUrl) {
+        existed.updateApiUrl(apiUrl).catch(console.error);
+      }
+      return existed;
+    }
+    const apiObject = new _CardanoApi.CardanoApi(chainSlug, apiUrl, {
+      isTestnet,
+      providerName
+    });
+    apiObject.connectionStatusSubject.subscribe(this.handleConnection.bind(this, chainSlug));
+    apiObject.connectionStatusSubject.subscribe(onUpdateStatus);
+    return Promise.resolve(apiObject);
+  }
+  async recoverApi(chain) {
+    const existed = this.getCardanoApiByChain(chain);
+    if (existed && !existed.isApiReadyOnce) {
+      console.log(`Reconnect ${existed.providerName || existed.chainSlug} at ${existed.apiUrl}`);
+      return existed.recoverConnect();
+    }
+  }
+  destroyCardanoApi(chain) {
+    const cardanoApi = this.getCardanoApiByChain(chain);
+    cardanoApi === null || cardanoApi === void 0 ? void 0 : cardanoApi.destroy().catch(console.error);
+  }
+  async sleep() {
+    this.isSleeping = true;
+    this.cancelAllRecover();
+    await Promise.all(Object.values(this.getCardanoApiMap()).map(cardanoApi => {
+      return cardanoApi.disconnect().catch(console.error);
+    }));
+    return Promise.resolve();
+  }
+  wakeUp() {
+    var _this$parent;
+    this.isSleeping = false;
+    const activeChains = ((_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.getActiveChains()) || [];
+    for (const chain of activeChains) {
+      const cardanoApi = this.getCardanoApiByChain(chain);
+      cardanoApi === null || cardanoApi === void 0 ? void 0 : cardanoApi.connect();
+    }
+    return Promise.resolve();
+  }
+}
+exports.CardanoChainHandler = CardanoChainHandler;

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

@@ -57,10 +57,7 @@ class TonApi {
 
     // Create new provider and api
     this.apiUrl = apiUrl;
-    this.api = new _ton.TonClient({
-      endpoint: this.getJsonRpc(this.apiUrl),
-      apiKey: _consts.TON_CENTER_API_KEY
-    });
+    this.api = this.createProvider(apiUrl);
   }
   async recoverConnect() {
     await this.disconnect();
@@ -163,7 +160,7 @@ class TonApi {
     return await resp.json();
   }
   async getStatusByExtMsgHash(extMsgHash, extrinsicType) {
-    return (0, _utils.retry)(async () => {
+    return (0, _utils.retryTonTxStatus)(async () => {
       var _externalTxInfo$out_m, _externalTxInfo$out_m2;
       // retry many times to get transaction status and transaction hex
       const externalTxInfoRaw = await this.getTxByInMsg(extMsgHash);

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

@@ -8,6 +8,7 @@ exports.filterAssetInfoMap = exports.ChainService = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _CardanoChainHandler = require("@subwallet/extension-base/services/chain-service/handler/CardanoChainHandler");
 var _EvmChainHandler = require("@subwallet/extension-base/services/chain-service/handler/EvmChainHandler");
 var _MantaPrivateHandler = require("@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler");
 var _SubstrateChainHandler = require("@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler");
@@ -82,6 +83,7 @@ class ChainService {
     this.substrateChainHandler = new _SubstrateChainHandler.SubstrateChainHandler(this);
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler(this);
     this.tonChainHandler = new _TonChainHandler.TonChainHandler(this);
+    this.cardanoChainHandler = new _CardanoChainHandler.CardanoChainHandler(this);
     this.logger = (0, _logger.logger)('chain-service');
   }
   get value() {
@@ -157,6 +159,12 @@ class ChainService {
   getTonApiMap() {
     return this.tonChainHandler.getTonApiMap();
   }
+  getCardanoApi(slug) {
+    return this.cardanoChainHandler.getCardanoApiByChain(slug);
+  }
+  getCardanoApiMap() {
+    return this.cardanoChainHandler.getCardanoApiMap();
+  }
   getChainCurrentProviderByKey(slug) {
     const providerName = this.getChainStateByKey(slug).currentProvider;
     const providerMap = this.getChainInfoByKey(slug).providers;
@@ -745,6 +753,15 @@ class ChainService {
       });
       this.tonChainHandler.setTonApi(chainInfo.slug, chainApi);
     }
+    if (chainInfo.cardanoInfo !== null && chainInfo.cardanoInfo !== undefined) {
+      const isTestnet = chainInfo.isTestnet;
+      const chainApi = await this.cardanoChainHandler.initApi(chainInfo.slug, endpoint, {
+        isTestnet,
+        providerName,
+        onUpdateStatus
+      });
+      this.cardanoChainHandler.setCardanoApi(chainInfo.slug, chainApi);
+    }
   }
   destroyApiForChain(chainInfo) {
     if (chainInfo.substrateInfo !== null) {
@@ -756,6 +773,9 @@ class ChainService {
     if (chainInfo.tonInfo !== null) {
       this.tonChainHandler.destroyTonApi(chainInfo.slug);
     }
+    if (chainInfo.cardanoInfo !== null) {
+      this.cardanoChainHandler.destroyCardanoApi(chainInfo.slug);
+    }
   }
   async enableChain(chainSlug) {
     const chainInfo = this.getChainInfoByKey(chainSlug);
@@ -1027,7 +1047,7 @@ class ChainService {
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
           } else {
-            var _storedChainInfo$bitc;
+            var _storedChainInfo$bitc, _storedChainInfo$card;
             mergedChainInfoMap[storedSlug] = {
               slug: storedSlug,
               name: storedChainInfo.name,
@@ -1037,6 +1057,7 @@ class ChainService {
               substrateInfo: storedChainInfo.substrateInfo,
               bitcoinInfo: (_storedChainInfo$bitc = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc !== void 0 ? _storedChainInfo$bitc : null,
               tonInfo: storedChainInfo.tonInfo,
+              cardanoInfo: (_storedChainInfo$card = storedChainInfo.cardanoInfo) !== null && _storedChainInfo$card !== void 0 ? _storedChainInfo$card : null,
               isTestnet: storedChainInfo.isTestnet,
               chainStatus: storedChainInfo.chainStatus,
               icon: storedChainInfo.icon,
@@ -1055,7 +1076,7 @@ class ChainService {
             this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
           }
         } else {
-          var _storedChainInfo$bitc2;
+          var _storedChainInfo$bitc2, _storedChainInfo$card2;
           // added chain from patch
           mergedChainInfoMap[storedSlug] = {
             slug: storedSlug,
@@ -1065,6 +1086,7 @@ class ChainService {
             substrateInfo: storedChainInfo.substrateInfo,
             bitcoinInfo: (_storedChainInfo$bitc2 = storedChainInfo.bitcoinInfo) !== null && _storedChainInfo$bitc2 !== void 0 ? _storedChainInfo$bitc2 : null,
             tonInfo: storedChainInfo.tonInfo,
+            cardanoInfo: (_storedChainInfo$card2 = storedChainInfo.cardanoInfo) !== null && _storedChainInfo$card2 !== void 0 ? _storedChainInfo$card2 : null,
             isTestnet: storedChainInfo.isTestnet,
             chainStatus: storedChainInfo.chainStatus,
             icon: storedChainInfo.icon,
@@ -1236,6 +1258,7 @@ class ChainService {
     let substrateInfo = null;
     let evmInfo = null;
     const tonInfo = null;
+    const cardanoInfo = null;
     if (params.chainSpec.genesisHash !== '') {
       substrateInfo = {
         crowdloanFunds: params.chainSpec.crowdloanFunds || null,
@@ -1274,6 +1297,7 @@ class ChainService {
       evmInfo,
       bitcoinInfo: null,
       tonInfo,
+      cardanoInfo,
       isTestnet: false,
       chainStatus: _types._ChainStatus.ACTIVE,
       icon: '',
@@ -1385,6 +1409,7 @@ class ChainService {
         // TODO: EVM chain might have WS provider
         if (provider.startsWith('http')) {
           // todo: handle validate ton provider
+          // todo: handle validate cardano provider
 
           // HTTP provider is EVM by default
           api = await this.evmChainHandler.initApi('custom', provider);
@@ -1601,15 +1626,12 @@ class ChainService {
   refreshEvmApi(slug) {
     this.evmChainHandler.recoverApi(slug).catch(console.error);
   }
-  refreshTonApi(slug) {
-    this.tonChainHandler.recoverApi(slug).catch(console.error);
-  }
   async stopAllChainApis() {
-    await Promise.all([this.substrateChainHandler.sleep(), this.evmChainHandler.sleep(), this.tonChainHandler.sleep()]);
+    await Promise.all([this.substrateChainHandler.sleep(), this.evmChainHandler.sleep(), this.tonChainHandler.sleep(), this.cardanoChainHandler.sleep()]);
     this.stopCheckLatestChainData();
   }
   async resumeAllChainApis() {
-    await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp(), this.tonChainHandler.wakeUp()]);
+    await Promise.all([this.substrateChainHandler.wakeUp(), this.evmChainHandler.wakeUp(), this.tonChainHandler.wakeUp(), this.cardanoChainHandler.wakeUp()]);
     this.checkLatestData();
   }
   async initAssetSettings() {

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

@@ -12,6 +12,7 @@ var _exportNames = {
   _isPureEvmChain: true,
   _isPureSubstrateChain: true,
   _isPureTonChain: true,
+  _isPureCardanoChain: true,
   _getOriginChainOfAsset: true,
   _getContractAddressOfToken: true,
   _isNativeTokenTransferredByEvm: true,
@@ -19,6 +20,7 @@ var _exportNames = {
   _checkSmartContractSupportByChain: true,
   _isJettonToken: true,
   _isTokenTransferredByTon: true,
+  _isTokenTransferredByCardano: true,
   _getTokenOnChainAssetId: true,
   _getTokenOnChainInfo: true,
   _isBridgedToken: true,
@@ -26,6 +28,7 @@ var _exportNames = {
   _isChainEvmCompatible: true,
   _isChainBitcoinCompatible: true,
   _isChainTonCompatible: true,
+  _isChainCardanoCompatible: true,
   _isNativeToken: true,
   _isNativeTokenBySlug: true,
   _isSmartContractToken: true,
@@ -54,6 +57,7 @@ var _exportNames = {
   _isLocalToken: true,
   _isTokenEvmSmartContract: true,
   _isTokenTonSmartContract: true,
+  _isCIP26Token: true,
   _isTokenWasmSmartContract: true,
   _isAssetSmartContractNft: true,
   _isTokenGearSmartContract: true,
@@ -140,7 +144,9 @@ exports._isAssetHubToken = _isAssetHubToken;
 exports._isAssetSmartContractNft = _isAssetSmartContractNft;
 exports._isAssetValuable = _isAssetValuable;
 exports._isBridgedToken = _isBridgedToken;
+exports._isCIP26Token = _isCIP26Token;
 exports._isChainBitcoinCompatible = _isChainBitcoinCompatible;
+exports._isChainCardanoCompatible = _isChainCardanoCompatible;
 exports._isChainEnabled = _isChainEnabled;
 exports._isChainEvmCompatible = _isChainEvmCompatible;
 exports._isChainSubstrateCompatible = _isChainSubstrateCompatible;
@@ -165,6 +171,7 @@ exports._isMantaZkAsset = _isMantaZkAsset;
 exports._isNativeToken = _isNativeToken;
 exports._isNativeTokenBySlug = _isNativeTokenBySlug;
 exports._isNativeTokenTransferredByEvm = _isNativeTokenTransferredByEvm;
+exports._isPureCardanoChain = _isPureCardanoChain;
 exports._isPureEvmChain = _isPureEvmChain;
 exports._isPureSubstrateChain = _isPureSubstrateChain;
 exports._isPureTonChain = _isPureTonChain;
@@ -176,6 +183,7 @@ exports._isSupportOrdinal = void 0;
 exports._isTokenEvmSmartContract = _isTokenEvmSmartContract;
 exports._isTokenGearSmartContract = _isTokenGearSmartContract;
 exports._isTokenTonSmartContract = _isTokenTonSmartContract;
+exports._isTokenTransferredByCardano = _isTokenTransferredByCardano;
 exports._isTokenTransferredByEvm = _isTokenTransferredByEvm;
 exports._isTokenTransferredByTon = _isTokenTransferredByTon;
 exports._isTokenWasmSmartContract = _isTokenWasmSmartContract;
@@ -248,13 +256,16 @@ function _isEqualSmartContractAsset(asset1, asset2) {
   return false;
 }
 function _isPureEvmChain(chainInfo) {
-  return !!chainInfo.evmInfo && !chainInfo.substrateInfo && !chainInfo.tonInfo;
+  return !!chainInfo.evmInfo && !chainInfo.substrateInfo && !chainInfo.tonInfo && !chainInfo.cardanoInfo;
 }
 function _isPureSubstrateChain(chainInfo) {
-  return !chainInfo.evmInfo && !!chainInfo.substrateInfo && !chainInfo.tonInfo;
+  return !chainInfo.evmInfo && !!chainInfo.substrateInfo && !chainInfo.tonInfo && !chainInfo.cardanoInfo;
 }
 function _isPureTonChain(chainInfo) {
-  return !chainInfo.evmInfo && !chainInfo.substrateInfo && !!chainInfo.tonInfo;
+  return !chainInfo.evmInfo && !chainInfo.substrateInfo && !!chainInfo.tonInfo && !chainInfo.cardanoInfo;
+}
+function _isPureCardanoChain(chainInfo) {
+  return !chainInfo.evmInfo && !chainInfo.substrateInfo && !chainInfo.tonInfo && !!chainInfo.cardanoInfo;
 }
 function _getOriginChainOfAsset(assetSlug) {
   if (assetSlug.startsWith(_types2._CUSTOM_PREFIX)) {
@@ -307,6 +318,9 @@ function _isJettonToken(tokenInfo) {
 function _isTokenTransferredByTon(tokenInfo) {
   return _isJettonToken(tokenInfo) || _isNativeToken(tokenInfo);
 }
+function _isTokenTransferredByCardano(tokenInfo) {
+  return _isCIP26Token(tokenInfo) || _isNativeToken(tokenInfo);
+}
 
 // Utils for balance functions
 function _getTokenOnChainAssetId(tokenInfo) {
@@ -333,6 +347,9 @@ function _isChainBitcoinCompatible(chainInfo) {
 function _isChainTonCompatible(chainInfo) {
   return !!chainInfo.tonInfo;
 }
+function _isChainCardanoCompatible(chainInfo) {
+  return !!chainInfo.cardanoInfo;
+}
 function _isNativeToken(tokenInfo) {
   return tokenInfo.assetType === _types._AssetType.NATIVE;
 }
@@ -453,11 +470,12 @@ function _getTokenTypesSupportedByChain(chainInfo) {
   return result;
 }
 function _getChainNativeTokenBasicInfo(chainInfo) {
+  const defaultTokenInfo = {
+    symbol: '',
+    decimals: -1
+  };
   if (!chainInfo) {
-    return {
-      symbol: '',
-      decimals: -1
-    };
+    return defaultTokenInfo;
   }
   if (chainInfo.substrateInfo) {
     // substrate by default
@@ -475,11 +493,13 @@ function _getChainNativeTokenBasicInfo(chainInfo) {
       symbol: chainInfo.tonInfo.symbol,
       decimals: chainInfo.tonInfo.decimals
     };
+  } else if (chainInfo.cardanoInfo) {
+    return {
+      symbol: chainInfo.cardanoInfo.symbol,
+      decimals: chainInfo.cardanoInfo.decimals
+    };
   }
-  return {
-    symbol: '',
-    decimals: -1
-  };
+  return defaultTokenInfo;
 }
 function _getChainNativeTokenSlug(chainInfo) {
   if (_isCustomChain(chainInfo.slug)) {
@@ -497,6 +517,9 @@ 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);
+}
 function _isTokenWasmSmartContract(tokenInfo) {
   return [_types._AssetType.PSP22, _types._AssetType.PSP34].includes(tokenInfo.assetType);
 }
@@ -585,6 +608,9 @@ function _getBlockExplorerFromChain(chainInfo) {
   if (_isPureEvmChain(chainInfo)) {
     var _chainInfo$evmInfo5;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.blockExplorer;
+  } else if (_isPureCardanoChain(chainInfo)) {
+    var _chainInfo$cardanoInf;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$cardanoInf = chainInfo.cardanoInfo) === null || _chainInfo$cardanoInf === void 0 ? void 0 : _chainInfo$cardanoInf.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;
@@ -756,6 +782,9 @@ const _chainInfoToChainType = chainInfo => {
   if (_isChainTonCompatible(chainInfo)) {
     return _types3.AccountChainType.TON;
   }
+  if (_isChainCardanoCompatible(chainInfo)) {
+    return _types3.AccountChainType.CARDANO;
+  }
   if (_isChainBitcoinCompatible(chainInfo)) {
     return _types3.AccountChainType.BITCOIN;
   }

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

@@ -11,7 +11,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = 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.99'; // update this when build chainlist
+const ChainListVersion = '0.2.101'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

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

@@ -131,7 +131,7 @@ class BifrostMantaLiquidStakingPoolHandler extends _bifrost.default {
     const chainApi = await this.substrateApi.isReady;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
-    const extrinsic = chainApi.api.tx.vtokenMinting.redeem((0, _utils._getTokenOnChainInfo)(derivativeTokenInfo), amount);
+    const extrinsic = chainApi.api.tx.vtokenMinting.redeem(null, (0, _utils._getTokenOnChainInfo)(derivativeTokenInfo), amount);
     return [_KoniTypes.ExtrinsicType.UNSTAKE_VMANTA, extrinsic];
   }
 

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

@@ -296,7 +296,7 @@ class BifrostLiquidStakingPoolHandler extends _base.default {
     const chainApi = await this.substrateApi.isReady;
     const derivativeTokenSlug = this.derivativeAssets[0];
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
-    const extrinsic = chainApi.api.tx.vtokenMinting.redeem((0, _utils._getTokenOnChainInfo)(derivativeTokenInfo), amount);
+    const extrinsic = chainApi.api.tx.vtokenMinting.redeem(null, (0, _utils._getTokenOnChainInfo)(derivativeTokenInfo), amount);
     return [_KoniTypes.ExtrinsicType.UNSTAKE_VDOT, extrinsic];
   }
 

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

@@ -387,10 +387,8 @@ class EarningService {
   async subscribePoolPositions(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
@@ -536,10 +534,8 @@ class EarningService {
   async getPoolReward(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {
@@ -594,10 +590,8 @@ class EarningService {
   async fetchPoolRewardHistory(addresses, callback) {
     let cancel = false;
     await this.eventService.waitChainReady;
-    const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
-    } = (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const activeChains = this.state.activeChainSlugs;
     const unsubList = [];
     for (const handler of Object.values(this.handlers)) {

package/cjs/services/fee-service/service.js

@@ -15,7 +15,8 @@ class FeeService {
   chainFeeSubscriptionMap = {
     evm: {},
     substrate: {},
-    ton: {}
+    ton: {},
+    cardano: {}
   };
   constructor(state) {
     this.state = state;
@@ -109,21 +110,31 @@ class FeeService {
             const api = this.state.getEvmApi(chain);
 
             // TODO: Handle case type === evm and not have api
-            if (type === 'evm' && api) {
-              (0, _utils2.calculateGasFeeParams)(api, chain).then(info => {
-                observer.next(info);
-              }).catch(e => {
-                console.warn(`Cannot get fee param for ${chain}`, e);
+            if (type === 'evm') {
+              if (api) {
+                (0, _utils2.calculateGasFeeParams)(api, chain).then(info => {
+                  observer.next(info);
+                }).catch(e => {
+                  console.warn(`Cannot get fee param for ${chain}`, e);
+                  observer.next({
+                    type: 'evm',
+                    gasPrice: '0',
+                    baseGasFee: undefined,
+                    options: undefined
+                  });
+                });
+              } else {
+                console.warn(`Cannot get fee param for ${chain}`, 'Cannot get api');
                 observer.next({
                   type: 'evm',
                   gasPrice: '0',
                   baseGasFee: undefined,
                   options: undefined
                 });
-              });
+              }
             } else {
               observer.next({
-                type: type,
+                type,
                 busyNetwork: false,
                 options: {
                   slow: {

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

@@ -151,19 +151,17 @@ class HistoryService {
   }
   subscribeHistories(chain, proxyId, cb) {
     const addresses = this.keyringService.context.getDecodedAddresses(proxyId, false);
-    const {
-      evm,
-      substrate
-    } = (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
     const subscription = this.historySubject.subscribe(items => {
       cb(items.filter(filterHistoryItemByAddressAndChain(chain, addresses)));
     });
     const chainInfo = this.chainService.getChainInfoByKey(chain);
     if ((0, _utils._isChainSubstrateCompatible)(chainInfo)) {
       if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
-        this.fetchSubscanTransactionHistory(chain, evm);
+        this.fetchSubscanTransactionHistory(chain, evmAddresses);
       } else {
-        this.fetchSubscanTransactionHistory(chain, substrate);
+        this.fetchSubscanTransactionHistory(chain, substrateAddresses);
       }
     }
     return {

package/cjs/services/inapp-notification-service/index.js

@@ -177,12 +177,17 @@ class InappNotificationService {
   }
   getCategorizedAddresses() {
     const addresses = this.keyringService.context.getAllAddresses();
-    return (0, _utils2.categoryAddresses)(addresses);
+    const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
+    const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
+    return {
+      evmAddresses: evmAddresses,
+      substrateAddresses: substrateAddresses
+    };
   }
   createAvailBridgeClaimNotification() {
     const {
-      evm: evmAddresses,
-      substrate: substrateAddresses
+      evmAddresses,
+      substrateAddresses
     } = this.getCategorizedAddresses();
     const chainAssets = this.chainService.getAssetRegistry();
     let ASSET_TYPE;
@@ -269,7 +274,7 @@ class InappNotificationService {
   // Polygon Claimable Handle
   async createPolygonClaimableTransactions() {
     const {
-      evm: evmAddresses
+      evmAddresses
     } = this.getCategorizedAddresses();
     const etherChains = [_chainList.COMMON_ASSETS.ETH, _chainList.COMMON_ASSETS.ETH_SEPOLIA];
     const polygonAssets = Object.values(this.chainService.getAssetRegistry()).filter(asset => etherChains.includes(asset.slug));
@@ -440,5 +445,8 @@ class InappNotificationService {
   removeAccountNotifications(proxyId) {
     this.dbService.removeAccountNotifications(proxyId).catch(console.error);
   }
+  migrateNotificationProxyId(proxyIds, newProxyId, newName) {
+    this.dbService.updateNotificationProxyId(proxyIds, newProxyId, newName);
+  }
 }
 exports.InappNotificationService = InappNotificationService;

package/cjs/services/keyring-service/context/account-context.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AccountContext = void 0;
+var _Migration = require("@subwallet/extension-base/services/keyring-service/context/handlers/Migration");
 var _handlers = require("./handlers");
 var _state = require("./state");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -21,6 +22,7 @@ class AccountContext {
     this.ledgerHandler = new _handlers.AccountLedgerHandler(this.parentService, this.state);
     this.modifyHandler = new _handlers.AccountModifyHandler(this.parentService, this.state);
     this.secretHandler = new _handlers.AccountSecretHandler(this.parentService, this.state);
+    this.migrationHandler = new _Migration.AccountMigrationHandler(this.parentService, this.state);
   }
 
   // TODO: Merge to value
@@ -230,8 +232,8 @@ class AccountContext {
   }
 
   /* Derive account proxy  */
-  derivationAccountProxyCreate(request) {
-    return this.deriveHandler.derivationAccountProxyCreate(request);
+  derivationAccountProxyCreate(request, isMigration) {
+    return this.deriveHandler.derivationAccountProxyCreate(request, isMigration);
   }
 
   /* Derive */
@@ -247,6 +249,19 @@ class AccountContext {
 
   /* Inject */
 
+  /* Migration */
+  async migrateUnifiedAndFetchEligibleSoloAccounts(request, setMigratingModeFn) {
+    return await this.migrationHandler.migrateUnifiedAndFetchEligibleSoloAccounts(request, setMigratingModeFn);
+  }
+  migrateSoloAccount(request) {
+    return this.migrationHandler.migrateSoloToUnifiedAccount(request);
+  }
+  pingSession(request) {
+    return this.migrationHandler.pingSession(request);
+  }
+
+  /* Migration */
+
   /* Others */
 
   removeNoneHardwareGenesisHash() {

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'];
+const validDeriveKeypairTypes = [..._types2.SubstrateKeypairTypes, ..._types2.EthereumKeypairTypes, 'ton', 'cardano'];
 
 /**
  * @class AccountDeriveHandler
@@ -220,6 +220,7 @@ class AccountDeriveHandler extends _Base.AccountBaseHandler {
    * Derive account proxy
    *  */
   derivationAccountProxyCreate(request) {
+    let isMigration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       name,
       proxyId: deriveId,
@@ -230,7 +231,7 @@ class AccountDeriveHandler extends _Base.AccountBaseHandler {
     const rootId = this.state.value.accounts[parentProxyId].parentId || parentProxyId;
     const rootProxyId = this.state.belongUnifiedAccount(rootId) || rootId;
     const nameExists = this.state.checkNameExists(name);
-    if (nameExists) {
+    if (nameExists && !isMigration) {
       throw new _types.SWCommonAccountError(_types.CommonAccountErrorType.ACCOUNT_NAME_EXISTED);
     }
     const validateRs = this.validateDerivePath({
@@ -354,11 +355,13 @@ class AccountDeriveHandler extends _Base.AccountBaseHandler {
     }
     const addresses = pairs.map(pair => pair.address);
     const exists = this.state.checkAddressExists(addresses);
-    (0, _util.assert)(!exists, (0, _i18next.t)('Account already exists under the name "{{name}}"', {
-      replace: {
-        name: (exists === null || exists === void 0 ? void 0 : exists.name) || (exists === null || exists === void 0 ? void 0 : exists.address) || ''
-      }
-    }));
+    if (!isMigration) {
+      (0, _util.assert)(!exists, (0, _i18next.t)('Account already exists under the name "{{name}}"', {
+        replace: {
+          name: (exists === null || exists === void 0 ? void 0 : exists.name) || (exists === null || exists === void 0 ? void 0 : exists.address) || ''
+        }
+      }));
+    }
     childAccountProxy && this.state.upsertAccountProxyByKey(childAccountProxy);
     this.state.upsertModifyPairs(modifyPairs);
     for (const childPair of pairs) {