@subwallet/extension-base 1.3.16-0 → 1.3.18-0

package/background/KoniTypes.d.ts

@@ -7,13 +7,15 @@ import { RequestOptimalTransferProcess } from '@subwallet/extension-base/service
 import { TonTransactionConfig } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
+import { TokenHasBalanceInfo } from '@subwallet/extension-base/services/fee-service/interfaces';
 import { _NotificationInfo, NotificationSetup } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
 import { AppBannerData, AppConfirmationData, AppPopupData } from '@subwallet/extension-base/services/mkt-campaign-service/types';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 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 { AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, 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, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, 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, StorageDataInterface, SubmitYieldStepData, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, 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';
 import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
@@ -1300,6 +1302,10 @@ export interface RequestAddPspToken {
         logo?: string;
     };
 }
+export interface TokenPriorityDetails {
+    tokenGroup: Record<string, number>;
+    token: Record<string, number>;
+}
 export interface RequestConnectWalletConnect {
     uri: string;
 }
@@ -1605,15 +1611,18 @@ export interface KoniRequestSignatures {
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transaction.history.subscribe)': [RequestSubscribeHistory, ResponseSubscribeHistory, TransactionHistoryItem[]];
     'pri(transfer.getMaxTransferable)': [RequestMaxTransferable, AmountData];
+    'pri(transfer.subscribe)': [RequestSubscribeTransfer, ResponseSubscribeTransfer, ResponseSubscribeTransfer];
     'pri(subscription.cancel)': [string, boolean];
     'pri(freeBalance.get)': [RequestFreeBalance, AmountData];
     'pri(freeBalance.subscribe)': [RequestFreeBalance, AmountDataWithId, AmountDataWithId];
     'pri(accounts.checkTransfer)': [RequestCheckTransfer, ValidateTransactionResponse];
-    'pri(accounts.transfer)': [RequestTransfer, SWTransactionResponse];
+    'pri(accounts.transfer)': [RequestSubmitTransfer, SWTransactionResponse];
     'pri(accounts.getOptimalTransferProcess)': [RequestOptimalTransferProcess, CommonOptimalPath];
     'pri(accounts.approveSpending)': [TokenSpendingApprovalParams, SWTransactionResponse];
     'pri(accounts.checkCrossChainTransfer)': [RequestCheckCrossChainTransfer, ValidateTransactionResponse];
     'pri(accounts.crossChainTransfer)': [RequestCrossChainTransfer, SWTransactionResponse];
+    'pri(customFee.getTokensCanPayFee)': [RequestGetTokensCanPayFee, TokenHasBalanceInfo[]];
+    'pri(customFee.getAmountForPair)': [RequestGetAmountForPair, string];
     'pri(confirmations.subscribe)': [RequestConfirmationsSubscribe, ConfirmationsQueue, ConfirmationsQueue];
     'pri(confirmationsTon.subscribe)': [RequestConfirmationsSubscribeTon, ConfirmationsQueueTon, ConfirmationsQueueTon];
     'pri(confirmations.complete)': [RequestConfirmationComplete, boolean];
