@subwallet/extension-base 1.3.21-0 → 1.3.23-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");
@@ -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) {
@@ -1100,11 +1120,11 @@ class KoniExtension {
     // Re-filter
     return historySubject.getValue().filter(item => addresses.some(address => (0, _utils7.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);
@@ -1234,9 +1254,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,
@@ -1583,21 +1617,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 +1722,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 +1737,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) {
@@ -1740,6 +1774,7 @@ class KoniExtension {
     }
     const _request = {
       address: address,
+      cardanoApi: this.#koniState.chainService.getCardanoApi(chain),
       destChain,
       destToken,
       evmApi: this.#koniState.chainService.getEvmApi(chain),
@@ -1757,11 +1792,11 @@ class KoniExtension {
       freeBalance: freeBalanceSubject,
       fee: feeSubject
     }).subscribe({
-      next: _ref32 => {
+      next: _ref34 => {
         let {
           fee,
           freeBalance
-        } = _ref32;
+        } = _ref34;
         (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
@@ -1795,13 +1830,13 @@ class KoniExtension {
     });
     return (0, _utils7.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 +1887,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 +1975,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 +2024,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 +2064,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) {
@@ -2107,11 +2154,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 +2348,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 +2453,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref41) {
+  keyringUnlock(_ref43) {
     let {
       password
-    } = _ref41;
+    } = _ref43;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
       // this.#koniState.initMantaPay(password)
@@ -2440,11 +2487,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 +2501,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref43) {
+  async resetWallet(_ref45) {
     let {
       resetAll
-    } = _ref43;
+    } = _ref45;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2473,10 +2520,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 {
@@ -2634,10 +2681,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref45) {
+  getTransaction(_ref47) {
     let {
       id
-    } = _ref45;
+    } = _ref47;
     const {
       transaction,
       ...transactionResult
@@ -2647,8 +2694,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 +2719,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 +2744,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 +2790,10 @@ class KoniExtension {
   }
 
   // Phishing detect
-  async passPhishingPage(_ref49) {
+  async passPhishingPage(_ref51) {
     let {
       url
-    } = _ref49;
+    } = _ref51;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
@@ -2767,10 +2814,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 +2830,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,8 +2846,8 @@ 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));
@@ -2813,8 +2860,8 @@ class KoniExtension {
         throw new Error((0, _utils8.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,8 +2885,8 @@ 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(':');
@@ -2863,10 +2910,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 +2935,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 +2951,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,11 +2970,11 @@ 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));
@@ -3017,11 +3064,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);
@@ -3067,10 +3114,10 @@ class KoniExtension {
 
   /* Metadata */
 
-  async findRawMetadata(_ref61) {
+  async findRawMetadata(_ref63) {
     let {
       genesisHash
-    } = _ref61;
+    } = _ref63;
     const {
       metadata,
       specVersion,
@@ -3084,20 +3131,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 +3233,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 +3253,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);
@@ -3428,18 +3486,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 +3529,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 +3665,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 +3719,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);
 
@@ -3750,6 +3824,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,
@@ -3967,7 +4059,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 +4114,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 +4188,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 +4299,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 +4582,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 +4780,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 +4836,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}`);