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

package/cjs/koni/background/handlers/Extension.js

@@ -27,7 +27,9 @@ var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/bonding/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
 var _utils2 = require("@subwallet/extension-base/koni/api/yield/helper/utils");
+var _consts = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/consts");
 var _utils3 = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils");
+var _cardanoTransfer = require("@subwallet/extension-base/services/balance-service/transfer/cardano-transfer");
 var _smartContract = require("@subwallet/extension-base/services/balance-service/transfer/smart-contract");
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _tonTransfer = require("@subwallet/extension-base/services/balance-service/transfer/ton-transfer");
@@ -39,27 +41,27 @@ var _constants2 = require("@subwallet/extension-base/services/chain-service/cons
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _utils4 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils5 = require("@subwallet/extension-base/services/fee-service/utils");
+var _tokenPayFee = require("@subwallet/extension-base/services/fee-service/utils/tokenPayFee");
 var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants4 = require("@subwallet/extension-base/services/setting-service/constants");
-var _utils6 = require("@subwallet/extension-base/services/swap-service/handler/asset-hub/utils");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _storage = require("@subwallet/extension-base/storage");
 var _stores = require("@subwallet/extension-base/stores");
 var _types3 = require("@subwallet/extension-base/types");
-var _utils7 = require("@subwallet/extension-base/utils");
+var _utils6 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
 var _types4 = require("@subwallet/keyring/types");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils8 = require("@walletconnect/utils");
+var _utils7 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _types5 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
-var _utils9 = require("../utils");
+var _utils8 = require("../utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -274,7 +276,7 @@ class KoniExtension {
     const accounts = keyringService.context.accounts;
     const transformedAccounts = Object.values(accounts);
     const responseData = {
-      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
+      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils6.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
       currentAccountProxy: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId
     };
     const accountProxyMapObservable = keyringService.context.observable.accounts;
@@ -288,7 +290,7 @@ class KoniExtension {
         currentAccount
       } = _ref7;
       const transformedAccounts = Object.values(accountProxies);
-      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
+      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils6.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
       console.debug('subscriptionAccountGroups', responseData);
       cb(responseData);
@@ -309,10 +311,10 @@ class KoniExtension {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
-      const contacts = (0, _utils7.transformAddresses)(_contacts);
+      const contacts = (0, _utils6.transformAddresses)(_contacts);
       const chainInfo = chainInfoMap[chain];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await (0, _utils7._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
+      const rs = await (0, _utils6._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -352,7 +354,7 @@ class KoniExtension {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     let old = '';
     const subscription = this.#koniState.keyringService.context.observable.contacts.subscribe(subjectInfo => {
-      const addresses = (0, _utils7.transformAddresses)(subjectInfo);
+      const addresses = (0, _utils6.transformAddresses)(subjectInfo);
       const _new = JSON.stringify(addresses);
       if (old !== _new) {
         _cb({
@@ -369,7 +371,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.context.contacts;
     return {
-      addresses: (0, _utils7.transformAccounts)(subjectInfo)
+      addresses: (0, _utils6.transformAccounts)(subjectInfo)
     };
   }
 
@@ -382,7 +384,7 @@ class KoniExtension {
       chain
     } = _ref9;
     if ((0, _keyring.isAddress)(accountId)) {
-      const address = (0, _utils7.reformatAddress)(accountId);
+      const address = (0, _utils6.reformatAddress)(accountId);
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address, 'address');
       if (account) {
@@ -428,7 +430,7 @@ class KoniExtension {
       meta
     } = _ref10;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils7.reformatAddress)(address);
+      const _address = (0, _utils6.reformatAddress)(address);
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
@@ -444,7 +446,7 @@ class KoniExtension {
       address
     } = _ref11;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils7.reformatAddress)(address);
+      const _address = (0, _utils6.reformatAddress)(address);
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
@@ -573,7 +575,7 @@ class KoniExtension {
   }
   getPairs() {
     const storedAccounts = this.#koniState.keyringService.context.pairs;
-    return (0, _utils7.transformAccounts)(storedAccounts);
+    return (0, _utils6.transformAccounts)(storedAccounts);
   }
   isAddressValidWithAuthType(address, accountAuthTypes) {
     const type = (0, _keyring.getKeypairTypeByAddress)(address);
@@ -816,31 +818,49 @@ class KoniExtension {
     this.#koniState.updateSetting('notificationSetup', request);
     return true;
   }
-  setShowZeroBalance(_ref22) {
+  saveMigrationAcknowledgedStatus(_ref22) {
     let {
-      show
+      isAcknowledgedUnifiedAccountMigration
     } = _ref22;
+    this.#koniState.updateSetting('isAcknowledgedUnifiedAccountMigration', isAcknowledgedUnifiedAccountMigration);
+    return true;
+  }
+  saveUnifiedAccountMigrationInProgress(_ref23) {
+    let {
+      isUnifiedAccountMigrationInProgress
+    } = _ref23;
+    this.#koniState.updateSetting('isUnifiedAccountMigrationInProgress', isUnifiedAccountMigrationInProgress);
+    return true;
+  }
+  pingUnifiedAccountMigrationDone() {
+    this.#koniState.updateSetting('isUnifiedAccountMigrationInProgress', false);
+    return true;
+  }
+  setShowZeroBalance(_ref24) {
+    let {
+      show
+    } = _ref24;
     this.#koniState.updateSetting('isShowZeroBalance', show);
     return true;
   }
-  setLanguage(_ref23) {
+  setLanguage(_ref25) {
     let {
       language
-    } = _ref23;
+    } = _ref25;
     this.#koniState.updateSetting('language', language);
     return true;
   }
-  setShowBalance(_ref24) {
+  setShowBalance(_ref26) {
     let {
       enable
-    } = _ref24;
+    } = _ref26;
     this.#koniState.updateSetting('isShowBalance', enable);
     return true;
   }
-  setAllowOneSign(_ref25) {
+  setAllowOneSign(_ref27) {
     let {
       allowOneSign
-    } = _ref25;
+    } = _ref27;
     this.#koniState.updateSetting('allowOneSign', allowOneSign);
     return true;
   }
@@ -889,10 +909,10 @@ class KoniExtension {
   async getPrice() {
     return this.#koniState.priceService.getPrice();
   }
-  async setPriceCurrency(_ref26) {
+  async setPriceCurrency(_ref28) {
     let {
       currency
-    } = _ref26;
+    } = _ref28;
     return await this.#koniState.priceService.setPriceCurrency(currency);
   }
   subscribePrice(id, port) {
@@ -1089,7 +1109,7 @@ class KoniExtension {
       const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address))));
+      cb(histories.filter(item => addresses.some(address => (0, _utils6.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -1098,13 +1118,13 @@ class KoniExtension {
     const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address)));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils6.isSameAddress)(item.address, address)));
   }
-  subscribeHistoryByChainAndAddress(_ref27, id, port) {
+  subscribeHistoryByChainAndAddress(_ref29, id, port) {
     let {
       address,
       chain
-    } = _ref27;
+    } = _ref29;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscribeHistoriesResponse = this.#koniState.historyService.subscribeHistories(chain, address, cb);
     this.createUnsubscriptionHandle(id, subscribeHistoriesResponse.unsubscribe);
@@ -1154,8 +1174,8 @@ class KoniExtension {
       feeCustom,
       feeOption,
       from,
-      nonNativeTokenPayFeeSlug,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1168,7 +1188,9 @@ class KoniExtension {
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(chain);
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
-    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && nonNativeTokenPayFeeSlug === tokenSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
+    const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
+    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
     const extrinsicType = isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN;
     let chainType = _KoniTypes.ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1234,9 +1256,23 @@ class KoniExtension {
           // currently not used
           tonApi
         });
+      } else if ((0, _keyring.isCardanoAddress)(from) && (0, _keyring.isCardanoAddress)(to) && (0, _utils4._isTokenTransferredByCardano)(transferTokenInfo)) {
+        chainType = _KoniTypes.ChainType.CARDANO;
+        const cardanoApi = this.#koniState.getCardanoApi(chain);
+        [transaction, transferAmount.value] = await (0, _cardanoTransfer.createCardanoTransaction)({
+          tokenInfo: transferTokenInfo,
+          from,
+          to,
+          networkKey: chain,
+          value: value || '0',
+          cardanoTtlOffset: _consts.DEFAULT_CARDANO_TTL_OFFSET,
+          transferAll: !!transferAll,
+          cardanoApi,
+          nativeTokenInfo
+        });
       } else {
         const substrateApi = this.#koniState.getSubstrateApi(chain);
-        [transaction, transferAmount.value] = await (0, _token.createTransferExtrinsic)({
+        [transaction, transferAmount.value] = await (0, _token.createSubstrateExtrinsic)({
           transferAll: !!transferAll,
           value: value || '0',
           from: from,
@@ -1245,6 +1281,13 @@ class KoniExtension {
           to: to,
           substrateApi
         });
+        if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain)) {
+          var _this$koniState$chain, _substrateApi$api$que;
+          const hydrationFeeAssetId = tokenPayFeeSlug && ((_this$koniState$chain = this.#koniState.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$koniState$chain === void 0 ? void 0 : _this$koniState$chain.assetId);
+          const _feeSetting = await ((_substrateApi$api$que = substrateApi.api.query.multiTransactionPayment) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.accountCurrencyMap(from));
+          const feeSetting = _feeSetting.toPrimitive();
+          transaction = (0, _tokenPayFee.batchExtrinsicSetFeeHydration)(substrateApi, transaction, feeSetting, hydrationFeeAssetId);
+        }
       }
     } catch (e) {
       const error = e;
@@ -1262,11 +1305,11 @@ class KoniExtension {
       }
 
       // Check enough free local to pay fee local
-      if (nonNativeTokenPayFeeSlug) {
-        var _inputTransaction$est;
+      if (isCustomTokenPayFeeAssetHub || isCustomTokenPayFeeHydration) {
+        var _inputTransaction$est, _nonNativeTokenPayFee;
         const nonNativeFee = BigInt(((_inputTransaction$est = inputTransaction.estimateFee) === null || _inputTransaction$est === void 0 ? void 0 : _inputTransaction$est.value) || '0'); // todo: estimateFee should be must-have, need to refactor interface
-        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils7.reformatAddress)(from), chain, nonNativeTokenPayFeeSlug);
-        const nonNativeTokenPayFeeBalance = BigInt(nonNativeTokenPayFeeInfo[nonNativeTokenPayFeeSlug].free);
+        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils6.reformatAddress)(from), chain, tokenPayFeeSlug);
+        const nonNativeTokenPayFeeBalance = BigInt(((_nonNativeTokenPayFee = nonNativeTokenPayFeeInfo[tokenPayFeeSlug]) === null || _nonNativeTokenPayFee === void 0 ? void 0 : _nonNativeTokenPayFee.free) || '0');
         if (nonNativeFee > nonNativeTokenPayFeeBalance) {
           inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.NOT_ENOUGH_BALANCE));
         }
@@ -1318,7 +1361,7 @@ class KoniExtension {
       chain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       chainType,
       transferNativeAmount,
       transaction,
@@ -1338,9 +1381,9 @@ class KoniExtension {
       feeOption,
       from,
       isPassConfirmation,
-      nonNativeTokenPayFeeSlug,
       originNetworkKey,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1360,7 +1403,7 @@ class KoniExtension {
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(originNetworkKey, destinationNetworkKey);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
-    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === nonNativeTokenPayFeeSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
@@ -1400,6 +1443,14 @@ class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
+      if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(originNetworkKey)) {
+        var _this$koniState$chain2, _substrateApi$api$que2;
+        const hydrationFeeAssetId = tokenPayFeeSlug && ((_this$koniState$chain2 = this.#koniState.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$koniState$chain2 === void 0 ? void 0 : _this$koniState$chain2.assetId);
+        const _feeSetting = await ((_substrateApi$api$que2 = substrateApi.api.query.multiTransactionPayment) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.accountCurrencyMap(from));
+        const feeSetting = _feeSetting.toPrimitive();
+        const _extrinsic = extrinsic;
+        extrinsic = (0, _tokenPayFee.batchExtrinsicSetFeeHydration)(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
+      }
       additionalValidator = async inputTransaction => {
         const {
           value: senderTransferable
@@ -1458,7 +1509,7 @@ class KoniExtension {
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
       transferNativeAmount: (0, _utils4._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       isTransferAll: transferAll,
       isTransferLocalTokenAndPayThatTokenAsFee,
       isPassConfirmation,
@@ -1476,49 +1527,52 @@ class KoniExtension {
     } = request;
     const chainService = this.#koniState.chainService;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
-    const address = (0, _utils7.reformatAddress)(_address);
-
-    // ensure nativeTokenInfo and localTokenInfo have multi-location metadata beforehand to improve performance.
+    const address = (0, _utils6.reformatAddress)(_address);
     const tokensHasBalanceInfoMap = await this.#koniState.balanceService.getTokensHasBalance(address, chain);
-    const tokensHasBalanceSlug = Object.keys(tokensHasBalanceInfoMap);
-    const tokenInfos = tokensHasBalanceSlug.map(tokenSlug => chainService.getAssetBySlug(tokenSlug)).filter(token => token.originChain === chain && token.assetType !== _types._AssetType.NATIVE && token.metadata && token.metadata.multilocation);
     const nativeTokenInfo = chainService.getNativeTokenInfo(chain);
-    const nativeTokenBalanceInfo = {
+    const nativeBalanceInfo = {
       slug: nativeTokenInfo.slug,
       free: ((_tokensHasBalanceInfo = tokensHasBalanceInfoMap[nativeTokenInfo.slug]) === null || _tokensHasBalanceInfo === void 0 ? void 0 : _tokensHasBalanceInfo.free) || '0',
       rate: '1'
     };
-    const tokensCanPayFee = [nativeTokenBalanceInfo];
-    if (!_constants.ASSET_HUB_CHAIN_SLUGS.includes(chain) || !nativeTokenInfo.metadata || !nativeTokenInfo.metadata.multilocation) {
-      return tokensCanPayFee;
-    }
-    await Promise.all(tokenInfos.map(async tokenInfo => {
-      try {
-        const tokenSlug = tokenInfo.slug;
-        const reserve = await (0, _utils6.getReserveForPool)(substrateApi.api, nativeTokenInfo, tokenInfo);
-        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-          return;
-        }
-        const rate = new _bignumber.default(reserve[1]).div(reserve[0]).toFixed();
-        const tokenCanPayFee = {
-          slug: tokenSlug,
-          free: tokensHasBalanceInfoMap[tokenSlug].free,
-          rate
-        };
-        if (feeAmount === undefined) {
-          tokensCanPayFee.push(tokenCanPayFee);
-        } else {
-          const amount = (0, _utils6.estimateTokensForPool)(feeAmount, reserve);
-          const liquidityError = (0, _utils6.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
-          if (!liquidityError) {
-            tokensCanPayFee.push(tokenCanPayFee);
-          }
+    let tokensCanPayFee = [nativeBalanceInfo];
+    let defaultTokenSlug = nativeBalanceInfo.slug;
+    if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain)) {
+      tokensCanPayFee = await (0, _tokenPayFee.getAssetHubTokensCanPayFee)({
+        substrateApi,
+        chainService,
+        nativeTokenInfo,
+        nativeBalanceInfo,
+        tokensHasBalanceInfoMap,
+        feeAmount
+      });
+    } else if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain)) {
+      const _assetId = await substrateApi.api.query.multiTransactionPayment.accountCurrencyMap(address);
+      const assetId = _assetId.toPrimitive();
+      const hydrationAssets = this.#koniState.chainService.getHydrationAssetIdMap(chain);
+      for (const [key, value] of Object.entries(hydrationAssets)) {
+        if (assetId && assetId.toString() === value) {
+          defaultTokenSlug = key;
+          break;
         }
-      } catch (e) {
-        console.error('error when fetching pool with token', tokenInfo.slug, e);
       }
-    }));
-    return tokensCanPayFee;
+      tokensCanPayFee = await (0, _tokenPayFee.getHydrationTokensCanPayFee)({
+        substrateApi,
+        chainService,
+        nativeTokenInfo,
+        nativeBalanceInfo,
+        tokensHasBalanceInfoMap,
+        address,
+        feeAmount
+      });
+      if (!tokensCanPayFee.map(token => token.slug).includes(defaultTokenSlug)) {
+        defaultTokenSlug = nativeBalanceInfo.slug;
+      }
+    }
+    return {
+      tokensCanPayFee,
+      defaultTokenSlug
+    };
   }
   async getAmountForPair(request) {
     const {
@@ -1583,21 +1637,21 @@ class KoniExtension {
   disableChain(networkKey) {
     return this.#koniState.disableChain(networkKey);
   }
-  async enableChain(_ref28) {
+  async enableChain(_ref30) {
     let {
       chainSlug,
       enableTokens
-    } = _ref28;
+    } = _ref30;
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
   async reconnectChain(chainSlug) {
     return this.#koniState.chainService.reconnectChain(chainSlug);
   }
-  async validateNetwork(_ref29) {
+  async validateNetwork(_ref31) {
     let {
       existedChainSlug,
       provider
-    } = _ref29;
+    } = _ref31;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1688,13 +1742,13 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressTransferableBalance(_ref30) {
+  async getAddressTransferableBalance(_ref32) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref30;
+    } = _ref32;
     if (token && _constants2._MANTA_ZK_CHAIN_GROUP.includes(networkKey)) {
       const tokenInfo = this.#koniState.chainService.getAssetBySlug(token);
       if (tokenInfo.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
@@ -1703,13 +1757,13 @@ class KoniExtension {
     }
     return await this.#koniState.balanceService.getTransferableBalance(address, networkKey, token, extrinsicType);
   }
-  async getAddressTotalBalance(_ref31) {
+  async getAddressTotalBalance(_ref33) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref31;
+    } = _ref33;
     return await this.#koniState.balanceService.getTotalBalance(address, networkKey, token, extrinsicType);
   }
   async subscribeMaxTransferable(request, id, port) {
@@ -1719,13 +1773,13 @@ class KoniExtension {
       destChain: _destChain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
-      token
+      token,
+      tokenPayFeeSlug
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
-    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils4._isNativeToken)(transferTokenInfo) && !!nonNativeTokenPayFeeSlug && nonNativeTokenPayFeeSlug === token;
-    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils4._isNativeToken)(transferTokenInfo) && !!nonNativeTokenPayFeeSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils4._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
+    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils4._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug);
     const srcToken = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(chain);
     const destToken = _destChain !== chain ? this.#koniState.getXcmEqualAssetByChain(_destChain, srcToken.slug) : srcToken;
     const srcChain = this.#koniState.chainService.getChainInfoByKey(chain);
@@ -1734,12 +1788,13 @@ class KoniExtension {
     const extrinsicType = srcChain.slug !== destChain.slug ? _KoniTypes.ExtrinsicType.TRANSFER_XCM : _KoniTypes.ExtrinsicType.TRANSFER_BALANCE;
     const freeBalanceSubject = new _rxjs.Subject();
     const feeSubject = new _rxjs.Subject();
-    const feeChainType = (0, _utils7.detectTransferTxType)(srcToken, srcChain, destChain);
+    const feeChainType = (0, _utils6.detectTransferTxType)(srcToken, srcChain, destChain);
     if (!destToken) {
       throw new Error('Destination token not found');
     }
     const _request = {
       address: address,
+      cardanoApi: this.#koniState.chainService.getCardanoApi(chain),
       destChain,
       destToken,
       evmApi: this.#koniState.chainService.getEvmApi(chain),
@@ -1757,12 +1812,12 @@ class KoniExtension {
       freeBalance: freeBalanceSubject,
       fee: feeSubject
     }).subscribe({
-      next: _ref32 => {
+      next: _ref34 => {
         let {
           fee,
           freeBalance
-        } = _ref32;
-        (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
+        } = _ref34;
+        (0, _utils6.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
     const [unsubBalance, freeBalance] = await (async () => {
@@ -1793,15 +1848,15 @@ class KoniExtension {
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee);
+    return (0, _utils6.calculateMaxTransferable)(id, _request, freeBalance, fee);
   }
-  async subscribeAddressTransferableBalance(_ref33, id, port) {
+  async subscribeAddressTransferableBalance(_ref35, id, port) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref33;
+    } = _ref35;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const convertData = data => {
       return {
@@ -1852,11 +1907,11 @@ class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(_ref34) {
+  async enableChains(_ref36) {
     let {
       chainSlugs,
       enableTokens
-    } = _ref34;
+    } = _ref36;
     try {
       await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
         chainSlug,
@@ -1940,12 +1995,24 @@ class KoniExtension {
     });
     return this.#koniState.getConfirmationsQueueSubjectTon().getValue();
   }
+  subscribeConfirmationsCardano(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.getConfirmationsQueueSubjectCardano().subscribe(cb);
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.getConfirmationsQueueSubjectCardano().getValue();
+  }
   async completeConfirmation(request) {
     return await this.#koniState.completeConfirmation(request);
   }
   async completeConfirmationTon(request) {
     return await this.#koniState.completeConfirmationTon(request);
   }
+  async completeConfirmationCardano(request) {
+    return await this.#koniState.completeConfirmationCardano(request);
+  }
 
   /// Sign Qr
 
@@ -1977,30 +2044,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref35) {
+  parseSubstrateTransaction(_ref37) {
     let {
       data,
       networkKey
-    } = _ref35;
+    } = _ref37;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref36) {
+  async parseEVMRLP(_ref38) {
     let {
       data
-    } = _ref36;
+    } = _ref38;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref37) {
+  qrSignSubstrate(_ref39) {
     let {
       address,
       data,
       networkKey
-    } = _ref37;
+    } = _ref39;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     if (pair.isLocked) {
@@ -2017,13 +2084,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref38) {
+  async qrSignEVM(_ref40) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref38;
+    } = _ref40;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2046,7 +2113,7 @@ class KoniExtension {
       signed = await pair.evm.signMessage(data, 'personal_sign');
     } else {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
-      const tx = (0, _utils7.createTransactionFromRLP)(message);
+      const tx = (0, _utils6.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
@@ -2071,7 +2138,7 @@ class KoniExtension {
         common
       });
       const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evm.signTransaction(transaction)));
-      signed = (0, _utils7.signatureToHex)({
+      signed = (0, _utils6.signatureToHex)({
         r: ((_signedTranaction$r = signedTranaction.r) === null || _signedTranaction$r === void 0 ? void 0 : _signedTranaction$r.toString(16)) || '',
         s: ((_signedTranaction$s = signedTranaction.s) === null || _signedTranaction$s === void 0 ? void 0 : _signedTranaction$s.toString(16)) || '',
         v: ((_signedTranaction$v = signedTranaction.v) === null || _signedTranaction$v === void 0 ? void 0 : _signedTranaction$v.toString(16)) || ''
@@ -2107,11 +2174,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref39) {
+  async getBondingOptions(_ref41) {
     let {
       chain,
       type
-    } = _ref39;
+    } = _ref41;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2301,12 +2368,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref40) {
+  async parseContractInput(_ref42) {
     let {
       chainId,
       contract,
       data
-    } = _ref40;
+    } = _ref42;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2406,10 +2473,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref41) {
+  keyringUnlock(_ref43) {
     let {
       password
-    } = _ref41;
+    } = _ref43;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
       // this.#koniState.initMantaPay(password)
@@ -2440,11 +2507,11 @@ class KoniExtension {
 
   // Export mnemonic
 
-  keyringExportMnemonic(_ref42) {
+  keyringExportMnemonic(_ref44) {
     let {
       address,
       password
-    } = _ref42;
+    } = _ref44;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2454,10 +2521,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref43) {
+  async resetWallet(_ref45) {
     let {
       resetAll
-    } = _ref43;
+    } = _ref45;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2473,10 +2540,10 @@ class KoniExtension {
   }
 
   // Signing substrate request
-  async signingApprovePasswordV2(_ref44) {
+  async signingApprovePasswordV2(_ref46) {
     let {
       id
-    } = _ref44;
+    } = _ref46;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
@@ -2505,11 +2572,11 @@ class KoniExtension {
     let registry = new _types5.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      const allRegistry = [(0, _utils9.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils9.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils9.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
+      const allRegistry = [(0, _utils8.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils8.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils8.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
       if (allRegistry.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = (0, _utils9.getSuitableRegistry)(allRegistry, payload);
+        registry = (0, _utils8.getSuitableRegistry)(allRegistry, payload);
       }
     }
     const result = request.sign(registry, pair);
@@ -2634,10 +2701,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref45) {
+  getTransaction(_ref47) {
     let {
       id
-    } = _ref45;
+    } = _ref47;
     const {
       transaction,
       ...transactionResult
@@ -2647,8 +2714,8 @@ class KoniExtension {
   async subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs, processMap) {
-      return Object.fromEntries(Object.entries(rs).map(_ref46 => {
-        let [key, value] = _ref46;
+      return Object.fromEntries(Object.entries(rs).map(_ref48 => {
+        let [key, value] = _ref48;
         const {
           additionalValidator,
           eventsHandler,
@@ -2672,11 +2739,11 @@ class KoniExtension {
     const subscription = (0, _rxjs.combineLatest)({
       transactions: transactionsObservable,
       processMap: processTransactionObservable
-    }).subscribe(_ref47 => {
+    }).subscribe(_ref49 => {
       let {
         processMap,
         transactions
-      } = _ref47;
+      } = _ref49;
       cb(convertRs(transactions, processMap));
     });
     port.onDisconnect.addListener(() => {
@@ -2697,10 +2764,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref48) {
+  async reloadCron(_ref50) {
     let {
       data
-    } = _ref48;
+    } = _ref50;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -2743,10 +2810,10 @@ class KoniExtension {
   }
 
   // Phishing detect
-  async passPhishingPage(_ref49) {
+  async passPhishingPage(_ref51) {
     let {
       url
-    } = _ref49;
+    } = _ref51;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
@@ -2767,10 +2834,10 @@ class KoniExtension {
   /// Wallet connect
 
   // Connect
-  async connectWalletConnect(_ref50) {
+  async connectWalletConnect(_ref52) {
     let {
       uri
-    } = _ref50;
+    } = _ref52;
     await this.#koniState.walletConnectService.connect(uri);
     return true;
   }
@@ -2783,11 +2850,11 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allConnectWCRequests;
   }
-  async approveWalletConnectSession(_ref51) {
+  async approveWalletConnectSession(_ref53) {
     let {
       accounts: selectedAccounts,
       id
-    } = _ref51;
+    } = _ref53;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
       throw new Error('The proposal has been expired');
@@ -2799,22 +2866,22 @@ class KoniExtension {
     const availableNamespaces = {};
     const namespaces = {};
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    Object.entries(requiredNamespaces).forEach(_ref52 => {
-      let [key, namespace] = _ref52;
+    Object.entries(requiredNamespaces).forEach(_ref54 => {
+      let [key, namespace] = _ref54;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
           if (unSupportChains.length) {
-            throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+            throw new Error((0, _utils7.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
           }
           availableNamespaces[key] = namespace;
         }
       } else {
-        throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+        throw new Error((0, _utils7.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
-    Object.entries(optionalNamespaces).forEach(_ref53 => {
-      let [key, namespace] = _ref53;
+    Object.entries(optionalNamespaces).forEach(_ref55 => {
+      let [key, namespace] = _ref55;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const supportChains = namespace.chains.filter(chain => (0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap)) || [];
@@ -2838,14 +2905,14 @@ class KoniExtension {
         }
       }
     });
-    Object.entries(availableNamespaces).forEach(_ref54 => {
-      let [key, namespace] = _ref54;
+    Object.entries(availableNamespaces).forEach(_ref56 => {
+      let [key, namespace] = _ref56;
       if (namespace.chains) {
         const accounts = selectedAccounts.filter(address => {
           const [_namespace] = address.split(':');
           return _namespace === key;
         });
-        const chains = (0, _utils7.uniqueStringArray)(namespace.chains);
+        const chains = (0, _utils6.uniqueStringArray)(namespace.chains);
         namespaces[key] = {
           accounts,
           methods: namespace.methods,
@@ -2863,10 +2930,10 @@ class KoniExtension {
     request.resolve();
     return true;
   }
-  async rejectWalletConnectSession(_ref55) {
+  async rejectWalletConnectSession(_ref57) {
     let {
       id
-    } = _ref55;
+    } = _ref57;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     const wcId = request.request.id;
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
@@ -2888,10 +2955,10 @@ class KoniExtension {
     });
     return this.#koniState.walletConnectService.sessions;
   }
-  async disconnectWalletConnectSession(_ref56) {
+  async disconnectWalletConnectSession(_ref58) {
     let {
       topic
-    } = _ref56;
+    } = _ref58;
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
@@ -2904,18 +2971,18 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allNotSupportWCRequests;
   }
-  approveWalletConnectNotSupport(_ref57) {
+  approveWalletConnectNotSupport(_ref59) {
     let {
       id
-    } = _ref57;
+    } = _ref59;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.resolve();
     return true;
   }
-  rejectWalletConnectNotSupport(_ref58) {
+  rejectWalletConnectNotSupport(_ref60) {
     let {
       id
-    } = _ref58;
+    } = _ref60;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.reject(new Error('USER_REJECTED'));
     return true;
@@ -2923,17 +2990,17 @@ class KoniExtension {
 
   /// Manta
 
-  async enableMantaPay(_ref59) {
+  async enableMantaPay(_ref61) {
     let {
       address,
       password
-    } = _ref59;
+    } = _ref61;
     // always takes the current account
     function timeout() {
       return new Promise(resolve => setTimeout(resolve, 1500));
     }
     try {
-      var _this$koniState$chain, _this$koniState$chain2;
+      var _this$koniState$chain3, _this$koniState$chain4;
       await this.#koniState.chainService.enableChain(_constants2._DEFAULT_MANTA_ZK_CHAIN);
       this.#koniState.chainService.setMantaZkAssetSettings(true);
       const mnemonic = this.keyringExportMnemonic({
@@ -2952,7 +3019,7 @@ class KoniExtension {
       await this.saveCurrentAccountProxy({
         address
       });
-      const unsubSyncProgress = await ((_this$koniState$chain = this.#koniState.chainService) === null || _this$koniState$chain === void 0 ? void 0 : (_this$koniState$chain2 = _this$koniState$chain.mantaPay) === null || _this$koniState$chain2 === void 0 ? void 0 : _this$koniState$chain2.subscribeSyncProgress());
+      const unsubSyncProgress = await ((_this$koniState$chain3 = this.#koniState.chainService) === null || _this$koniState$chain3 === void 0 ? void 0 : (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) === null || _this$koniState$chain4 === void 0 ? void 0 : _this$koniState$chain4.subscribeSyncProgress());
       console.debug('Start initial sync for MantaPay');
       this.#koniState.initialSyncMantaPay(address).then(() => {
         console.debug('Finished initial sync for MantaPay');
@@ -2983,32 +3050,32 @@ class KoniExtension {
     }
   }
   async initSyncMantaPay(address) {
-    var _this$koniState$chain3, _this$koniState$chain4, _this$koniState$chain5, _this$koniState$chain6;
-    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing || !_utils7.MODULE_SUPPORT.MANTA_ZK) {
+    var _this$koniState$chain5, _this$koniState$chain6, _this$koniState$chain7, _this$koniState$chain8;
+    if ((_this$koniState$chain5 = this.#koniState.chainService) !== null && _this$koniState$chain5 !== void 0 && (_this$koniState$chain6 = _this$koniState$chain5.mantaPay) !== null && _this$koniState$chain6 !== void 0 && _this$koniState$chain6.getSyncState().isSyncing || !_utils6.MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
     await this.saveCurrentAccountProxy({
       address
     });
-    const unsubSyncProgress = await ((_this$koniState$chain5 = this.#koniState.chainService) === null || _this$koniState$chain5 === void 0 ? void 0 : (_this$koniState$chain6 = _this$koniState$chain5.mantaPay) === null || _this$koniState$chain6 === void 0 ? void 0 : _this$koniState$chain6.subscribeSyncProgress());
+    const unsubSyncProgress = await ((_this$koniState$chain7 = this.#koniState.chainService) === null || _this$koniState$chain7 === void 0 ? void 0 : (_this$koniState$chain8 = _this$koniState$chain7.mantaPay) === null || _this$koniState$chain8 === void 0 ? void 0 : _this$koniState$chain8.subscribeSyncProgress());
     console.debug('Start initial sync for MantaPay');
     this.#koniState.initialSyncMantaPay(address).then(() => {
-      var _this$koniState$chain7, _this$koniState$chain8;
+      var _this$koniState$chain9, _this$koniState$chain10;
       console.debug('Finished initial sync for MantaPay');
       this.#skipAutoLock = false;
       unsubSyncProgress && unsubSyncProgress();
       // make sure the sync state is set, just in case it gets unsubscribed
-      (_this$koniState$chain7 = this.#koniState.chainService) === null || _this$koniState$chain7 === void 0 ? void 0 : (_this$koniState$chain8 = _this$koniState$chain7.mantaPay) === null || _this$koniState$chain8 === void 0 ? void 0 : _this$koniState$chain8.setSyncState({
+      (_this$koniState$chain9 = this.#koniState.chainService) === null || _this$koniState$chain9 === void 0 ? void 0 : (_this$koniState$chain10 = _this$koniState$chain9.mantaPay) === null || _this$koniState$chain10 === void 0 ? void 0 : _this$koniState$chain10.setSyncState({
         progress: 100,
         isSyncing: false
       });
     }).catch(e => {
-      var _this$koniState$chain9, _this$koniState$chain10;
+      var _this$koniState$chain11, _this$koniState$chain12;
       console.error('Error syncing MantaPay', e);
       this.#skipAutoLock = false;
       unsubSyncProgress && unsubSyncProgress();
-      (_this$koniState$chain9 = this.#koniState.chainService) === null || _this$koniState$chain9 === void 0 ? void 0 : (_this$koniState$chain10 = _this$koniState$chain9.mantaPay) === null || _this$koniState$chain10 === void 0 ? void 0 : _this$koniState$chain10.setSyncState({
+      (_this$koniState$chain11 = this.#koniState.chainService) === null || _this$koniState$chain11 === void 0 ? void 0 : (_this$koniState$chain12 = _this$koniState$chain11.mantaPay) === null || _this$koniState$chain12 === void 0 ? void 0 : _this$koniState$chain12.setSyncState({
         progress: 0,
         isSyncing: false
       });
@@ -3017,11 +3084,11 @@ class KoniExtension {
   async disableMantaPay(address) {
     return this.#koniState.disableMantaPay(address);
   }
-  async isTonBounceableAddress(_ref60) {
+  async isTonBounceableAddress(_ref62) {
     let {
       address,
       chain
-    } = _ref60;
+    } = _ref62;
     try {
       const tonApi = this.#koniState.getTonApi(chain);
       const state = await tonApi.getAccountState(address);
@@ -3047,7 +3114,7 @@ class KoniExtension {
     return this.#koniState.getMantaPayConfig('calamari');
   }
   subscribeMantaPaySyncState(id, port) {
-    var _this$koniState$subsc, _this$koniState$chain11, _this$koniState$chain12;
+    var _this$koniState$subsc, _this$koniState$chain13, _this$koniState$chain14;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const syncingStateSubscription = (_this$koniState$subsc = this.#koniState.subscribeMantaPaySyncState()) === null || _this$koniState$subsc === void 0 ? void 0 : _this$koniState$subsc.subscribe({
       next: rs => {
@@ -3058,7 +3125,7 @@ class KoniExtension {
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return ((_this$koniState$chain11 = this.#koniState.chainService) === null || _this$koniState$chain11 === void 0 ? void 0 : (_this$koniState$chain12 = _this$koniState$chain11.mantaPay) === null || _this$koniState$chain12 === void 0 ? void 0 : _this$koniState$chain12.getSyncState()) || {
+    return ((_this$koniState$chain13 = this.#koniState.chainService) === null || _this$koniState$chain13 === void 0 ? void 0 : (_this$koniState$chain14 = _this$koniState$chain13.mantaPay) === null || _this$koniState$chain14 === void 0 ? void 0 : _this$koniState$chain14.getSyncState()) || {
       isSyncing: false,
       progress: 0,
       needManualSync: false
@@ -3067,10 +3134,10 @@ class KoniExtension {
 
   /* Metadata */
 
-  async findRawMetadata(_ref61) {
+  async findRawMetadata(_ref63) {
     let {
       genesisHash
-    } = _ref61;
+    } = _ref63;
     const {
       metadata,
       specVersion,
@@ -3084,20 +3151,20 @@ class KoniExtension {
       userExtensions
     };
   }
-  async calculateMetadataHash(_ref62) {
+  async calculateMetadataHash(_ref64) {
     let {
       chain
-    } = _ref62;
+    } = _ref64;
     const hash = await this.#koniState.calculateMetadataHash(chain);
     return {
       metadataHash: hash || ''
     };
   }
-  async shortenMetadata(_ref63) {
+  async shortenMetadata(_ref65) {
     let {
       chain,
       txBlob
-    } = _ref63;
+    } = _ref65;
     const shorten = await this.#koniState.shortenMetadata(chain, txBlob);
     return {
       txMetadata: shorten || ''
@@ -3186,6 +3253,17 @@ class KoniExtension {
       }
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(yieldValidation);
     }
+    let submitData;
+    try {
+      submitData = await this.#koniState.earningService.handleYieldJoin(inputData);
+    } catch (e) {
+      if (step) {
+        this.#koniState.transactionService.updateProcessStepStatus(step, {
+          status: _types3.StepStatus.FAILED
+        });
+      }
+      throw e;
+    }
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
@@ -3195,7 +3273,7 @@ class KoniExtension {
       transferNativeAmount,
       txChain,
       txData
-    } = await this.#koniState.earningService.handleYieldJoin(inputData);
+    } = submitData;
     const isPoolSupportAlternativeFee = this.#koniState.earningService.isPoolSupportAlternativeFee(inputData.data.slug);
     const poolHandler = this.#koniState.earningService.getPoolHandler(data.slug);
     const isMintingStep = _utils2.YIELD_EXTRINSIC_TYPES.includes(extrinsicType);
@@ -3232,7 +3310,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils7.reformatAddress)(address),
+          address: (0, _utils6.reformatAddress)(address),
           type: _types3.ProcessType.EARNING,
           combineInfo,
           currentStepId: step.stepId,
@@ -3428,18 +3506,18 @@ class KoniExtension {
 
   /* Campaign */
 
-  unlockDotCheckCanMint(_ref64) {
+  unlockDotCheckCanMint(_ref66) {
     let {
       address,
       network,
       slug
-    } = _ref64;
+    } = _ref66;
     return this.#koniState.mintCampaignService.unlockDotCampaign.canMint(address, slug, network);
   }
-  unlockDotSubscribeMintedData(id, port, _ref65) {
+  unlockDotSubscribeMintedData(id, port, _ref67) {
     let {
       transactionId
-    } = _ref65;
+    } = _ref67;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.mintCampaignService.unlockDotCampaign.subscribeMintedNft(transactionId, cb);
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
@@ -3471,10 +3549,10 @@ class KoniExtension {
     });
     return filterBanner(await this.#koniState.campaignService.getProcessingCampaign());
   }
-  async completeCampaignBanner(_ref66) {
+  async completeCampaignBanner(_ref68) {
     let {
       slug
-    } = _ref66;
+    } = _ref68;
     const campaign = await this.#koniState.dbService.getCampaign(slug);
     if (campaign) {
       await this.#koniState.dbService.upsertCampaign({
@@ -3607,6 +3685,9 @@ class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
+  async generateOptimalProcess(request) {
+    return this.#koniState.swapService.generateOptimalProcess(request);
+  }
   async handleSwapRequest(request) {
     return this.#koniState.swapService.handleSwapRequest(request);
   }
@@ -3658,16 +3739,29 @@ class KoniExtension {
       }
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(swapValidations);
     }
+    let submitData;
+    try {
+      submitData = await this.#koniState.swapService.handleSwapProcess(inputData);
+    } catch (e) {
+      if (step) {
+        this.#koniState.transactionService.updateProcessStepStatus(step, {
+          status: _types3.StepStatus.FAILED
+        });
+      }
+      throw e;
+    }
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
       chainType,
       extrinsic,
       extrinsicType,
+      isPermit,
       transferNativeAmount,
       txChain,
       txData
-    } = await this.#koniState.swapService.handleSwapProcess(inputData);
+    } = submitData;
+
     // const chosenFeeToken = process.steps.findIndex((step) => step.type === SwapStepType.SET_FEE_TOKEN) > -1;
     // const allowSkipValidation = [ExtrinsicType.SET_FEE_TOKEN, ExtrinsicType.SWAP].includes(extrinsicType);
 
@@ -3689,7 +3783,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils7.reformatAddress)(address),
+          address: (0, _utils6.reformatAddress)(address),
           type: _types3.ProcessType.SWAP,
           currentStepId: step.stepId,
           combineInfo,
@@ -3750,6 +3844,24 @@ class KoniExtension {
         await this.#koniState.transactionService.updateProcessInfo(processId, combineInfo, step);
       }
     }
+    if (isPermit) {
+      return await this.#koniState.transactionService.handlePermitTransaction({
+        address,
+        chain: txChain,
+        transaction: extrinsic,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        data: txData,
+        extrinsicType,
+        // change this depends on step
+        chainType,
+        resolveOnDone: !isLastStep,
+        transferNativeAmount,
+        ...this.createPassConfirmationParams(isPassConfirmation),
+        errorOnTimeOut,
+        eventsHandler,
+        step
+      });
+    }
     return await this.#koniState.transactionService.handleTransaction({
       address,
       chain: txChain,
@@ -3906,7 +4018,7 @@ class KoniExtension {
     if (!pair) {
       throw new Error('Pair not found');
     }
-    const signMode = (0, _utils7.getAccountSignMode)(address, pair.meta);
+    const signMode = (0, _utils6.getAccountSignMode)(address, pair.meta);
     if (signMode !== _types3.AccountSignMode.PASSWORD) {
       throw new Error('Account can not use this feature');
     }
@@ -3967,7 +4079,8 @@ class KoniExtension {
               const onSend = callback
               // eslint-disable-next-line node/no-callback-literal
               ? rs => callback(rs) : undefined;
-              if (stepNums > 2 && isLastStep) {
+              const specialCaseForUniswap = data.quote.provider.id === _types3.SwapProviderId.UNISWAP && !!data.process.steps.find(step => step.type === _types3.SwapStepType.PERMIT);
+              if (stepNums > 2 && isLastStep && !specialCaseForUniswap) {
                 const quote = data.quote;
                 const latestSwapQuote = await this.getLatestSwapQuote({
                   address: data.address,
@@ -4021,8 +4134,8 @@ class KoniExtension {
                         resolve();
                       }
                     };
-                    this.#koniState.balanceService.subscribeTransferableBalance(address, waitXcmData.chain, waitXcmData.token, waitXcmData.nextTxType, onRs).then(_ref67 => {
-                      let [_unsub, rs] = _ref67;
+                    this.#koniState.balanceService.subscribeTransferableBalance(address, waitXcmData.chain, waitXcmData.token, waitXcmData.nextTxType, onRs).then(_ref69 => {
+                      let [_unsub, rs] = _ref69;
                       unsub = _unsub;
                       onRs(rs);
                     }).catch(console.error);
@@ -4095,6 +4208,32 @@ class KoniExtension {
 
   /* Multi process */
 
+  /* Migrate Unified Account */
+  async migrateUnifiedAndFetchEligibleSoloAccounts(request) {
+    const setMigratingMode = () => {
+      this.saveUnifiedAccountMigrationInProgress({
+        isUnifiedAccountMigrationInProgress: true
+      });
+    };
+    return await this.#koniState.keyringService.context.migrateUnifiedAndFetchEligibleSoloAccounts(request, setMigratingMode);
+  }
+  migrateSoloAccount(request) {
+    const proxyIds = request.soloAccounts.map(account => account.proxyId);
+    const response = this.#koniState.keyringService.context.migrateSoloAccount(request);
+    const newProxyId = response.migratedUnifiedAccountId; // get from response to ensure account migration is done.
+    const newName = request.accountName;
+    try {
+      this.#koniState.inappNotificationService.migrateNotificationProxyId(proxyIds, newProxyId, newName);
+    } catch (error) {
+      console.error('Error on migrating notification for unified account migration', error);
+    }
+    return response;
+  }
+  pingSession(request) {
+    return this.#koniState.keyringService.context.pingSession(request);
+  }
+  /* Migrate Unified Account */
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -4180,6 +4319,12 @@ class KoniExtension {
         return this.setEnableChainPatrol(request);
       case 'pri(settings.saveNotificationSetup)':
         return this.saveNotificationSetup(request);
+      case 'pri(settings.saveMigrationAcknowledgedStatus)':
+        return this.saveMigrationAcknowledgedStatus(request);
+      case 'pri(settings.saveUnifiedAccountMigrationInProgress)':
+        return this.saveUnifiedAccountMigrationInProgress(request);
+      case 'pri(settings.pingUnifiedAccountMigrationDone)':
+        return this.pingUnifiedAccountMigrationDone();
       case 'pri(settings.saveShowZeroBalance)':
         return this.setShowZeroBalance(request);
       case 'pri(settings.saveLanguage)':
@@ -4457,10 +4602,14 @@ class KoniExtension {
         return this.subscribeConfirmations(id, port);
       case 'pri(confirmationsTon.subscribe)':
         return this.subscribeConfirmationsTon(id, port);
+      case 'pri(confirmationsCardano.subscribe)':
+        return this.subscribeConfirmationsCardano(id, port);
       case 'pri(confirmations.complete)':
         return await this.completeConfirmation(request);
       case 'pri(confirmationsTon.complete)':
         return await this.completeConfirmationTon(request);
+      case 'pri(confirmationsCardano.complete)':
+        return await this.completeConfirmationCardano(request);
 
       /// Stake
       case 'pri(bonding.getBondingOptions)':
@@ -4651,6 +4800,8 @@ class KoniExtension {
       /* Swap service */
       case 'pri(swapService.subscribePairs)':
         return this.subscribeSwapPairs(id, port);
+      case 'pri(swapService.generateOptimalProcess)':
+        return this.generateOptimalProcess(request);
       case 'pri(swapService.handleSwapRequest)':
         return this.handleSwapRequest(request);
       case 'pri(swapService.getLatestQuote)':
@@ -4705,6 +4856,13 @@ class KoniExtension {
         return this.subscribeProcessAlive(id, port);
       /* Multi process */
 
+      /* Migrate Unified Account */
+      case 'pri(migrate.migrateUnifiedAndFetchEligibleSoloAccounts)':
+        return await this.migrateUnifiedAndFetchEligibleSoloAccounts(request);
+      case 'pri(migrate.migrateSoloAccount)':
+        return this.migrateSoloAccount(request);
+      case 'pri(migrate.pingSession)':
+        return this.pingSession(request);
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);