@@ -1701,6 +1710,7 @@ export interface KoniRequestSignatures {
     'pri(availBridge.submitClaimAvailBridgeOnAvail)': [RequestClaimBridge, SWTransactionResponse];
     'pri(polygonBridge.submitClaimPolygonBridge)': [RequestClaimBridge, SWTransactionResponse];
     'pri(ledger.generic.allow)': [null, string[], string[]];
+    'pri(tokens.subscribePriority)': [null, TokenPriorityDetails, TokenPriorityDetails];
 }
 export interface ApplicationMetadataType {
     version: string;

package/cjs/constants/index.js

@@ -39,9 +39,10 @@ var _exportNames = {
   NETWORK_MULTI_GAS_FEE: true,
   ORDINAL_COLLECTION: true,
   ORDINAL_METHODS: true,
-  PERMISSIONS_TO_REVOKE: true
+  PERMISSIONS_TO_REVOKE: true,
+  ASSET_HUB_CHAIN_SLUGS: true
 };
-exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.PERMISSIONS_TO_REVOKE = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_LISTEN_AVAIL_BRIDGE_CLAIM = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BITTENSOR_REFRESH_STAKE_INFO = exports.BITTENSOR_REFRESH_STAKE_APY = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ALL_ACCOUNT_AUTH_TYPES = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.XCM_MIN_AMOUNT_RATIO = exports.XCM_FEE_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.PERMISSIONS_TO_REVOKE = exports.ORDINAL_METHODS = exports.ORDINAL_COLLECTION = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_MKT_CAMPAIGN_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_EARNING_REWARD_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_LISTEN_AVAIL_BRIDGE_CLAIM = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.BITTENSOR_REFRESH_STAKE_INFO = exports.BITTENSOR_REFRESH_STAKE_APY = exports.BASE_SECOND_INTERVAL = exports.BASE_MINUTE_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ASSET_HUB_CHAIN_SLUGS = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ALL_ACCOUNT_AUTH_TYPES = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _blockedActions = require("./blocked-actions");
 Object.keys(_blockedActions).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -188,4 +189,6 @@ exports.ORDINAL_COLLECTION = ORDINAL_COLLECTION;
 const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 exports.ORDINAL_METHODS = ORDINAL_METHODS;
 const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
-exports.PERMISSIONS_TO_REVOKE = PERMISSIONS_TO_REVOKE;
+exports.PERMISSIONS_TO_REVOKE = PERMISSIONS_TO_REVOKE;
+const ASSET_HUB_CHAIN_SLUGS = ['paseo_assethub', 'westend_assethub', 'rococo_assethub', 'statemine', 'statemint'];
+exports.ASSET_HUB_CHAIN_SLUGS = ASSET_HUB_CHAIN_SLUGS;

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

@@ -20,13 +20,13 @@ var _ethSigUtil = require("@metamask/eth-sig-util");
 var _EvmProviderError = require("@subwallet/extension-base/background/errors/EvmProviderError");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _utils = require("@subwallet/extension-base/services/fee-service/utils");
 var _types = require("@subwallet/extension-base/types");
-var _utils2 = require("@subwallet/extension-base/utils");
+var _utils = require("@subwallet/extension-base/utils");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
+var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils3 = require("@walletconnect/utils");
+var _utils2 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _bn = _interopRequireDefault(require("bn.js"));
 var _i18next = require("i18next");
@@ -163,7 +163,7 @@ async function validationAuthMiddleware(koni, url, payload) {
         errors.push(new Error(message));
       } else {
         const authList = await koni.getAuthList();
-        const authInfo = authList[(0, _utils2.stripUrl)(url)];
+        const authInfo = authList[(0, _utils.stripUrl)(url)];
         if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[payload.pair.address]) {
           payload.errorPosition = 'dApp';
           const [message] = convertErrorMessage('Account not in allowed list', '');
@@ -234,7 +234,7 @@ async function validationConnectMiddleware(koni, url, payload) {
 
     // Calculate transaction data
     try {
-      await Promise.race([checkProviderConnected(), (0, _utils2.wait)(3000).then(async () => {
+      await Promise.race([checkProviderConnected(), (0, _utils.wait)(3000).then(async () => {
         if (!currentProviderConnected) {
           await koni.chainService.initSingleApi(networkKey);
           await checkProviderConnected();
@@ -307,7 +307,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
       if (transaction.value) {
         try {
           const valueBn = new _bignumber.default(transaction.value.toString());
-          if (!valueBn.eq(_utils2.BN_ZERO)) {
+          if (!valueBn.eq(_utils.BN_ZERO)) {
             handleError('Recipient address not found');
           }
         } catch (e) {
@@ -331,7 +331,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
 
     // Calculate transaction data
     try {
-      await Promise.race([getTransactionGas(), (0, _utils2.wait)(3000).then(async () => {
+      await Promise.race([getTransactionGas(), (0, _utils.wait)(3000).then(async () => {
         if (!transaction.gas) {
           await koni.chainService.initSingleApi(networkKey || '');
           await getTransactionGas();
@@ -351,15 +351,22 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
       estimateGas = new _bignumber.default(transactionParams.gasPrice).multipliedBy(transaction.gas).toFixed(0);
     } else {
       try {
-        const priority = await (0, _utils.calculateGasFeeParams)(evmApi, networkKey || '');
-        if (priority.baseGasFee) {
-          transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
-          transaction.maxFeePerGas = priority.maxFeePerGas.toString();
-          const maxFee = priority.maxFeePerGas;
-          estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+        const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
+        const id = (0, _getId.getId)();
+        const feeInfo = await koni.feeService.subscribeChainFee(id, transaction.chain || '', 'evm');
+        const feeCombine = (0, _utils.combineEthFee)(feeInfo);
+        if (transaction.maxFeePerGas) {
+          estimateGas = new _bignumber.default(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
+        } else if (transaction.gasPrice) {
+          estimateGas = new _bignumber.default(transaction.gasPrice.toString()).multipliedBy(gasLimit).toFixed(0);
         } else {
-          transaction.gasPrice = priority.gasPrice;
-          estimateGas = new _bignumber.default(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+          if (feeCombine.maxFeePerGas) {
+            const maxFee = new _bignumber.default(feeCombine.maxFeePerGas); // TODO: Need review
+
+            estimateGas = maxFee.multipliedBy(gasLimit).toFixed(0);
+          } else if (feeCombine.gasPrice) {
+            estimateGas = new _bignumber.default(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
+          }
         }
       } catch (e) {
         handleError(e.message);
@@ -419,7 +426,7 @@ async function validationEvmSignMessageMiddleware(koni, url, payload_) {
   const {
     promise,
     resolve
-  } = (0, _utils2.createPromiseHandler)();
+  } = (0, _utils.createPromiseHandler)();
   let hashPayload = '';
   let canSign = false;
   const handleError = message_ => {
@@ -502,14 +509,14 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
   const {
     promise,
     resolve
-  } = (0, _utils2.createPromiseHandler)();
+  } = (0, _utils.createPromiseHandler)();
   const {
     address,
     errors
   } = payload;
   if (!topic) {
     payload.errorPosition = 'dApp';
-    errors.push(new Error((0, _utils3.getSdkError)('UNAUTHORIZED_EXTEND_REQUEST').message));
+    errors.push(new Error((0, _utils2.getSdkError)('UNAUTHORIZED_EXTEND_REQUEST').message));
   } else {
     const requestSession = koni.walletConnectService.getSession(topic);
     let sessionAccounts = [];
@@ -532,7 +539,7 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
           const [message] = convertErrorMessage('Unable to find account');
           errors.push(new Error(message));
         }
-        const isExitsAccount = sessionAccounts.find(account => (0, _utils2.isSameAddress)(account, address));
+        const isExitsAccount = sessionAccounts.find(account => (0, _utils.isSameAddress)(account, address));
         if (!isExitsAccount) {
           payload.errorPosition = 'dApp';
           const [message] = convertErrorMessage('Account not in allowed list');

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

@@ -38,15 +38,10 @@ var _utilCrypto = require("@polkadot/util-crypto");
 // normal transfer
 function validateTransferRequest(tokenInfo, from, to, value, transferAll) {
   const errors = [];
-  const keypair = _uiKeyring.keyring.getPair(from);
-  let transferValue;
   if (!transferAll) {
     if (value === undefined) {
       errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Transfer amount is required')));
     }
-    if (value) {
-      transferValue = new _bignumber.default(value);
-    }
   }
   if (!tokenInfo) {
     errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found token from registry')));
@@ -57,7 +52,7 @@ function validateTransferRequest(tokenInfo, from, to, value, transferAll) {
   if ((0, _keyring.isTonAddress)(from) && (0, _keyring.isTonAddress)(to) && (0, _utils2._isTokenTonSmartContract)(tokenInfo) && (0, _utils2._getContractAddressOfToken)(tokenInfo).length === 0) {
     errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found TEP74 address for this token')));
   }
-  return [errors, keypair, transferValue];
+  return errors;
 }
 function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
   const sendingTokenMinAmount = BigInt((0, _utils2._getTokenMinAmount)(sendingTokenInfo));
@@ -119,11 +114,10 @@ function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInf
 function validateXcmTransferRequest(destTokenInfo, sender, sendingValue) {
   const errors = [];
   const keypair = _uiKeyring.keyring.getPair(sender);
-  const transferValue = new _bignumber.default(sendingValue);
   if (!destTokenInfo) {
     errors.push(new _TransactionError.TransactionError(_types.TransferTxErrorType.INVALID_TOKEN, (0, _i18next.t)('Not found token from registry')));
   }
-  return [errors, keypair, transferValue];
+  return [errors, keypair];
 }
 function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, sendingAmount, senderTransferable, receiverNativeBalance, destChainInfo) {
   let isSnowBridge = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
@@ -350,7 +344,7 @@ function checkSupportForTransaction(validationResponse, transaction) {
     }
   }
 }
-async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi) {
+async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, feeInfo, nativeTokenInfo, tokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
   const estimateFee = {
     symbol: '',
     decimals: 0,
@@ -371,21 +365,21 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
         estimateFee.value = transaction.estimateFee; // todo: might need to update logic estimate fee inside for future actions excluding normal transfer Ton and Jetton
       } else {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
-        const priority = await (0, _utils3.calculateGasFeeParams)(evmApi, chainInfo.slug);
+        const feeCombine = (0, _utils4.combineEthFee)(feeInfo, validationResponse.feeOption, validationResponse.feeCustom);
         if (transaction.maxFeePerGas) {
           estimateFee.value = new _bignumber.default(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
         } else if (transaction.gasPrice) {
-          estimateFee.value = new _bignumber.default((transaction.gasPrice || 0).toString()).multipliedBy(gasLimit).toFixed(0);
+          estimateFee.value = new _bignumber.default(transaction.gasPrice.toString()).multipliedBy(gasLimit).toFixed(0);
         } else {
-          if (priority.baseGasFee) {
-            const maxFee = priority.maxFeePerGas; // TODO: Need review
+          if (feeCombine.maxFeePerGas) {
+            const maxFee = new _bignumber.default(feeCombine.maxFeePerGas); // TODO: Need review
 
             estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
-          } else {
-            estimateFee.value = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+          } else if (feeCombine.gasPrice) {
+            estimateFee.value = new _bignumber.default(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
           }
         }
-        estimateFee.tooHigh = priority.busyNetwork;
+        estimateFee.tooHigh = feeInfo.busyNetwork;
       }
     } catch (e) {
       const error = e;
@@ -394,6 +388,12 @@ async function estimateFeeForTransaction(validationResponse, transaction, chainI
       }
     }
   }
+  if (tokenPayFeeInfo) {
+    const estimatedFeeAmount = isTransferLocalTokenAndPayThatTokenAsFee ? (BigInt(estimateFee.value) * BigInt(_utils3.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString() : estimateFee.value;
+    estimateFee.decimals = tokenPayFeeInfo.decimals || 0;
+    estimateFee.symbol = tokenPayFeeInfo.symbol;
+    estimateFee.value = await (0, _utils3.calculateToAmountByReservePool)(substrateApi.api, nativeTokenInfo, tokenPayFeeInfo, estimatedFeeAmount);
+  }
   return estimateFee;
 }
 function checkSigningAccountForTransaction(validationResponse, chainInfoMap) {
@@ -432,9 +432,10 @@ function checkBalanceWithTransactionFee(validationResponse, transactionInput, na
     edAsWarning,
     extrinsicType,
     isTransferAll,
+    nonNativeTokenPayFeeSlug,
     skipFeeValidation
   } = transactionInput;
-  if (skipFeeValidation) {
+  if (skipFeeValidation || nonNativeTokenPayFeeSlug) {
     return;
   }
   const bnFee = new _bignumber.default(validationResponse.estimateFee.value);

package/cjs/koni/api/contract-handler/evm/web3.js

@@ -9,6 +9,7 @@ exports.getERC20SpendingApprovalTx = getERC20SpendingApprovalTx;
 exports.getWeb3Contract = getWeb3Contract;
 var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
 var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -34,7 +35,6 @@ async function getERC20Allowance(spender, owner, contractAddress, evmApi) {
   return await allowanceCall.call();
 }
 async function getERC20SpendingApprovalTx(spender, owner, contractAddress, evmApi) {
-  var _priority$maxFeePerGa, _priority$maxPriority;
   let amount = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '115792089237316195423570985008687907853269984665640564039457584007913129639935';
   const tokenContract = getERC20Contract(contractAddress, evmApi);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
@@ -46,13 +46,13 @@ async function getERC20SpendingApprovalTx(spender, owner, contractAddress, evmAp
     from: owner
   });
   const priority = await (0, _utils2.calculateGasFeeParams)(evmApi, evmApi.chainSlug);
+  const feeCombine = (0, _utils3.combineEthFee)(priority);
   return {
     from: owner,
     to: contractAddress,
     data: approveEncodedCall,
     gas: gasLimit,
     gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
 }

package/cjs/koni/api/staking/bonding/utils.js

@@ -395,7 +395,7 @@ function getAvgValidatorEraReward(supportedDays, eraRewardHistory) {
 function getSupportedDaysByHistoryDepth(erasPerDay, maxSupportedEras, liveDay) {
   const maxSupportDay = Math.floor(maxSupportedEras / erasPerDay);
   if (liveDay && liveDay <= 30) {
-    return Math.min(liveDay - 1, maxSupportDay);
+    return Math.min(Math.floor(liveDay - 1), maxSupportDay);
   }
   if (maxSupportDay > 30) {
     return 30;