@subwallet/extension-base 1.3.29-1 → 1.3.31-0

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

@@ -35,6 +35,7 @@ var _smartContract = require("@subwallet/extension-base/services/balance-service
 var _token = require("@subwallet/extension-base/services/balance-service/transfer/token");
 var _tonTransfer = require("@subwallet/extension-base/services/balance-service/transfer/ton-transfer");
 var _xcm = require("@subwallet/extension-base/services/balance-service/transfer/xcm");
+var _acrossBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge");
 var _availBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge");
 var _polygonBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge");
 var _posBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge");
@@ -293,7 +294,6 @@ class KoniExtension {
       const transformedAccounts = Object.values(accountProxies);
       responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
-      console.debug('subscriptionAccountGroups', responseData);
       cb(responseData);
     });
     this.createUnsubscriptionHandle(id, () => {
@@ -1148,9 +1148,10 @@ class KoniExtension {
       owner,
       spenderAddress
     } = params;
-    if (!(0, _utils2.isSnowBridgeGatewayContract)(spenderAddress) && !(0, _utils2.isAvailBridgeGatewayContract)(spenderAddress)) {
-      throw new Error('Only SnowBridge and AvailBridge is supported'); // todo: support all ERC20 spending approval
-    }
+
+    // if (!isSnowBridgeGatewayContract(spenderAddress) && !isAvailBridgeGatewayContract(spenderAddress)) {
+    //   throw new Error('Only SnowBridge and AvailBridge is supported'); // todo: support all ERC20 spending approval
+    // }
 
     const evmApi = this.#koniState.getEvmApi(chain);
     const transactionConfig = await (0, _web.getERC20SpendingApprovalTx)(spenderAddress, owner, contractAddress, evmApi, amount);
@@ -1342,7 +1343,8 @@ class KoniExtension {
       const receiverSendingTokenKeepAliveBalance = BigInt(_receiverSendingTokenKeepAliveBalance);
       const amount = BigInt(transferAmount.value);
       const substrateApi = this.#koniState.getSubstrateApi(chain);
-      const isSendingTokenSufficient = await (0, _utils._isSufficientToken)(transferTokenInfo, substrateApi);
+      const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+      const isSendingTokenSufficient = await (0, _utils._isSufficientToken)(transferTokenInfo, substrateApi, sufficientChain);
       const [warnings, errors] = (0, _transfer.additionalValidateTransferForRecipient)(transferTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, amount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient);
       warnings.length && inputTransaction.warnings.push(...warnings);
       errors.length && inputTransaction.errors.push(...errors);
@@ -1394,7 +1396,7 @@ class KoniExtension {
     const destinationNativeTokenInfo = this.#koniState.getNativeTokenInfo(destinationNetworkKey);
     const destinationNativeTokenSlug = destinationNativeTokenInfo.slug;
     const [errors, fromKeyPair] = (0, _transfer.validateXcmTransferRequest)(destinationTokenInfo, from, value);
-    let extrinsic = null;
+    let extrinsic;
     if (errors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
@@ -1404,9 +1406,12 @@ class KoniExtension {
     const isSnowBridgeEvmTransfer = (0, _utils5._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(originNetworkKey, destinationNetworkKey);
+    const isAcrossBridgeTransfer = (0, _acrossBridge._isAcrossChainBridge)(originNetworkKey, destinationNetworkKey);
     const extrinsicType = _KoniTypes.ExtrinsicType.TRANSFER_XCM;
+    const isSubstrateXcm = !(isAvailBridgeFromEvm || isAvailBridgeFromAvail || isSnowBridgeEvmTransfer || isPolygonBridgeTransfer || isPosBridgeTransfer);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
+    let xcmFeeDryRun;
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
@@ -1417,6 +1422,9 @@ class KoniExtension {
       if (isPosBridgeTransfer || isPolygonBridgeTransfer) {
         funcCreateExtrinsic = _xcm.createPolygonBridgeExtrinsic;
         type = 'evm';
+      } else if (isAcrossBridgeTransfer) {
+        funcCreateExtrinsic = _xcm.createAcrossBridgeExtrinsic;
+        type = 'evm';
       } else if (isSnowBridgeEvmTransfer) {
         funcCreateExtrinsic = _xcm.createSnowBridgeExtrinsic;
         type = 'evm';
@@ -1427,7 +1435,7 @@ class KoniExtension {
         funcCreateExtrinsic = _xcm.createAvailBridgeExtrinsicFromAvail;
         type = 'substrate';
       } else {
-        funcCreateExtrinsic = _xcm.createXcmExtrinsic;
+        funcCreateExtrinsic = _xcm.createXcmExtrinsicV2;
         type = 'substrate';
       }
       const feeInfo = await this.#koniState.feeService.subscribeChainFee((0, _getId.getId)(), originNetworkKey, type);
@@ -1446,6 +1454,19 @@ class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
+      let dryRunInfo;
+      if (isSubstrateXcm) {
+        dryRunInfo = await (0, _xcm.dryRunXcmExtrinsicV2)(params);
+        xcmFeeDryRun = dryRunInfo.fee;
+      }
+      if (isAcrossBridgeTransfer) {
+        const metadata = await (0, _acrossBridge.getAcrossQuote)(params);
+        inputData.metadata = {
+          amountOut: metadata.outputAmount,
+          rate: metadata.rate,
+          destChainSlug: destinationTokenInfo.slug
+        };
+      }
       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);
@@ -1455,11 +1476,20 @@ class KoniExtension {
         extrinsic = (0, _tokenPayFee.batchExtrinsicSetFeeHydration)(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
       }
       additionalValidator = async inputTransaction => {
+        // hotfix xcm mythos to mythos chain
+        const mythosError = (0, _transfer.validateXcmMinAmountToMythos)(destinationNetworkKey, destinationTokenInfo.slug, value);
+        if (mythosError) {
+          inputTransaction.errors.push(mythosError);
+        }
         let isSendingTokenSufficient = false;
         let receiverSystemAccountInfo;
         if (!(0, _utils5._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
           return undefined;
         }
+        const setting = {
+          visible: true
+        };
+        await this.#koniState.chainService.updateAssetSetting(destinationTokenInfo.slug, setting, true);
         const {
           value: _senderTransferable
         } = await this.getAddressTransferableBalance({
@@ -1487,15 +1517,17 @@ class KoniExtension {
           });
           receiverSystemAccountInfo = _receiverNativeTotal.metadata;
         }
-        if ((0, _utils5._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
-          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
-          isSendingTokenSufficient = await (0, _utils._isSufficientToken)(destinationTokenInfo, substrateApi);
-        }
+        const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+        const sufficientChain = this.#koniState.chainService.value.sufficientChains;
+        isSendingTokenSufficient = await (0, _utils._isSufficientToken)(destinationTokenInfo, substrateApi, sufficientChain);
         const [warning, error] = (0, _transfer.additionalValidateTransferForRecipient)(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
         // different from sendingTokenInfo being passed in
         receiverSystemAccountInfo, isSendingTokenSufficient);
         warning.length && inputTransaction.warnings.push(...warning);
         error.length && inputTransaction.errors.push(...error);
+        if (isSubstrateXcm && !dryRunInfo.success) {
+          inputTransaction.errors.push(new _TransactionError.TransactionError(_types3.BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again'));
+        }
       };
       eventsHandler = eventEmitter => {
         eventEmitter.on('send', () => {
@@ -1528,13 +1560,14 @@ class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType,
-      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer && !isAcrossBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
       transferNativeAmount: (0, _utils5._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings,
       tokenPayFeeSlug,
       isTransferAll: transferAll,
       isTransferLocalTokenAndPayThatTokenAsFee,
       isPassConfirmation,
+      xcmFeeDryRun,
       errors,
       additionalValidator: additionalValidator,
       eventsHandler: eventsHandler
@@ -1666,14 +1699,21 @@ class KoniExtension {
     } = _ref30;
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
+  async enableChainWithPriorityAssets(_ref31) {
+    let {
+      chainSlug,
+      enableTokens
+    } = _ref31;
+    return await this.#koniState.enableChainWithPriorityAssets(chainSlug, enableTokens);
+  }
   async reconnectChain(chainSlug) {
     return this.#koniState.chainService.reconnectChain(chainSlug);
   }
-  async validateNetwork(_ref31) {
+  async validateNetwork(_ref32) {
     let {
       existedChainSlug,
       provider
-    } = _ref31;
+    } = _ref32;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1745,13 +1785,13 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressTransferableBalance(_ref32) {
+  async getAddressTransferableBalance(_ref33) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref32;
+    } = _ref33;
     if (token && _constants2._MANTA_ZK_CHAIN_GROUP.includes(networkKey)) {
       const tokenInfo = this.#koniState.chainService.getAssetBySlug(token);
       if (tokenInfo.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
@@ -1760,13 +1800,13 @@ class KoniExtension {
     }
     return await this.#koniState.balanceService.getTransferableBalance(address, networkKey, token, extrinsicType);
   }
-  async getAddressTotalBalance(_ref33) {
+  async getAddressTotalBalance(_ref34) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref33;
+    } = _ref34;
     return await this.#koniState.balanceService.getTotalBalance(address, networkKey, token, extrinsicType);
   }
   async subscribeMaxTransferable(request, id, port) {
@@ -1777,7 +1817,8 @@ class KoniExtension {
       feeCustom,
       feeOption,
       token,
-      tokenPayFeeSlug
+      tokenPayFeeSlug,
+      value
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
@@ -1797,6 +1838,8 @@ class KoniExtension {
     }
     const _request = {
       address: address,
+      value,
+      // todo: lazy subscribe to improve performance
       cardanoApi: this.#koniState.chainService.getCardanoApi(chain),
       destChain,
       destToken,
@@ -1815,11 +1858,11 @@ class KoniExtension {
       freeBalance: freeBalanceSubject,
       fee: feeSubject
     }).subscribe({
-      next: _ref34 => {
+      next: _ref35 => {
         let {
           fee,
           freeBalance
-        } = _ref34;
+        } = _ref35;
         (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
@@ -1853,13 +1896,13 @@ class KoniExtension {
     });
     return (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee);
   }
-  async subscribeAddressTransferableBalance(_ref35, id, port) {
+  async subscribeAddressTransferableBalance(_ref36, id, port) {
     let {
       address,
       extrinsicType,
       networkKey,
       token
-    } = _ref35;
+    } = _ref36;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const convertData = data => {
       return {
@@ -1910,11 +1953,11 @@ class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(_ref36) {
+  async enableChains(_ref37) {
     let {
       chainSlugs,
       enableTokens
-    } = _ref36;
+    } = _ref37;
     try {
       await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
         chainSlug,
@@ -2047,30 +2090,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref37) {
+  parseSubstrateTransaction(_ref38) {
     let {
       data,
       networkKey
-    } = _ref37;
+    } = _ref38;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref38) {
+  async parseEVMRLP(_ref39) {
     let {
       data
-    } = _ref38;
+    } = _ref39;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref39) {
+  qrSignSubstrate(_ref40) {
     let {
       address,
       data,
       networkKey
-    } = _ref39;
+    } = _ref40;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     if (pair.isLocked) {
@@ -2087,13 +2130,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref40) {
+  async qrSignEVM(_ref41) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref40;
+    } = _ref41;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2177,11 +2220,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref41) {
+  async getBondingOptions(_ref42) {
     let {
       chain,
       type
-    } = _ref41;
+    } = _ref42;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2371,12 +2414,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref42) {
+  async parseContractInput(_ref43) {
     let {
       chainId,
       contract,
       data
-    } = _ref42;
+    } = _ref43;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2476,10 +2519,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref43) {
+  keyringUnlock(_ref44) {
     let {
       password
-    } = _ref43;
+    } = _ref44;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
       // this.#koniState.initMantaPay(password)
@@ -2510,11 +2553,11 @@ class KoniExtension {
 
   // Export mnemonic
 
-  keyringExportMnemonic(_ref44) {
+  keyringExportMnemonic(_ref45) {
     let {
       address,
       password
-    } = _ref44;
+    } = _ref45;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2524,10 +2567,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref45) {
+  async resetWallet(_ref46) {
     let {
       resetAll
-    } = _ref45;
+    } = _ref46;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2543,10 +2586,10 @@ class KoniExtension {
   }
 
   // Signing substrate request
-  async signingApprovePasswordV2(_ref46) {
+  async signingApprovePasswordV2(_ref47) {
     let {
       id
-    } = _ref46;
+    } = _ref47;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
@@ -2704,10 +2747,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref47) {
+  getTransaction(_ref48) {
     let {
       id
-    } = _ref47;
+    } = _ref48;
     const {
       transaction,
       ...transactionResult
@@ -2717,8 +2760,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(_ref48 => {
-        let [key, value] = _ref48;
+      return Object.fromEntries(Object.entries(rs).map(_ref49 => {
+        let [key, value] = _ref49;
         const {
           additionalValidator,
           eventsHandler,
@@ -2742,11 +2785,11 @@ class KoniExtension {
     const subscription = (0, _rxjs.combineLatest)({
       transactions: transactionsObservable,
       processMap: processTransactionObservable
-    }).subscribe(_ref49 => {
+    }).subscribe(_ref50 => {
       let {
         processMap,
         transactions
-      } = _ref49;
+      } = _ref50;
       cb(convertRs(transactions, processMap));
     });
     port.onDisconnect.addListener(() => {
@@ -2767,10 +2810,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref50) {
+  async reloadCron(_ref51) {
     let {
       data
-    } = _ref50;
+    } = _ref51;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -2813,10 +2856,10 @@ class KoniExtension {
   }
 
   // Phishing detect
-  async passPhishingPage(_ref51) {
+  async passPhishingPage(_ref52) {
     let {
       url
-    } = _ref51;
+    } = _ref52;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
@@ -2837,10 +2880,10 @@ class KoniExtension {
   /// Wallet connect
 
   // Connect
-  async connectWalletConnect(_ref52) {
+  async connectWalletConnect(_ref53) {
     let {
       uri
-    } = _ref52;
+    } = _ref53;
     await this.#koniState.walletConnectService.connect(uri);
     return true;
   }
@@ -2853,11 +2896,11 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allConnectWCRequests;
   }
-  async approveWalletConnectSession(_ref53) {
+  async approveWalletConnectSession(_ref54) {
     let {
       accounts: selectedAccounts,
       id
-    } = _ref53;
+    } = _ref54;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
       throw new Error('The proposal has been expired');
@@ -2869,8 +2912,8 @@ class KoniExtension {
     const availableNamespaces = {};
     const namespaces = {};
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    Object.entries(requiredNamespaces).forEach(_ref54 => {
-      let [key, namespace] = _ref54;
+    Object.entries(requiredNamespaces).forEach(_ref55 => {
+      let [key, namespace] = _ref55;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
@@ -2883,8 +2926,8 @@ class KoniExtension {
         throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
-    Object.entries(optionalNamespaces).forEach(_ref55 => {
-      let [key, namespace] = _ref55;
+    Object.entries(optionalNamespaces).forEach(_ref56 => {
+      let [key, namespace] = _ref56;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const supportChains = namespace.chains.filter(chain => (0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap)) || [];
@@ -2908,8 +2951,8 @@ class KoniExtension {
         }
       }
     });
-    Object.entries(availableNamespaces).forEach(_ref56 => {
-      let [key, namespace] = _ref56;
+    Object.entries(availableNamespaces).forEach(_ref57 => {
+      let [key, namespace] = _ref57;
       if (namespace.chains) {
         const accounts = selectedAccounts.filter(address => {
           const [_namespace] = address.split(':');
@@ -2933,10 +2976,10 @@ class KoniExtension {
     request.resolve();
     return true;
   }
-  async rejectWalletConnectSession(_ref57) {
+  async rejectWalletConnectSession(_ref58) {
     let {
       id
-    } = _ref57;
+    } = _ref58;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     const wcId = request.request.id;
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
@@ -2958,10 +3001,10 @@ class KoniExtension {
     });
     return this.#koniState.walletConnectService.sessions;
   }
-  async disconnectWalletConnectSession(_ref58) {
+  async disconnectWalletConnectSession(_ref59) {
     let {
       topic
-    } = _ref58;
+    } = _ref59;
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
@@ -2974,18 +3017,18 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allNotSupportWCRequests;
   }
-  approveWalletConnectNotSupport(_ref59) {
+  approveWalletConnectNotSupport(_ref60) {
     let {
       id
-    } = _ref59;
+    } = _ref60;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.resolve();
     return true;
   }
-  rejectWalletConnectNotSupport(_ref60) {
+  rejectWalletConnectNotSupport(_ref61) {
     let {
       id
-    } = _ref60;
+    } = _ref61;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.reject(new Error('USER_REJECTED'));
     return true;
@@ -2993,11 +3036,11 @@ class KoniExtension {
 
   /// Manta
 
-  async enableMantaPay(_ref61) {
+  async enableMantaPay(_ref62) {
     let {
       address,
       password
-    } = _ref61;
+    } = _ref62;
     // always takes the current account
     function timeout() {
       return new Promise(resolve => setTimeout(resolve, 1500));
@@ -3087,11 +3130,11 @@ class KoniExtension {
   async disableMantaPay(address) {
     return this.#koniState.disableMantaPay(address);
   }
-  async isTonBounceableAddress(_ref62) {
+  async isTonBounceableAddress(_ref63) {
     let {
       address,
       chain
-    } = _ref62;
+    } = _ref63;
     try {
       const tonApi = this.#koniState.getTonApi(chain);
       const state = await tonApi.getAccountState(address);
@@ -3137,10 +3180,10 @@ class KoniExtension {
 
   /* Metadata */
 
-  async findRawMetadata(_ref63) {
+  async findRawMetadata(_ref64) {
     let {
       genesisHash
-    } = _ref63;
+    } = _ref64;
     const {
       metadata,
       specVersion,
@@ -3154,20 +3197,20 @@ class KoniExtension {
       userExtensions
     };
   }
-  async calculateMetadataHash(_ref64) {
+  async calculateMetadataHash(_ref65) {
     let {
       chain
-    } = _ref64;
+    } = _ref65;
     const hash = await this.#koniState.calculateMetadataHash(chain);
     return {
       metadataHash: hash || ''
     };
   }
-  async shortenMetadata(_ref65) {
+  async shortenMetadata(_ref66) {
     let {
       chain,
       txBlob
-    } = _ref65;
+    } = _ref66;
     const shorten = await this.#koniState.shortenMetadata(chain, txBlob);
     return {
       txMetadata: shorten || ''
@@ -3520,18 +3563,18 @@ class KoniExtension {
 
   /* Campaign */
 
-  unlockDotCheckCanMint(_ref66) {
+  unlockDotCheckCanMint(_ref67) {
     let {
       address,
       network,
       slug
-    } = _ref66;
+    } = _ref67;
     return this.#koniState.mintCampaignService.unlockDotCampaign.canMint(address, slug, network);
   }
-  unlockDotSubscribeMintedData(id, port, _ref67) {
+  unlockDotSubscribeMintedData(id, port, _ref68) {
     let {
       transactionId
-    } = _ref67;
+    } = _ref68;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.mintCampaignService.unlockDotCampaign.subscribeMintedNft(transactionId, cb);
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
@@ -3563,10 +3606,10 @@ class KoniExtension {
     });
     return filterBanner(await this.#koniState.campaignService.getProcessingCampaign());
   }
-  async completeCampaignBanner(_ref68) {
+  async completeCampaignBanner(_ref69) {
     let {
       slug
-    } = _ref68;
+    } = _ref69;
     const campaign = await this.#koniState.dbService.getCampaign(slug);
     if (campaign) {
       await this.#koniState.dbService.upsertCampaign({
@@ -3699,11 +3742,9 @@ class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
-  async getOptimalSwapProcessOnSelectQuote(request) {
-    return this.#koniState.swapService.generateOptimalProcessWithoutPath(request);
-  }
   async handleSwapRequest(request) {
-    return this.#koniState.swapService.handleSwapRequest(request);
+    // @ts-ignore
+    return Promise.resolve(null);
   }
   async handleSwapRequestV2(request) {
     return this.#koniState.swapService.handleSwapRequestV2(request);
@@ -3715,7 +3756,7 @@ class KoniExtension {
     return swapQuoteResponse;
   }
   async validateSwapProcess(params) {
-    return this.#koniState.swapService.validateSwapProcess(params);
+    return this.#koniState.swapService.validateSwapProcessV2(params);
   }
   async handleSwapStep(inputData) {
     const {
@@ -3745,7 +3786,7 @@ class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_types3.BasicTxErrorType.INTERNAL_ERROR)]);
     }
     const isLastStep = inputData.currentStep + 1 === process.steps.length;
-    const swapValidations = await this.#koniState.swapService.validateSwapProcess({
+    const swapValidations = await this.#koniState.swapService.validateSwapProcessV2({
       address,
       process,
       selectedQuote: quote,
@@ -3769,9 +3810,9 @@ class KoniExtension {
           status: _types3.StepStatus.FAILED
         });
       }
+      console.log('Error handling process step', e);
       throw e;
     }
-    console.log('swap data', submitData);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {
@@ -3783,17 +3824,12 @@ class KoniExtension {
       txChain,
       txData
     } = submitData;
-
-    // const chosenFeeToken = process.steps.findIndex((step) => step.type === SwapStepType.SET_FEE_TOKEN) > -1;
-    // const allowSkipValidation = [ExtrinsicType.SET_FEE_TOKEN, ExtrinsicType.SWAP].includes(extrinsicType);
-
     const eventsHandler = eventEmitter => {
       if (onSend) {
         eventEmitter.on('send', onSend);
       }
     };
     if (processId) {
-      const _step = process.steps[inputData.currentStep];
       if (!this.#koniState.transactionService.checkProcessExist(processId) && step) {
         const combineInfo = {
           provider: quote.provider,
@@ -3811,23 +3847,6 @@ class KoniExtension {
           combineInfo,
           steps: inputData.process.steps.map((step, index) => {
             const fee = inputData.process.totalFee[index];
-            if (step.type === _types3.SwapStepType.SWAP) {
-              const metadata = {
-                pair: quote.pair,
-                aliveUntil: quote.aliveUntil,
-                fromAmount: quote.fromAmount,
-                rate: quote.rate,
-                provider: quote.provider,
-                route: quote.route,
-                toAmount: quote.toAmount
-              };
-              return {
-                ...step,
-                status: _types3.StepStatus.QUEUED,
-                fee,
-                metadata: metadata
-              };
-            }
             return {
               ...step,
               fee,
@@ -3837,34 +3856,6 @@ class KoniExtension {
           status: _types3.StepStatus.QUEUED
         });
       }
-      const isLastStep = inputData.currentStep === process.steps.length - 1;
-      if (isLastStep) {
-        const metadata = {
-          pair: quote.pair,
-          aliveUntil: quote.aliveUntil,
-          fromAmount: quote.fromAmount,
-          rate: quote.rate,
-          provider: quote.provider,
-          route: quote.route,
-          toAmount: quote.toAmount
-        };
-        const step = {
-          ..._step,
-          // In case one sign, status already set to prepare before
-          status: process.steps.length > 2 ? _types3.StepStatus.PREPARE : _types3.StepStatus.QUEUED,
-          fee: process.totalFee[inputData.currentStep],
-          metadata: metadata
-        };
-        const combineInfo = {
-          provider: quote.provider,
-          slippage: inputData.slippage,
-          address,
-          recipient,
-          quote,
-          process
-        };
-        await this.#koniState.transactionService.updateProcessInfo(processId, combineInfo, step);
-      }
     }
     if (isPermit) {
       return await this.#koniState.transactionService.handlePermitTransaction({
@@ -4096,32 +4087,10 @@ class KoniExtension {
               nextTxType: _KoniTypes.ExtrinsicType.SWAP
             };
             submitData = async (step, callback) => {
-              const isLastStep = step === stepNums - 1;
               const isPassConfirmation = !callback;
               const onSend = callback
               // eslint-disable-next-line node/no-callback-literal
               ? rs => callback(rs) : undefined;
-              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,
-                  currentQuote: quote.provider,
-                  feeToken: quote.feeInfo.selectedFeeToken,
-                  recipient: data.recipient,
-                  pair: quote.pair,
-                  fromAmount: quote.fromAmount,
-                  slippage: data.slippage
-                });
-                return this.handleSwapStep({
-                  ...data,
-                  quote: latestSwapQuote.optimalQuote || data.quote,
-                  currentStep: step,
-                  isPassConfirmation,
-                  errorOnTimeOut: true,
-                  processId
-                });
-              }
               return this.handleSwapStep({
                 ...data,
                 currentStep: step,
@@ -4156,8 +4125,8 @@ class KoniExtension {
                         resolve();
                       }
                     };
-                    this.#koniState.balanceService.subscribeTransferableBalance(address, waitXcmData.chain, waitXcmData.token, waitXcmData.nextTxType, onRs).then(_ref69 => {
-                      let [_unsub, rs] = _ref69;
+                    this.#koniState.balanceService.subscribeTransferableBalance(address, waitXcmData.chain, waitXcmData.token, waitXcmData.nextTxType, onRs).then(_ref70 => {
+                      let [_unsub, rs] = _ref70;
                       unsub = _unsub;
                       onRs(rs);
                     }).catch(console.error);
@@ -4548,6 +4517,8 @@ class KoniExtension {
         return this.getSupportedSmartContractTypes();
       case 'pri(chainService.enableChain)':
         return await this.enableChain(request);
+      case 'pri(chainService.enableChainWithPriorityAssets)':
+        return await this.enableChainWithPriorityAssets(request);
       case 'pri(chainService.reconnectChain)':
         return await this.reconnectChain(request);
       case 'pri(chainService.disableChain)':
@@ -4824,8 +4795,6 @@ class KoniExtension {
       /* Swap service */
       case 'pri(swapService.subscribePairs)':
         return this.subscribeSwapPairs(id, port);
-      case 'pri(swapService.getOptimalProcessOnSelectQuote)':
-        return this.getOptimalSwapProcessOnSelectQuote(request);
       case 'pri(swapService.handleSwapRequest)':
         return this.handleSwapRequest(request);
       case 'pri(swapService.handleSwapRequestV2)':