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

package/koni/background/handlers/Extension.js

@@ -8,7 +8,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ASSET_HUB_CHAIN_SLUGS, LATEST_SESSION } from '@subwallet/extension-base/constants';
+import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, LATEST_SESSION } from '@subwallet/extension-base/constants';
 import { additionalValidateTransferForRecipient, additionalValidateXcmTransfer, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
@@ -22,9 +22,11 @@ import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrin
 import { getTuringCancelCompoundingExtrinsic, getTuringCompoundExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
 import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic, validatePoolBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { YIELD_EXTRINSIC_TYPES } from '@subwallet/extension-base/koni/api/yield/helper/utils';
+import { DEFAULT_CARDANO_TTL_OFFSET } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/consts';
 import { isBounceableAddress } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
+import { createCardanoTransaction } from '@subwallet/extension-base/services/balance-service/transfer/cardano-transfer';
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject, getPSP34TransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
-import { createTransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
+import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
@@ -32,19 +34,19 @@ import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge }
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
 import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isNativeTokenBySlug, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool } from '@subwallet/extension-base/services/fee-service/utils';
+import { batchExtrinsicSetFeeHydration, getAssetHubTokensCanPayFee, getHydrationTokensCanPayFee } from '@subwallet/extension-base/services/fee-service/utils/tokenPayFee';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
-import { checkLiquidityForPool, estimateTokensForPool, getReserveForPool } from '@subwallet/extension-base/services/swap-service/handler/asset-hub/utils';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
-import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, SwapStepType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
+import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, CommonStepType, EarningProcessType, ProcessType, StakingTxErrorType, StepStatus, SwapFeeType, SwapProviderId, SwapStepType, YieldPoolType, YieldStepType } from '@subwallet/extension-base/types';
 import { _analyzeAddress, calculateMaxTransferable, combineAllAccountProxy, createTransactionFromRLP, detectTransferTxType, getAccountSignMode, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { getId } from '@subwallet/extension-base/utils/getId';
-import { getKeypairTypeByAddress, isAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
+import { getKeypairTypeByAddress, isAddress, isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';
 import { getSdkError } from '@walletconnect/utils';
@@ -781,6 +783,22 @@ export default class KoniExtension {
     this.#koniState.updateSetting('notificationSetup', request);
     return true;
   }
+  saveMigrationAcknowledgedStatus({
+    isAcknowledgedUnifiedAccountMigration
+  }) {
+    this.#koniState.updateSetting('isAcknowledgedUnifiedAccountMigration', isAcknowledgedUnifiedAccountMigration);
+    return true;
+  }
+  saveUnifiedAccountMigrationInProgress({
+    isUnifiedAccountMigrationInProgress
+  }) {
+    this.#koniState.updateSetting('isUnifiedAccountMigrationInProgress', isUnifiedAccountMigrationInProgress);
+    return true;
+  }
+  pingUnifiedAccountMigrationDone() {
+    this.#koniState.updateSetting('isUnifiedAccountMigrationInProgress', false);
+    return true;
+  }
   setShowZeroBalance({
     show
   }) {
@@ -1113,8 +1131,8 @@ export default class KoniExtension {
       feeCustom,
       feeOption,
       from,
-      nonNativeTokenPayFeeSlug,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1127,7 +1145,9 @@ export default 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 && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
+    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
     const extrinsicType = isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN;
     let chainType = ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1193,9 +1213,23 @@ export default class KoniExtension {
           // currently not used
           tonApi
         });
+      } else if (isCardanoAddress(from) && isCardanoAddress(to) && _isTokenTransferredByCardano(transferTokenInfo)) {
+        chainType = ChainType.CARDANO;
+        const cardanoApi = this.#koniState.getCardanoApi(chain);
+        [transaction, transferAmount.value] = await createCardanoTransaction({
+          tokenInfo: transferTokenInfo,
+          from,
+          to,
+          networkKey: chain,
+          value: value || '0',
+          cardanoTtlOffset: DEFAULT_CARDANO_TTL_OFFSET,
+          transferAll: !!transferAll,
+          cardanoApi,
+          nativeTokenInfo
+        });
       } else {
         const substrateApi = this.#koniState.getSubstrateApi(chain);
-        [transaction, transferAmount.value] = await createTransferExtrinsic({
+        [transaction, transferAmount.value] = await createSubstrateExtrinsic({
           transferAll: !!transferAll,
           value: value || '0',
           from: from,
@@ -1204,6 +1238,13 @@ export default class KoniExtension {
           to: to,
           substrateApi
         });
+        if (_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 = batchExtrinsicSetFeeHydration(substrateApi, transaction, feeSetting, hydrationFeeAssetId);
+        }
       }
     } catch (e) {
       const error = e;
@@ -1221,11 +1262,11 @@ export default 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(reformatAddress(from), chain, nonNativeTokenPayFeeSlug);
-        const nonNativeTokenPayFeeBalance = BigInt(nonNativeTokenPayFeeInfo[nonNativeTokenPayFeeSlug].free);
+        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance(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(BasicTxErrorType.NOT_ENOUGH_BALANCE));
         }
@@ -1277,7 +1318,7 @@ export default class KoniExtension {
       chain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       chainType,
       transferNativeAmount,
       transaction,
@@ -1297,9 +1338,9 @@ export default class KoniExtension {
       feeOption,
       from,
       isPassConfirmation,
-      nonNativeTokenPayFeeSlug,
       originNetworkKey,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1319,7 +1360,7 @@ export default class KoniExtension {
     const isPolygonBridgeTransfer = _isPolygonChainBridge(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = _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) {
@@ -1359,6 +1400,14 @@ export default class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
+      if (_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 = batchExtrinsicSetFeeHydration(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
+      }
       additionalValidator = async inputTransaction => {
         const {
           value: senderTransferable
@@ -1417,7 +1466,7 @@ export default class KoniExtension {
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       isTransferAll: transferAll,
       isTransferLocalTokenAndPayThatTokenAsFee,
       isPassConfirmation,
@@ -1436,48 +1485,51 @@ export default class KoniExtension {
     const chainService = this.#koniState.chainService;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const address = reformatAddress(_address);
-
-    // ensure nativeTokenInfo and localTokenInfo have multi-location metadata beforehand to improve performance.
     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 !== _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 (!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 getReserveForPool(substrateApi.api, nativeTokenInfo, tokenInfo);
-        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-          return;
-        }
-        const rate = new BigN(reserve[1]).div(reserve[0]).toFixed();
-        const tokenCanPayFee = {
-          slug: tokenSlug,
-          free: tokensHasBalanceInfoMap[tokenSlug].free,
-          rate
-        };
-        if (feeAmount === undefined) {
-          tokensCanPayFee.push(tokenCanPayFee);
-        } else {
-          const amount = estimateTokensForPool(feeAmount, reserve);
-          const liquidityError = checkLiquidityForPool(amount, reserve[0], reserve[1]);
-          if (!liquidityError) {
-            tokensCanPayFee.push(tokenCanPayFee);
-          }
+    let tokensCanPayFee = [nativeBalanceInfo];
+    let defaultTokenSlug = nativeBalanceInfo.slug;
+    if (_SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain)) {
+      tokensCanPayFee = await getAssetHubTokensCanPayFee({
+        substrateApi,
+        chainService,
+        nativeTokenInfo,
+        nativeBalanceInfo,
+        tokensHasBalanceInfoMap,
+        feeAmount
+      });
+    } else if (_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 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 {
@@ -1674,13 +1726,13 @@ export default class KoniExtension {
       destChain: _destChain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
-      token
+      token,
+      tokenPayFeeSlug
     } = request;
     const cb = createSubscription(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
-    const isTransferLocalTokenAndPayThatTokenAsFee = !_isNativeToken(transferTokenInfo) && !!nonNativeTokenPayFeeSlug && nonNativeTokenPayFeeSlug === token;
-    const isTransferNativeTokenAndPayLocalTokenAsFee = _isNativeToken(transferTokenInfo) && !!nonNativeTokenPayFeeSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !_isNativeToken(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
+    const isTransferNativeTokenAndPayLocalTokenAsFee = _isNativeToken(transferTokenInfo) && !!tokenPayFeeSlug && !_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);
@@ -1695,6 +1747,7 @@ export default class KoniExtension {
     }
     const _request = {
       address: address,
+      cardanoApi: this.#koniState.chainService.getCardanoApi(chain),
       destChain,
       destToken,
       evmApi: this.#koniState.chainService.getEvmApi(chain),
@@ -1892,12 +1945,24 @@ export default class KoniExtension {
     });
     return this.#koniState.getConfirmationsQueueSubjectTon().getValue();
   }
+  subscribeConfirmationsCardano(id, port) {
+    const cb = 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
 
@@ -2860,7 +2925,7 @@ export default class KoniExtension {
       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(_DEFAULT_MANTA_ZK_CHAIN);
       this.#koniState.chainService.setMantaZkAssetSettings(true);
       const mnemonic = this.keyringExportMnemonic({
@@ -2879,7 +2944,7 @@ export default 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');
@@ -2910,32 +2975,32 @@ export default 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 || !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 || !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
       });
@@ -2973,7 +3038,7 @@ export default 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 = 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 => {
@@ -2984,7 +3049,7 @@ export default 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
@@ -3109,6 +3174,17 @@ export default 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: StepStatus.FAILED
+        });
+      }
+      throw e;
+    }
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
@@ -3118,7 +3194,7 @@ export default 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 = YIELD_EXTRINSIC_TYPES.includes(extrinsicType);
@@ -3527,6 +3603,9 @@ export default 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);
   }
@@ -3578,16 +3657,29 @@ export default 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: 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);
 
@@ -3670,6 +3762,24 @@ export default 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,
@@ -3887,7 +3997,8 @@ export default 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 === SwapProviderId.UNISWAP && !!data.process.steps.find(step => step.type === SwapStepType.PERMIT);
+              if (stepNums > 2 && isLastStep && !specialCaseForUniswap) {
                 const quote = data.quote;
                 const latestSwapQuote = await this.getLatestSwapQuote({
                   address: data.address,
@@ -4013,6 +4124,32 @@ export default 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) {
@@ -4098,6 +4235,12 @@ export default 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)':
@@ -4375,10 +4518,14 @@ export default 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)':
@@ -4569,6 +4716,8 @@ export default 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)':
@@ -4623,6 +4772,13 @@ export default 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}`);

package/koni/background/handlers/State.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="chrome" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, ChainStakingMetadata, ConfirmationsQueue, ConfirmationsQueueTon, CrowdloanItem, CrowdloanJson, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestConfirmationComplete, RequestConfirmationCompleteTon, RequestCrowdloanContributions, RequestSettingsType, ResponseAccountExportPrivateKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, ChainStakingMetadata, ConfirmationsQueue, ConfirmationsQueueCardano, ConfirmationsQueueTon, CrowdloanItem, CrowdloanJson, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestConfirmationComplete, RequestConfirmationCompleteCardano, RequestConfirmationCompleteTon, RequestCrowdloanContributions, RequestSettingsType, ResponseAccountExportPrivateKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
 import { RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning } from '@subwallet/extension-base/background/types';
 import { EnvConfig } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
@@ -83,7 +83,7 @@ export default class KoniState {
     private waitStarting;
     constructor(providers?: Providers);
     get knownMetadata(): MetadataDef[];
-    injectMetadata(url: string, request: MetadataDef): Promise<boolean>;
+    injectMetadata(request: MetadataDef): boolean;
     getMetaRequest(id: string): MetaRequest;
     getSignRequest(id: string): SignRequest | undefined;
     rpcListProviders(): Promise<ResponseRpcListProviders>;
@@ -192,6 +192,8 @@ export default class KoniState {
     getEvmApi(networkKey: string): import("../../../services/chain-service/handler/EvmApi").EvmApi;
     getTonApiMap(): Record<string, import("../../../services/chain-service/handler/TonApi").TonApi>;
     getTonApi(networkKey: string): import("../../../services/chain-service/handler/TonApi").TonApi;
+    getCardanoApiMap(): Record<string, import("../../../services/chain-service/handler/CardanoApi").CardanoApi>;
+    getCardanoApi(networkKey: string): import("../../../services/chain-service/handler/CardanoApi").CardanoApi;
     getApiMap(): ApiMap;
     refreshSubstrateApi(key: string): boolean;
     refreshWeb3Api(key: string): void;
@@ -215,8 +217,10 @@ export default class KoniState {
     evmSendTransaction(id: string, url: string, transactionParams: EvmSendTransactionParams, networkKeyInit?: string, topic?: string): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     getConfirmationsQueueSubjectTon(): BehaviorSubject<ConfirmationsQueueTon>;
+    getConfirmationsQueueSubjectCardano(): BehaviorSubject<ConfirmationsQueueCardano>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
     completeConfirmationTon(request: RequestConfirmationCompleteTon): Promise<boolean>;
+    completeConfirmationCardano(request: RequestConfirmationCompleteCardano): Promise<boolean>;
     private onMV3Update;
     private storePreviousVersionData;
     migrateMV3LocalStorage(data: string): Promise<boolean>;