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

package/cjs/services/fee-service/utils/tokenPayFee.js

@@ -0,0 +1,151 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.batchExtrinsicSetFeeHydration = batchExtrinsicSetFeeHydration;
+exports.getAssetHubTokensCanPayFee = getAssetHubTokensCanPayFee;
+exports.getHydrationRate = getHydrationRate;
+exports.getHydrationTokensCanPayFee = getHydrationTokensCanPayFee;
+var _types = require("@subwallet/chain-list/types");
+var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils2 = require("@subwallet/extension-base/services/swap-service/handler/asset-hub/utils");
+var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+async function getAssetHubTokensCanPayFee(request) {
+  const {
+    chainService,
+    feeAmount,
+    nativeBalanceInfo,
+    nativeTokenInfo,
+    substrateApi,
+    tokensHasBalanceInfoMap
+  } = request;
+  const tokensList = [nativeBalanceInfo];
+  if (!(nativeTokenInfo.metadata && nativeTokenInfo.metadata.multilocation)) {
+    return tokensList;
+  }
+
+  // ensure nativeTokenInfo and localTokenInfo have multi-location metadata beforehand to improve performance.
+  const tokensHasBalanceSlug = Object.keys(tokensHasBalanceInfoMap);
+  const tokenInfos = tokensHasBalanceSlug.map(tokenSlug => chainService.getAssetBySlug(tokenSlug)).filter(token => token.originChain === substrateApi.chainSlug && token.assetType !== _types._AssetType.NATIVE && token.metadata && token.metadata.multilocation);
+  await Promise.all(tokenInfos.map(async tokenInfo => {
+    try {
+      const tokenSlug = tokenInfo.slug;
+      const reserve = await (0, _utils2.getReserveForPool)(substrateApi.api, nativeTokenInfo, tokenInfo);
+      if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
+        return;
+      }
+      const rate = new _bignumber.default(reserve[1]).div(reserve[0]).toFixed();
+      const tokenCanPayFee = {
+        slug: tokenSlug,
+        free: tokensHasBalanceInfoMap[tokenSlug].free,
+        rate
+      };
+      if (feeAmount === undefined) {
+        tokensList.push(tokenCanPayFee);
+      } else {
+        const amount = (0, _utils2.estimateTokensForPool)(feeAmount, reserve);
+        const liquidityError = (0, _utils2.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
+        if (!liquidityError) {
+          tokensList.push(tokenCanPayFee);
+        }
+      }
+    } catch (e) {
+      console.error('error when fetching pool with token', tokenInfo.slug, e);
+    }
+  }));
+  return tokensList;
+}
+async function getHydrationTokensCanPayFee(request) {
+  const {
+    address,
+    chainService,
+    nativeBalanceInfo,
+    nativeTokenInfo,
+    substrateApi,
+    tokensHasBalanceInfoMap
+  } = request;
+  const tokensList = [nativeBalanceInfo];
+  const _acceptedCurrencies = await substrateApi.api.query.multiTransactionPayment.acceptedCurrencies.entries();
+  const supportedAssetIds = _acceptedCurrencies.map(_assetId => {
+    const assetId = _assetId[0].toHuman();
+    return assetId[0].replaceAll(',', '');
+  });
+  const nativePriceId = (0, _utils._getAssetPriceId)(nativeTokenInfo);
+  if (!nativePriceId) {
+    return tokensList;
+  }
+  const tokenInfos = Object.keys(tokensHasBalanceInfoMap).map(tokenSlug => chainService.getAssetBySlug(tokenSlug)).filter(token => token.originChain === substrateApi.chainSlug && token.assetType !== _types._AssetType.NATIVE && !!token.metadata && !!token.metadata.assetId);
+  await Promise.all(tokenInfos.map(async tokenInfo => {
+    const priceId = (0, _utils._getAssetPriceId)(tokenInfo);
+    const rate = await getHydrationRate(address, nativeTokenInfo, tokenInfo);
+    if (priceId && rate) {
+      if (supportedAssetIds.includes((0, _utils._getTokenOnChainAssetId)(tokenInfo))) {
+        tokensList.push({
+          slug: tokenInfo.slug,
+          free: tokensHasBalanceInfoMap[tokenInfo.slug].free,
+          rate: rate.toString()
+        });
+      }
+    }
+  }));
+  return tokensList;
+}
+function batchExtrinsicSetFeeHydration(substrateApi, tx, feeSetting, assetId) {
+  const api = substrateApi.api;
+  const isSettingLocalFee = feeSetting && feeSetting !== 0;
+  const isAttendToSetLocalFee = assetId && assetId !== '0';
+  if (!tx) {
+    return tx;
+  }
+
+  // current native - set native
+  if (!isSettingLocalFee && !isAttendToSetLocalFee) {
+    return tx;
+  }
+
+  // current native - set local
+  if (!isSettingLocalFee && isAttendToSetLocalFee) {
+    return api.tx.utility.batchAll([api.tx.multiTransactionPayment.setCurrency(assetId), tx, api.tx.multiTransactionPayment.setCurrency('0')]);
+  }
+
+  // current local - set native
+  if (isSettingLocalFee && !isAttendToSetLocalFee) {
+    return api.tx.utility.batchAll([api.tx.multiTransactionPayment.setCurrency('0'), tx]);
+  }
+
+  // current local - set local
+  if (isSettingLocalFee && isAttendToSetLocalFee) {
+    if (assetId === feeSetting.toString()) {
+      // current local = set local
+      return api.tx.utility.batchAll([tx, api.tx.multiTransactionPayment.setCurrency('0')]);
+    } else {
+      // current local != set local
+      return api.tx.utility.batchAll([api.tx.multiTransactionPayment.setCurrency(assetId), tx, api.tx.multiTransactionPayment.setCurrency('0')]);
+    }
+  }
+  return tx;
+}
+async function getHydrationRate(address, hdx, desToken) {
+  var _subwalletApiSdk$swap;
+  const quoteRate = await ((_subwalletApiSdk$swap = _subwalletApiSdk.default.swapApi) === null || _subwalletApiSdk$swap === void 0 ? void 0 : _subwalletApiSdk$swap.getHydrationRate({
+    address,
+    pair: {
+      slug: `${hdx.slug}___${desToken.slug}`,
+      from: hdx.slug,
+      to: desToken.slug
+    }
+  }));
+  if (!quoteRate) {
+    return undefined;
+  } else {
+    const hdxDecimal = (0, _utils._getAssetDecimals)(hdx);
+    const desTokenDecimal = (0, _utils._getAssetDecimals)(desToken);
+    return new _bignumber.default(quoteRate).multipliedBy(10 ** (desTokenDecimal - hdxDecimal)).toFixed();
+  }
+}

