@subwallet/extension-base 1.3.29-0 → 1.3.30-0

package/background/KoniTypes.d.ts

@@ -15,7 +15,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalSwapPath, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalSwapPathParamsV2, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningSlippage, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningSlippage, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitTransfer, RequestSubscribeTransfer, ResponseSubscribeTransfer } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { GetNotificationParams, RequestIsClaimedPolygonBridge, RequestSwitchStatusParams } from '@subwallet/extension-base/types/notification';
@@ -31,6 +31,7 @@ import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
 import { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import { SignerResult } from '@polkadot/types/types/extrinsic';
 import { HexString } from '@polkadot/util/types';
+import { EarningSlippageResult } from '../services/earning-service/handlers/native-staking/dtao';
 import { TransactionWarning } from './warnings/TransactionWarning';
 export declare enum RuntimeEnvironment {
     Web = "Web",
@@ -1692,7 +1693,7 @@ export interface KoniRequestSignatures {
     'pri(yield.withdraw.submit)': [RequestYieldWithdrawal, SWTransactionResponse];
     'pri(yield.cancelWithdrawal.submit)': [RequestStakeCancelWithdrawal, SWTransactionResponse];
     'pri(yield.claimReward.submit)': [RequestStakeClaimReward, SWTransactionResponse];
-    'pri(yield.getEarningSlippage)': [RequestEarningSlippage, number];
+    'pri(yield.getEarningSlippage)': [RequestEarningSlippage, EarningSlippageResult];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transaction.history.subscribe)': [RequestSubscribeHistory, ResponseSubscribeHistory, TransactionHistoryItem[]];
     'pri(transfer.getMaxTransferable)': [RequestMaxTransferable, AmountData];
@@ -1784,9 +1785,8 @@ export interface KoniRequestSignatures {
     'pri(database.setLocalStorage)': [StorageDataInterface, boolean];
     'pri(database.getLocalStorage)': [string, string | null];
     'pri(swapService.subscribePairs)': [null, SwapPair[], SwapPair[]];
-    'pri(swapService.getOptimalProcessOnSelectQuote)': [OptimalSwapPathParamsV2, CommonOptimalSwapPath];
     'pri(swapService.handleSwapRequest)': [SwapRequest, SwapRequestResult];
-    'pri(swapService.handleSwapRequestV2)': [SwapRequest, SwapRequestResult];
+    'pri(swapService.handleSwapRequestV2)': [SwapRequestV2, SwapRequestResult];
     'pri(swapService.handleSwapStep)': [SwapSubmitParams, SWTransactionResponse];
     'pri(swapService.getLatestQuote)': [SwapRequest, SwapQuoteResponse];
     'pri(swapService.validateSwapProcess)': [ValidateSwapProcessParams, TransactionError[]];

package/background/errors/SwapError.js

@@ -5,7 +5,7 @@ import { SWError } from '@subwallet/extension-base/background/errors/SWError';
 import { detectTranslate } from '@subwallet/extension-base/utils';
 const defaultErrorMap = {
   ERROR_FETCHING_QUOTE: {
-    message: detectTranslate('No swap quote found. Adjust your amount or try again later'),
+    message: detectTranslate('No swap quote found. Change your network endpoint or adjust amount and try again'),
     code: undefined
   },
   NOT_MEET_MIN_SWAP: {

package/cjs/background/errors/SwapError.js

@@ -11,7 +11,7 @@ var _utils = require("@subwallet/extension-base/utils");
 
 const defaultErrorMap = {
   ERROR_FETCHING_QUOTE: {
-    message: (0, _utils.detectTranslate)('No swap quote found. Adjust your amount or try again later'),
+    message: (0, _utils.detectTranslate)('No swap quote found. Change your network endpoint or adjust amount and try again'),
     code: undefined
   },
   NOT_MEET_MIN_SWAP: {

package/cjs/constants/blocked-actions.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.APP_VER = exports.APP_ENV = void 0;
 exports.fetchBlockedConfigObjects = fetchBlockedConfigObjects;
-exports.fetchLastestBlockedActionsAndFeatures = fetchLastestBlockedActionsAndFeatures;
+exports.fetchLatestBlockedActionsAndFeatures = fetchLatestBlockedActionsAndFeatures;
 exports.getPassConfigId = getPassConfigId;
 var _extensionBase = require("@subwallet/extension-base");
 var _utils = require("@subwallet/extension-base/utils");
@@ -99,7 +99,7 @@ function isPassVersion(versionStr, versionCondition) {
   const versionConditionStr = versionCondition.trim();
   return versionStr === versionConditionStr;
 }
-async function fetchLastestBlockedActionsAndFeatures(ids) {
+async function fetchLatestBlockedActionsAndFeatures(ids) {
   if (ids.length === 0) {
     return [_staticData.staticData[_staticData.StaticKey.BLOCKED_ACTIONS_FEATURES]];
   }

package/cjs/constants/remind-notification-time.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fetchLastestRemindNotificationTime = void 0;
+exports.fetchLatestRemindNotificationTime = void 0;
 var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const fetchLastestRemindNotificationTime = async () => {
+const fetchLatestRemindNotificationTime = async () => {
   return await (0, _utils.fetchStaticData)('config/remind-notification-time');
 };
-exports.fetchLastestRemindNotificationTime = fetchLastestRemindNotificationTime;
+exports.fetchLatestRemindNotificationTime = fetchLatestRemindNotificationTime;

package/cjs/core/logic-validation/swap.js

@@ -10,7 +10,10 @@ exports._getEarlyHydradxValidationError = _getEarlyHydradxValidationError;
 exports._getSimpleSwapEarlyValidationError = _getSimpleSwapEarlyValidationError;
 exports._validateBalanceToSwap = _validateBalanceToSwap;
 exports._validateBalanceToSwapOnAssetHub = _validateBalanceToSwapOnAssetHub;
+exports._validateBalanceToSwapV2 = _validateBalanceToSwapV2;
+exports._validateQuoteV2 = _validateQuoteV2;
 exports._validateSwapRecipient = _validateSwapRecipient;
+exports._validateSwapRecipientV2 = _validateSwapRecipientV2;
 var _SwapError = require("@subwallet/extension-base/background/errors/SwapError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
@@ -113,7 +116,7 @@ function _getChainflipEarlyValidationError(error, metadata) {
     case _swap.SwapErrorType.UNKNOWN:
       return new _SwapError.SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case _swap.SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new _SwapError.SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new _SwapError.SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     default:
       return new _SwapError.SwapError(error);
   }
@@ -129,7 +132,7 @@ function _getEarlyHydradxValidationError(error, metadata) {
     case _swap.SwapErrorType.UNKNOWN:
       return new _SwapError.SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case _swap.SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new _SwapError.SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new _SwapError.SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     default:
       return new _SwapError.SwapError(error);
   }
@@ -143,7 +146,7 @@ function _getEarlyAssetHubValidationError(error, metadata) {
     case _swap.SwapErrorType.UNKNOWN:
       return new _SwapError.SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case _swap.SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new _SwapError.SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new _SwapError.SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     case _swap.SwapErrorType.MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT:
       return new _SwapError.SwapError(error, 'You swap too much. It make pool not enough existential deposit');
     // TODO: i18n this
@@ -172,8 +175,64 @@ function _getSimpleSwapEarlyValidationError(error, metadata) {
     case _swap.SwapErrorType.UNKNOWN:
       return new _SwapError.SwapError(error, `Undefined error. Check your Internet and ${metadata.chain.slug} connection or contact support`);
     case _swap.SwapErrorType.ERROR_FETCHING_QUOTE:
-      return new _SwapError.SwapError(error, 'No swap quote found. Adjust your amount or try again later.');
+      return new _SwapError.SwapError(error, 'No swap quote found. Change your network endpoint or adjust amount and try again');
     default:
       return new _SwapError.SwapError(error);
   }
+}
+function _validateQuoteV2(selectedQuote) {
+  if (!selectedQuote) {
+    return new _TransactionError.TransactionError(_types.BasicTxErrorType.INTERNAL_ERROR);
+  }
+
+  // Check swapQuote alive
+  if (selectedQuote.aliveUntil <= +Date.now()) {
+    return new _TransactionError.TransactionError(_swap.SwapErrorType.QUOTE_TIMEOUT);
+  }
+  return undefined;
+}
+function _validateBalanceToSwapV2(request) {
+  const {
+    chainInfo,
+    feeAmount,
+    feeToken,
+    feeTokenBalance,
+    fromToken,
+    fromTokenBalance,
+    minSwapAmount,
+    swapAmount
+  } = request;
+  const bnFromTokenBalance = (0, _bignumber.default)(fromTokenBalance);
+  if (new _bignumber.default(feeTokenBalance).lte(feeAmount)) {
+    return new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, `You don't have enough ${feeToken.symbol} (${chainInfo.name}) to pay transaction fee`);
+  }
+  if (fromToken.slug === feeToken.slug) {
+    // todo: need review and refactor
+    if (bnFromTokenBalance.lte((0, _bignumber.default)(feeAmount).plus(swapAmount))) {
+      return new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, `Insufficient balance. Deposit ${fromToken.symbol} and try again.`);
+    }
+  } else {
+    if (bnFromTokenBalance.lt(swapAmount)) {
+      return new _TransactionError.TransactionError(_types.BasicTxErrorType.NOT_ENOUGH_BALANCE, `Insufficient balance. Deposit ${fromToken.symbol} and try again.`);
+    }
+  }
+  if (minSwapAmount) {
+    if (bnFromTokenBalance.lte(minSwapAmount)) {
+      const parsedMinSwapValue = (0, _utils2.formatNumber)(minSwapAmount, (0, _utils._getAssetDecimals)(fromToken));
+      return new _TransactionError.TransactionError(_swap.SwapErrorType.SWAP_NOT_ENOUGH_BALANCE, `Insufficient balance. You need more than ${parsedMinSwapValue} ${fromToken.symbol} to start swapping. Deposit ${fromToken.symbol} and try again.`); // todo: min swap or amount?
+    }
+  }
+
+  return undefined;
+}
+function _validateSwapRecipientV2(destChainInfo, recipient) {
+  if (!recipient) {
+    return undefined;
+  }
+  const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(recipient);
+  const isEvmDestChain = (0, _utils._isChainEvmCompatible)(destChainInfo);
+  if (isEvmAddress && !isEvmDestChain || !isEvmAddress && isEvmDestChain) {
+    return new _TransactionError.TransactionError(_swap.SwapErrorType.INVALID_RECIPIENT);
+  }
+  return undefined;
 }

package/cjs/core/utils.js

@@ -151,6 +151,7 @@ function _isSupportLedgerAccount(validateRecipientParams) {
   return '';
 }
 const _isSufficientToken = async (tokenInfo, substrateApi) => {
+  // todo: remove const and detect by pallets instead
   if (_constants.SUFFICIENT_CHAIN.includes(tokenInfo.originChain) && tokenInfo.assetType !== _types._AssetType.NATIVE) {
     const assetId = (0, _utils2._isBridgedToken)(tokenInfo) ? (0, _utils2._getXcmAssetMultilocation)(tokenInfo) : (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
     const queryParams = {
@@ -163,9 +164,14 @@ const _isSufficientToken = async (tokenInfo, substrateApi) => {
       queryParams.module = 'assets';
     }
     const metadata = await substrateApi.makeRpcQuery(queryParams);
-    return metadata.isSufficient;
-  } else {
-    return false;
+    return (metadata === null || metadata === void 0 ? void 0 : metadata.isSufficient) || false;
   }
+
+  // todo
+  // if (tokenInfo.metadata?.isSufficient) {
+  //   return tokenInfo.metadata?.isSufficient;
+  // }
+
+  return false;
 };
 exports._isSufficientToken = _isSufficientToken;

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

@@ -293,7 +293,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, () => {
@@ -3699,11 +3698,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 +3712,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 +3742,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 +3766,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 +3780,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 +3803,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 +3812,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 +4043,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,
@@ -4824,8 +4749,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)':

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.29-0'
+  version: '1.3.30-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/transfer/xcm/availBridge.js

@@ -67,12 +67,12 @@ async function getClaimTxOnAvail(notification, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const chainSlug = chainApi.chainSlug;
   const metadata = notification.metadata;
-  const lastestEthHeadSlot = await getLastestEthHeadSlot(chainSlug);
-  const lastestBlockHash = await getLastestBlockHash(chainSlug, lastestEthHeadSlot);
-  const proof = await getClaimProofOnAvail(chainSlug, lastestBlockHash, metadata.messageId);
-  return chainApi.api.tx.vector.execute(lastestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
+  const latestEthHeadSlot = await getLatestEthHeadSlot(chainSlug);
+  const latestBlockHash = await getLatestBlockHash(chainSlug, latestEthHeadSlot);
+  const proof = await getClaimProofOnAvail(chainSlug, latestBlockHash, metadata.messageId);
+  return chainApi.api.tx.vector.execute(latestEthHeadSlot, getAddressMessage(notification), proof.accountProof, proof.storageProof);
 }
-async function getLastestEthHeadSlot(chainSlug) {
+async function getLatestEthHeadSlot(chainSlug) {
   try {
     const api = getAvailBridgeApi(chainSlug);
     const rawResponse = await fetch(`${api}/eth/head`);
@@ -83,7 +83,7 @@ async function getLastestEthHeadSlot(chainSlug) {
     throw e;
   }
 }
-async function getLastestBlockHash(chainSlug, slot) {
+async function getLatestBlockHash(chainSlug, slot) {
   try {
     const api = getAvailBridgeApi(chainSlug);
     const rawResponse = await fetch(`${api}/beacon/slot/${slot}`);

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

@@ -300,7 +300,7 @@ const _XCM_CHAIN_GROUP = {
   // default is xTokens pallet
 };
 exports._XCM_CHAIN_GROUP = _XCM_CHAIN_GROUP;
-const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub', 'hydradx_main'];
+const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub'];
 exports.SUFFICIENT_CHAIN = SUFFICIENT_CHAIN;
 const _XCM_TYPE = {
   RP: `${_types._SubstrateChainType.RELAYCHAIN}-${_types._SubstrateChainType.PARACHAIN}`,

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

@@ -256,11 +256,11 @@ class BasePoolHandler {
   /** Validate param to join the pool */
 
   /** Create `transaction` to leave the pool */
-  async handleYieldLeave(fastLeave, amount, address, selectedTarget, netuid) {
+  async handleYieldLeave(fastLeave, amount, address, selectedTarget, netuid, slippage) {
     if (fastLeave) {
       return this.handleYieldRedeem(amount, address, selectedTarget);
     } else {
-      return this.handleYieldUnstake(amount, address, selectedTarget, netuid);
+      return this.handleYieldUnstake(amount, address, selectedTarget, netuid, slippage);
     }
   }
 
@@ -275,7 +275,10 @@ class BasePoolHandler {
     return this.slug === slug;
   }
   getEarningSlippage(params) {
-    return Promise.resolve(0);
+    return Promise.resolve({
+      slippage: 0,
+      rate: 1
+    });
   }
   /* Other actions */
 }

package/cjs/services/earning-service/handlers/native-staking/base.js

@@ -110,7 +110,10 @@ class BaseNativeStakingPoolHandler extends _base.default {
       address,
       slug,
       selectedValidators,
-      netuid
+      subnetData: {
+        netuid: netuid || 0,
+        slippage: 0
+      }
     };
     const positionInfo = await this.getPoolPosition(address);
     const [, fee] = await this.createJoinExtrinsic(data, positionInfo);