package/cjs/services/request-service/handler/MetadataRequestHandler.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _helper = require("@subwallet/extension-base/services/request-service/helper");
 var _stores = require("@subwallet/extension-base/stores");
-var _getId = require("@subwallet/extension-base/utils/getId");
 var _extensionChains = require("@subwallet/extension-chains");
 var _rxjs = require("rxjs");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -52,6 +51,8 @@ class MetadataRequestHandler {
     this.metaSubject.next(this.allMetaRequests);
     this.#requestService.updateIconV2(shouldClose);
   }
+
+  // @ts-ignore
   metaComplete = (id, resolve, reject) => {
     const complete = () => {
       delete this.#metaRequests[id];
@@ -68,18 +69,9 @@ class MetadataRequestHandler {
       }
     };
   };
-  injectMetadata(url, request) {
-    return new Promise((resolve, reject) => {
-      const id = (0, _getId.getId)();
-      this.#metaRequests[id] = {
-        ...this.metaComplete(id, resolve, reject),
-        id,
-        request,
-        url
-      };
-      this.updateIconMeta();
-      this.#requestService.popupOpen();
-    });
+  injectMetadata(request) {
+    this.saveMetadata(request);
+    return true;
   }
   resetWallet() {
     for (const request of Object.values(this.#metaRequests)) {

package/cjs/services/request-service/index.js

@@ -87,8 +87,8 @@ class RequestService {
   get numMetaRequests() {
     return this.#metadataRequestHandler.numMetaRequests;
   }
-  injectMetadata(url, request) {
-    return this.#metadataRequestHandler.injectMetadata(url, request);
+  injectMetadata(request) {
+    return this.#metadataRequestHandler.injectMetadata(request);
   }
   getMetaRequest(id) {
     return this.#metadataRequestHandler.getMetaRequest(id);

package/cjs/services/transaction-service/index.js

@@ -97,8 +97,6 @@ class TransactionService {
       (0, _transfer.checkSupportForAction)(validationResponse, blockedActionsMap);
     }
     const transaction = transactionInput.transaction;
-    const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
-    const tokenPayFeeInfo = transactionInput.nonNativeTokenPayFeeSlug ? this.chainService.getAssetBySlug(transactionInput.nonNativeTokenPayFeeSlug) : undefined;
 
     // Check duplicated transaction
     validationResponse.errors.push(...this.checkDuplicate(transactionInput));
@@ -124,7 +122,12 @@ class TransactionService {
     // Estimate fee for transaction
     const id = (0, _getId.getId)();
     const feeInfo = await this.state.feeService.subscribeChainFee(id, chain, 'evm');
-    validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi, substrateApi, feeInfo, nativeTokenInfo, tokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee);
+    const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(chain);
+    const tokenPayFeeSlug = transactionInput.tokenPayFeeSlug;
+    const isNonNativeTokenPayFee = tokenPayFeeSlug && !(0, _utils2._isNativeTokenBySlug)(tokenPayFeeSlug);
+    const nonNativeTokenPayFeeInfo = isNonNativeTokenPayFee ? this.chainService.getAssetBySlug(tokenPayFeeSlug) : undefined;
+    const priceMap = (await this.state.priceService.getPrice()).priceMap;
+    validationResponse.estimateFee = await (0, _transfer.estimateFeeForTransaction)(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, transactionInput.isTransferLocalTokenAndPayThatTokenAsFee);
     const chainInfoMap = this.state.chainService.getChainInfoMap();
 
     // Check account signing transaction
@@ -1367,14 +1370,14 @@ class TransactionService {
       chain,
       feeCustom,
       id,
-      nonNativeTokenPayFeeSlug,
       signAfterCreate,
       step,
+      tokenPayFeeSlug,
       transaction,
       url
     } = _ref12;
     const tip = (feeCustom === null || feeCustom === void 0 ? void 0 : feeCustom.tip) || '0';
-    const feeAssetId = nonNativeTokenPayFeeSlug ? (_this$state$chainServ = this.state.chainService.getAssetBySlug(nonNativeTokenPayFeeSlug).metadata) === null || _this$state$chainServ === void 0 ? void 0 : _this$state$chainServ.multilocation : undefined;
+    const feeAssetId = tokenPayFeeSlug && !(0, _utils2._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain) ? (_this$state$chainServ = this.state.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$state$chainServ === void 0 ? void 0 : _this$state$chainServ.multilocation : undefined;
     const emitter = new _eventemitter.default();
     const eventData = {
       id,

package/cjs/utils/fee/transfer.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.detectTransferTxType = exports.calculateXCMMaxTransferable = exports.calculateTransferMaxTransferable = exports.calculateMaxTransferable = void 0;
+exports.detectTransferTxType = exports.calculateXcmMaxTransferable = exports.calculateTransferMaxTransferable = exports.calculateMaxTransferable = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
 var _consts = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/consts");
@@ -18,6 +18,7 @@ var _polygonBridge = require("@subwallet/extension-base/services/balance-service
 var _posBridge = require("@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/services/fee-service/utils");
+var _tokenPayFee = require("@subwallet/extension-base/services/fee-service/utils/tokenPayFee");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils3 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
@@ -57,7 +58,13 @@ const calculateMaxTransferable = async (id, request, freeBalance, fee) => {
   const isXcmTransfer = srcChain.slug !== destChain.slug;
   let maxTransferableAmount;
   if (isXcmTransfer) {
-    maxTransferableAmount = await calculateXCMMaxTransferable(id, request, freeBalance, fee);
+    const _request = {
+      // todo: temp not support pay local fee with xcm
+      ...request,
+      isTransferLocalTokenAndPayThatTokenAsFee: false,
+      isTransferNativeTokenAndPayLocalTokenAsFee: false
+    };
+    maxTransferableAmount = await calculateXcmMaxTransferable(id, _request, freeBalance, fee);
   } else {
     maxTransferableAmount = await calculateTransferMaxTransferable(id, request, freeBalance, fee);
   }
@@ -97,7 +104,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
       // todo: refactor: merge getERC20TransactionObject & getEVMTransactionObject
       // Estimate with EVM API
       if ((0, _utils._isTokenEvmSmartContract)(srcToken) || (0, _utils._isLocalToken)(srcToken)) {
-        [transaction] = await (0, _smartContract.getERC20TransactionObject)({
+        [transaction,, error] = await (0, _smartContract.getERC20TransactionObject)({
           assetAddress: (0, _utils._getContractAddressOfToken)(srcToken),
           chain: srcChain.slug,
           evmApi,
@@ -107,10 +114,11 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
           from: address,
           to: recipient,
           transferAll: false,
-          value: '0'
+          value: '0',
+          fallbackFee: true
         });
       } else {
-        [transaction] = await (0, _smartContract.getEVMTransactionObject)({
+        [transaction,, error] = await (0, _smartContract.getEVMTransactionObject)({
           chain: srcChain.slug,
           evmApi,
           feeCustom,
@@ -119,7 +127,8 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
           from: address,
           to: recipient,
           transferAll: false,
-          value: '0'
+          value: '0',
+          fallbackFee: true
         });
       }
     } else if ((0, _keyring.isTonAddress)(address) && (0, _utils._isTokenTransferredByTon)(srcToken)) {
@@ -240,9 +249,21 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
     console.warn('Unable to estimate fee', e);
   }
   if (isTransferLocalTokenAndPayThatTokenAsFee && feeChainType === 'substrate') {
-    const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
-    const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
-    maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+    if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(srcChain.slug)) {
+      const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
+      const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
+      maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+    } else if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(srcChain.slug)) {
+      const rate = await (0, _tokenPayFee.getHydrationRate)(address, nativeToken, srcToken);
+      if (rate) {
+        const estimatedFeeLocal = new _bignumber.default(estimatedFee).multipliedBy(rate).integerValue(_bignumber.default.ROUND_UP).toString();
+        maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+      } else {
+        throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
+      }
+    } else {
+      throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
+    }
   } else if (isTransferNativeTokenAndPayLocalTokenAsFee) {
     maxTransferable = (0, _bignumber.default)(freeBalance.value);
   } else {
@@ -261,7 +282,7 @@ const calculateTransferMaxTransferable = async (id, request, freeBalance, fee) =
   };
 };
 exports.calculateTransferMaxTransferable = calculateTransferMaxTransferable;
-const calculateXCMMaxTransferable = async (id, request, freeBalance, fee) => {
+const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
   const {
     address,
     destChain,
@@ -384,9 +405,21 @@ const calculateXCMMaxTransferable = async (id, request, freeBalance, fee) => {
   if (!destToken) {
     maxTransferable = _utils3.BN_ZERO;
   } else if (isTransferLocalTokenAndPayThatTokenAsFee && feeChainType === 'substrate') {
-    const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
-    const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
-    maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+    if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(srcChain.slug)) {
+      const estimatedFeeNative = (BigInt(estimatedFee) * BigInt(_utils2.FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString();
+      const estimatedFeeLocal = await (0, _utils2.calculateToAmountByReservePool)(substrateApi.api, nativeToken, srcToken, estimatedFeeNative);
+      maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+    } else if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(srcChain.slug)) {
+      const rate = await (0, _tokenPayFee.getHydrationRate)(address, nativeToken, srcToken);
+      if (rate) {
+        const estimatedFeeLocal = new _bignumber.default(estimatedFee).multipliedBy(rate).integerValue(_bignumber.default.ROUND_UP).toString();
+        maxTransferable = (0, _bignumber.default)(freeBalance.value).minus(estimatedFeeLocal);
+      } else {
+        throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
+      }
+    } else {
+      throw new Error(`Unable to estimate fee for ${srcChain.slug}.`);
+    }
   } else if (isTransferNativeTokenAndPayLocalTokenAsFee) {
     maxTransferable = (0, _bignumber.default)(freeBalance.value);
   } else {
@@ -404,4 +437,4 @@ const calculateXCMMaxTransferable = async (id, request, freeBalance, fee) => {
     error
   };
 };
-exports.calculateXCMMaxTransferable = calculateXCMMaxTransferable;
+exports.calculateXcmMaxTransferable = calculateXcmMaxTransferable;

package/constants/environment.js

@@ -4,4 +4,4 @@
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 export const isProductionMode = PRODUCTION_BRANCHES.indexOf(branchName) > -1;
-export const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://sw-services.subwallet.app/api'); // TODO: Rollback dev URL
+export const BACKEND_API_URL = process.env.SUBWALLET_API || (isProductionMode ? 'https://sw-services.subwallet.app/api' : 'https://be-dev.subwallet.app/api');

package/constants/index.d.ts

@@ -35,7 +35,12 @@ export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";
 export declare const ORDINAL_METHODS: string[];
 export declare const PERMISSIONS_TO_REVOKE: string[];
-export declare const ASSET_HUB_CHAIN_SLUGS: string[];
+export declare const _SUPPORT_TOKEN_PAY_FEE_GROUP: {
+    assetHub: string[];
+    hydration: string[];
+};
+export declare const getSupportTokenPayFeeChain: () => string[];
+export declare const isChainSupportTokenPayFee: (chainSlug: string) => boolean;
 export * from './blocked-actions';
 export * from './environment';
 export * from './signing';

package/constants/index.js

@@ -37,7 +37,20 @@ export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';
 export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
-export const ASSET_HUB_CHAIN_SLUGS = ['paseo_assethub', 'westend_assethub', 'rococo_assethub', 'statemine', 'statemint'];
+export const _SUPPORT_TOKEN_PAY_FEE_GROUP = {
+  assetHub: ['paseo_assethub', 'westend_assethub', 'rococo_assethub', 'statemine', 'statemint'],
+  hydration: ['hydradx_main', 'hydradx_rococo']
+};
+export const getSupportTokenPayFeeChain = () => {
+  return Object.values(_SUPPORT_TOKEN_PAY_FEE_GROUP).flat();
+};
+export const isChainSupportTokenPayFee = chainSlug => {
+  if (!chainSlug) {
+    console.error('You must provide chain slug!');
+    return false;
+  }
+  return getSupportTokenPayFeeChain().includes(chainSlug);
+};
 export * from "./blocked-actions.js";
 export * from "./environment.js";
 export * from "./signing.js";

package/core/logic-validation/transfer.d.ts

@@ -14,7 +14,7 @@ export declare function additionalValidateXcmTransfer(originTokenInfo: _ChainAss
 export declare function checkSupportForFeature(validationResponse: SWTransactionResponse, blockedFeaturesList: string[], chainInfo: _ChainInfo): void;
 export declare function checkSupportForAction(validationResponse: SWTransactionResponse, blockedActionsMap: Record<ExtrinsicType, string[]>): void;
 export declare function checkSupportForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction): void;
-export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi, substrateApi: _SubstrateApi, feeInfo: EvmFeeInfo, nativeTokenInfo: _ChainAsset, tokenPayFeeInfo: _ChainAsset | undefined, isTransferLocalTokenAndPayThatTokenAsFee: boolean | undefined): Promise<FeeData>;
+export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi, substrateApi: _SubstrateApi, priceMap: Record<string, number>, feeInfo: EvmFeeInfo, nativeTokenInfo: _ChainAsset, nonNativeTokenPayFeeInfo: _ChainAsset | undefined, isTransferLocalTokenAndPayThatTokenAsFee: boolean | undefined): Promise<FeeData>;
 export declare function checkSigningAccountForTransaction(validationResponse: SWTransactionResponse, chainInfoMap: Record<string, _ChainInfo>): void;
 export declare function checkBalanceWithTransactionFee(validationResponse: SWTransactionResponse, transactionInput: SWTransactionInput, nativeTokenInfo: _ChainAsset, nativeTokenAvailable: AmountData): void;
 export declare function checkTonAddressBounceableAndAccountNotActive(tonApi: _TonApi, validationResponse: SWTransactionResponse): Promise<void>;

package/core/logic-validation/transfer.js

@@ -4,12 +4,12 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
-import { LEDGER_SIGNING_COMPATIBLE_MAP, SIGNING_COMPATIBLE_MAP, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
+import { _SUPPORT_TOKEN_PAY_FEE_GROUP, LEDGER_SIGNING_COMPATIBLE_MAP, SIGNING_COMPATIBLE_MAP, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { _canAccountBeReaped, _isAccountActive } from '@subwallet/extension-base/core/substrate/system-pallet';
 import { getCardanoAssetId } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils';
 import { isBounceableAddress } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getAssetDecimals, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isCIP26Token, _isNativeToken, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetPriceId, _getAssetSymbol, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isCIP26Token, _isNativeToken, _isNativeTokenBySlug, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool, FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE } from '@subwallet/extension-base/services/fee-service/utils';
 import { isCardanoTransaction, isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, TransferTxErrorType } from '@subwallet/extension-base/types';
@@ -331,7 +331,7 @@ export function checkSupportForTransaction(validationResponse, transaction) {
     }
   }
 }
-export async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, feeInfo, nativeTokenInfo, tokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
+export async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, priceMap, feeInfo, nativeTokenInfo, nonNativeTokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
   const estimateFee = {
     symbol: '',
     decimals: 0,
@@ -377,11 +377,25 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
       }
     }
   }
-  if (tokenPayFeeInfo) {
+  const isCustomTokenPayFeeAssetHub = !!nonNativeTokenPayFeeInfo && _SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(nonNativeTokenPayFeeInfo.originChain);
+  const isCustomTokenPayFeeHydration = !!nonNativeTokenPayFeeInfo && _SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(nonNativeTokenPayFeeInfo.originChain);
+  if (isCustomTokenPayFeeAssetHub) {
     const estimatedFeeAmount = isTransferLocalTokenAndPayThatTokenAsFee ? (BigInt(estimateFee.value) * BigInt(FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString() : estimateFee.value;
-    estimateFee.decimals = tokenPayFeeInfo.decimals || 0;
-    estimateFee.symbol = tokenPayFeeInfo.symbol;
-    estimateFee.value = await calculateToAmountByReservePool(substrateApi.api, nativeTokenInfo, tokenPayFeeInfo, estimatedFeeAmount);
+    estimateFee.decimals = _getAssetDecimals(nonNativeTokenPayFeeInfo);
+    estimateFee.symbol = _getAssetSymbol(nonNativeTokenPayFeeInfo);
+    estimateFee.value = await calculateToAmountByReservePool(substrateApi.api, nativeTokenInfo, nonNativeTokenPayFeeInfo, estimatedFeeAmount);
+  }
+  if (isCustomTokenPayFeeHydration) {
+    const nativePriceId = _getAssetPriceId(nativeTokenInfo);
+    const nativeDecimals = _getAssetDecimals(nativeTokenInfo);
+    const nativePrice = priceMap[nativePriceId];
+    const tokenPriceId = _getAssetPriceId(nonNativeTokenPayFeeInfo);
+    const tokenDecimals = _getAssetDecimals(nonNativeTokenPayFeeInfo);
+    const tokenPrice = priceMap[tokenPriceId];
+    const rate = new BigN(nativePrice).div(tokenPrice).multipliedBy(10 ** (tokenDecimals - nativeDecimals)).toFixed();
+    estimateFee.decimals = _getAssetDecimals(nonNativeTokenPayFeeInfo);
+    estimateFee.symbol = _getAssetSymbol(nonNativeTokenPayFeeInfo);
+    estimateFee.value = new BigN(estimateFee.value).multipliedBy(rate).toFixed(0);
   }
   return estimateFee;
 }
@@ -421,10 +435,11 @@ export function checkBalanceWithTransactionFee(validationResponse, transactionIn
     edAsWarning,
     extrinsicType,
     isTransferAll,
-    nonNativeTokenPayFeeSlug,
-    skipFeeValidation
+    skipFeeValidation,
+    tokenPayFeeSlug
   } = transactionInput;
-  if (skipFeeValidation || nonNativeTokenPayFeeSlug) {
+  if (skipFeeValidation || tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug)) {
+    // todo: need improve: input should be balance of fee token and check this again
     return;
   }
   const bnFee = new BigN(validationResponse.estimateFee.value);