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

package/koni/background/handlers/Extension.js

@@ -8,7 +8,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ASSET_HUB_CHAIN_SLUGS, LATEST_SESSION } from '@subwallet/extension-base/constants';
+import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, LATEST_SESSION } from '@subwallet/extension-base/constants';
 import { additionalValidateTransferForRecipient, additionalValidateXcmTransfer, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
@@ -34,11 +34,11 @@ import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge }
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
 import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isNativeTokenBySlug, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByCardano, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool } from '@subwallet/extension-base/services/fee-service/utils';
+import { batchExtrinsicSetFeeHydration, getAssetHubTokensCanPayFee, getHydrationTokensCanPayFee } from '@subwallet/extension-base/services/fee-service/utils/tokenPayFee';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
-import { checkLiquidityForPool, estimateTokensForPool, getReserveForPool } from '@subwallet/extension-base/services/swap-service/handler/asset-hub/utils';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
@@ -1131,8 +1131,8 @@ export default class KoniExtension {
       feeCustom,
       feeOption,
       from,
-      nonNativeTokenPayFeeSlug,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1145,7 +1145,9 @@ export default class KoniExtension {
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(chain);
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
-    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && nonNativeTokenPayFeeSlug === tokenSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNativeToken && tokenPayFeeSlug === tokenSlug;
+    const isCustomTokenPayFeeAssetHub = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
+    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug) && _SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
     const extrinsicType = isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN;
     let chainType = ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1236,6 +1238,13 @@ export default class KoniExtension {
           to: to,
           substrateApi
         });
+        if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain)) {
+          var _this$koniState$chain, _substrateApi$api$que;
+          const hydrationFeeAssetId = tokenPayFeeSlug && ((_this$koniState$chain = this.#koniState.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$koniState$chain === void 0 ? void 0 : _this$koniState$chain.assetId);
+          const _feeSetting = await ((_substrateApi$api$que = substrateApi.api.query.multiTransactionPayment) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.accountCurrencyMap(from));
+          const feeSetting = _feeSetting.toPrimitive();
+          transaction = batchExtrinsicSetFeeHydration(substrateApi, transaction, feeSetting, hydrationFeeAssetId);
+        }
       }
     } catch (e) {
       const error = e;
@@ -1253,11 +1262,11 @@ export default class KoniExtension {
       }
 
       // Check enough free local to pay fee local
-      if (nonNativeTokenPayFeeSlug) {
-        var _inputTransaction$est;
+      if (isCustomTokenPayFeeAssetHub || isCustomTokenPayFeeHydration) {
+        var _inputTransaction$est, _nonNativeTokenPayFee;
         const nonNativeFee = BigInt(((_inputTransaction$est = inputTransaction.estimateFee) === null || _inputTransaction$est === void 0 ? void 0 : _inputTransaction$est.value) || '0'); // todo: estimateFee should be must-have, need to refactor interface
-        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance(reformatAddress(from), chain, nonNativeTokenPayFeeSlug);
-        const nonNativeTokenPayFeeBalance = BigInt(nonNativeTokenPayFeeInfo[nonNativeTokenPayFeeSlug].free);
+        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance(reformatAddress(from), chain, tokenPayFeeSlug);
+        const nonNativeTokenPayFeeBalance = BigInt(((_nonNativeTokenPayFee = nonNativeTokenPayFeeInfo[tokenPayFeeSlug]) === null || _nonNativeTokenPayFee === void 0 ? void 0 : _nonNativeTokenPayFee.free) || '0');
         if (nonNativeFee > nonNativeTokenPayFeeBalance) {
           inputTransaction.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
         }
@@ -1309,7 +1318,7 @@ export default class KoniExtension {
       chain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       chainType,
       transferNativeAmount,
       transaction,
@@ -1329,9 +1338,9 @@ export default class KoniExtension {
       feeOption,
       from,
       isPassConfirmation,
-      nonNativeTokenPayFeeSlug,
       originNetworkKey,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1351,7 +1360,7 @@ export default class KoniExtension {
     const isPolygonBridgeTransfer = _isPolygonChainBridge(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = _isPosChainBridge(originNetworkKey, destinationNetworkKey);
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
-    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === nonNativeTokenPayFeeSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
@@ -1391,6 +1400,14 @@ export default class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
+      if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(originNetworkKey)) {
+        var _this$koniState$chain2, _substrateApi$api$que2;
+        const hydrationFeeAssetId = tokenPayFeeSlug && ((_this$koniState$chain2 = this.#koniState.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$koniState$chain2 === void 0 ? void 0 : _this$koniState$chain2.assetId);
+        const _feeSetting = await ((_substrateApi$api$que2 = substrateApi.api.query.multiTransactionPayment) === null || _substrateApi$api$que2 === void 0 ? void 0 : _substrateApi$api$que2.accountCurrencyMap(from));
+        const feeSetting = _feeSetting.toPrimitive();
+        const _extrinsic = extrinsic;
+        extrinsic = batchExtrinsicSetFeeHydration(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
+      }
       additionalValidator = async inputTransaction => {
         const {
           value: senderTransferable
@@ -1449,7 +1466,7 @@ export default class KoniExtension {
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       isTransferAll: transferAll,
       isTransferLocalTokenAndPayThatTokenAsFee,
       isPassConfirmation,
@@ -1468,48 +1485,51 @@ export default class KoniExtension {
     const chainService = this.#koniState.chainService;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const address = reformatAddress(_address);
-
-    // ensure nativeTokenInfo and localTokenInfo have multi-location metadata beforehand to improve performance.
     const tokensHasBalanceInfoMap = await this.#koniState.balanceService.getTokensHasBalance(address, chain);
-    const tokensHasBalanceSlug = Object.keys(tokensHasBalanceInfoMap);
-    const tokenInfos = tokensHasBalanceSlug.map(tokenSlug => chainService.getAssetBySlug(tokenSlug)).filter(token => token.originChain === chain && token.assetType !== _AssetType.NATIVE && token.metadata && token.metadata.multilocation);
     const nativeTokenInfo = chainService.getNativeTokenInfo(chain);
-    const nativeTokenBalanceInfo = {
+    const nativeBalanceInfo = {
       slug: nativeTokenInfo.slug,
       free: ((_tokensHasBalanceInfo = tokensHasBalanceInfoMap[nativeTokenInfo.slug]) === null || _tokensHasBalanceInfo === void 0 ? void 0 : _tokensHasBalanceInfo.free) || '0',
       rate: '1'
     };
-    const tokensCanPayFee = [nativeTokenBalanceInfo];
-    if (!ASSET_HUB_CHAIN_SLUGS.includes(chain) || !nativeTokenInfo.metadata || !nativeTokenInfo.metadata.multilocation) {
-      return tokensCanPayFee;
-    }
-    await Promise.all(tokenInfos.map(async tokenInfo => {
-      try {
-        const tokenSlug = tokenInfo.slug;
-        const reserve = await getReserveForPool(substrateApi.api, nativeTokenInfo, tokenInfo);
-        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-          return;
-        }
-        const rate = new BigN(reserve[1]).div(reserve[0]).toFixed();
-        const tokenCanPayFee = {
-          slug: tokenSlug,
-          free: tokensHasBalanceInfoMap[tokenSlug].free,
-          rate
-        };
-        if (feeAmount === undefined) {
-          tokensCanPayFee.push(tokenCanPayFee);
-        } else {
-          const amount = estimateTokensForPool(feeAmount, reserve);
-          const liquidityError = checkLiquidityForPool(amount, reserve[0], reserve[1]);
-          if (!liquidityError) {
-            tokensCanPayFee.push(tokenCanPayFee);
-          }
+    let tokensCanPayFee = [nativeBalanceInfo];
+    let defaultTokenSlug = nativeBalanceInfo.slug;
+    if (_SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain)) {
+      tokensCanPayFee = await getAssetHubTokensCanPayFee({
+        substrateApi,
+        chainService,
+        nativeTokenInfo,
+        nativeBalanceInfo,
+        tokensHasBalanceInfoMap,
+        feeAmount
+      });
+    } else if (_SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain)) {
+      const _assetId = await substrateApi.api.query.multiTransactionPayment.accountCurrencyMap(address);
+      const assetId = _assetId.toPrimitive();
+      const hydrationAssets = this.#koniState.chainService.getHydrationAssetIdMap(chain);
+      for (const [key, value] of Object.entries(hydrationAssets)) {
+        if (assetId && assetId.toString() === value) {
+          defaultTokenSlug = key;
+          break;
         }
-      } catch (e) {
-        console.error('error when fetching pool with token', tokenInfo.slug, e);
       }
-    }));
-    return tokensCanPayFee;
+      tokensCanPayFee = await getHydrationTokensCanPayFee({
+        substrateApi,
+        chainService,
+        nativeTokenInfo,
+        nativeBalanceInfo,
+        tokensHasBalanceInfoMap,
+        address,
+        feeAmount
+      });
+      if (!tokensCanPayFee.map(token => token.slug).includes(defaultTokenSlug)) {
+        defaultTokenSlug = nativeBalanceInfo.slug;
+      }
+    }
+    return {
+      tokensCanPayFee,
+      defaultTokenSlug
+    };
   }
   async getAmountForPair(request) {
     const {
@@ -1706,13 +1726,13 @@ export default class KoniExtension {
       destChain: _destChain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
-      token
+      token,
+      tokenPayFeeSlug
     } = request;
     const cb = createSubscription(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
-    const isTransferLocalTokenAndPayThatTokenAsFee = !_isNativeToken(transferTokenInfo) && !!nonNativeTokenPayFeeSlug && nonNativeTokenPayFeeSlug === token;
-    const isTransferNativeTokenAndPayLocalTokenAsFee = _isNativeToken(transferTokenInfo) && !!nonNativeTokenPayFeeSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !_isNativeToken(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
+    const isTransferNativeTokenAndPayLocalTokenAsFee = _isNativeToken(transferTokenInfo) && !!tokenPayFeeSlug && !_isNativeTokenBySlug(tokenPayFeeSlug);
     const srcToken = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(chain);
     const destToken = _destChain !== chain ? this.#koniState.getXcmEqualAssetByChain(_destChain, srcToken.slug) : srcToken;
     const srcChain = this.#koniState.chainService.getChainInfoByKey(chain);
@@ -2905,7 +2925,7 @@ export default class KoniExtension {
       return new Promise(resolve => setTimeout(resolve, 1500));
     }
     try {
-      var _this$koniState$chain, _this$koniState$chain2;
+      var _this$koniState$chain3, _this$koniState$chain4;
       await this.#koniState.chainService.enableChain(_DEFAULT_MANTA_ZK_CHAIN);
       this.#koniState.chainService.setMantaZkAssetSettings(true);
       const mnemonic = this.keyringExportMnemonic({
@@ -2924,7 +2944,7 @@ export default class KoniExtension {
       await this.saveCurrentAccountProxy({
         address
       });
-      const unsubSyncProgress = await ((_this$koniState$chain = this.#koniState.chainService) === null || _this$koniState$chain === void 0 ? void 0 : (_this$koniState$chain2 = _this$koniState$chain.mantaPay) === null || _this$koniState$chain2 === void 0 ? void 0 : _this$koniState$chain2.subscribeSyncProgress());
+      const unsubSyncProgress = await ((_this$koniState$chain3 = this.#koniState.chainService) === null || _this$koniState$chain3 === void 0 ? void 0 : (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) === null || _this$koniState$chain4 === void 0 ? void 0 : _this$koniState$chain4.subscribeSyncProgress());
       console.debug('Start initial sync for MantaPay');
       this.#koniState.initialSyncMantaPay(address).then(() => {
         console.debug('Finished initial sync for MantaPay');
@@ -2955,32 +2975,32 @@ export default class KoniExtension {
     }
   }
   async initSyncMantaPay(address) {
-    var _this$koniState$chain3, _this$koniState$chain4, _this$koniState$chain5, _this$koniState$chain6;
-    if ((_this$koniState$chain3 = this.#koniState.chainService) !== null && _this$koniState$chain3 !== void 0 && (_this$koniState$chain4 = _this$koniState$chain3.mantaPay) !== null && _this$koniState$chain4 !== void 0 && _this$koniState$chain4.getSyncState().isSyncing || !MODULE_SUPPORT.MANTA_ZK) {
+    var _this$koniState$chain5, _this$koniState$chain6, _this$koniState$chain7, _this$koniState$chain8;
+    if ((_this$koniState$chain5 = this.#koniState.chainService) !== null && _this$koniState$chain5 !== void 0 && (_this$koniState$chain6 = _this$koniState$chain5.mantaPay) !== null && _this$koniState$chain6 !== void 0 && _this$koniState$chain6.getSyncState().isSyncing || !MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
     await this.saveCurrentAccountProxy({
       address
     });
-    const unsubSyncProgress = await ((_this$koniState$chain5 = this.#koniState.chainService) === null || _this$koniState$chain5 === void 0 ? void 0 : (_this$koniState$chain6 = _this$koniState$chain5.mantaPay) === null || _this$koniState$chain6 === void 0 ? void 0 : _this$koniState$chain6.subscribeSyncProgress());
+    const unsubSyncProgress = await ((_this$koniState$chain7 = this.#koniState.chainService) === null || _this$koniState$chain7 === void 0 ? void 0 : (_this$koniState$chain8 = _this$koniState$chain7.mantaPay) === null || _this$koniState$chain8 === void 0 ? void 0 : _this$koniState$chain8.subscribeSyncProgress());
     console.debug('Start initial sync for MantaPay');
     this.#koniState.initialSyncMantaPay(address).then(() => {
-      var _this$koniState$chain7, _this$koniState$chain8;
+      var _this$koniState$chain9, _this$koniState$chain10;
       console.debug('Finished initial sync for MantaPay');
       this.#skipAutoLock = false;
       unsubSyncProgress && unsubSyncProgress();
       // make sure the sync state is set, just in case it gets unsubscribed
-      (_this$koniState$chain7 = this.#koniState.chainService) === null || _this$koniState$chain7 === void 0 ? void 0 : (_this$koniState$chain8 = _this$koniState$chain7.mantaPay) === null || _this$koniState$chain8 === void 0 ? void 0 : _this$koniState$chain8.setSyncState({
+      (_this$koniState$chain9 = this.#koniState.chainService) === null || _this$koniState$chain9 === void 0 ? void 0 : (_this$koniState$chain10 = _this$koniState$chain9.mantaPay) === null || _this$koniState$chain10 === void 0 ? void 0 : _this$koniState$chain10.setSyncState({
         progress: 100,
         isSyncing: false
       });
     }).catch(e => {
-      var _this$koniState$chain9, _this$koniState$chain10;
+      var _this$koniState$chain11, _this$koniState$chain12;
       console.error('Error syncing MantaPay', e);
       this.#skipAutoLock = false;
       unsubSyncProgress && unsubSyncProgress();
-      (_this$koniState$chain9 = this.#koniState.chainService) === null || _this$koniState$chain9 === void 0 ? void 0 : (_this$koniState$chain10 = _this$koniState$chain9.mantaPay) === null || _this$koniState$chain10 === void 0 ? void 0 : _this$koniState$chain10.setSyncState({
+      (_this$koniState$chain11 = this.#koniState.chainService) === null || _this$koniState$chain11 === void 0 ? void 0 : (_this$koniState$chain12 = _this$koniState$chain11.mantaPay) === null || _this$koniState$chain12 === void 0 ? void 0 : _this$koniState$chain12.setSyncState({
         progress: 0,
         isSyncing: false
       });
@@ -3018,7 +3038,7 @@ export default class KoniExtension {
     return this.#koniState.getMantaPayConfig('calamari');
   }
   subscribeMantaPaySyncState(id, port) {
-    var _this$koniState$subsc, _this$koniState$chain11, _this$koniState$chain12;
+    var _this$koniState$subsc, _this$koniState$chain13, _this$koniState$chain14;
     const cb = createSubscription(id, port);
     const syncingStateSubscription = (_this$koniState$subsc = this.#koniState.subscribeMantaPaySyncState()) === null || _this$koniState$subsc === void 0 ? void 0 : _this$koniState$subsc.subscribe({
       next: rs => {
@@ -3029,7 +3049,7 @@ export default class KoniExtension {
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return ((_this$koniState$chain11 = this.#koniState.chainService) === null || _this$koniState$chain11 === void 0 ? void 0 : (_this$koniState$chain12 = _this$koniState$chain11.mantaPay) === null || _this$koniState$chain12 === void 0 ? void 0 : _this$koniState$chain12.getSyncState()) || {
+    return ((_this$koniState$chain13 = this.#koniState.chainService) === null || _this$koniState$chain13 === void 0 ? void 0 : (_this$koniState$chain14 = _this$koniState$chain13.mantaPay) === null || _this$koniState$chain14 === void 0 ? void 0 : _this$koniState$chain14.getSyncState()) || {
       isSyncing: false,
       progress: 0,
       needManualSync: false

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

@@ -83,7 +83,7 @@ export default class KoniState {
     private waitStarting;
     constructor(providers?: Providers);
     get knownMetadata(): MetadataDef[];
-    injectMetadata(url: string, request: MetadataDef): Promise<boolean>;
+    injectMetadata(request: MetadataDef): boolean;
     getMetaRequest(id: string): MetaRequest;
     getSignRequest(id: string): SignRequest | undefined;
     rpcListProviders(): Promise<ResponseRpcListProviders>;

package/koni/background/handlers/State.js

@@ -124,8 +124,8 @@ export default class KoniState {
   get knownMetadata() {
     return this.requestService.knownMetadata;
   }
-  injectMetadata(url, request) {
-    return this.requestService.injectMetadata(url, request);
+  injectMetadata(request) {
+    return this.requestService.injectMetadata(request);
   }
   getMetaRequest(id) {
     return this.requestService.getMetaRequest(id);

package/koni/background/handlers/Tabs.js

@@ -147,7 +147,7 @@ export default class KoniTabs {
     }
   }
   metadataProvide(url, request) {
-    return this.#koniState.injectMetadata(url, request);
+    return this.#koniState.injectMetadata(request);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -505,11 +505,12 @@ export default class KoniTabs {
     } else {
       const onlineData = await getEVMChainInfo(chainIdDec);
       if (onlineData) {
+        var _onlineData$explorers;
         const chainData = {
           chainId: chainId,
           rpcUrls: onlineData.rpc.filter(url => url.startsWith('https://')),
           chainName: onlineData.name,
-          blockExplorerUrls: onlineData.explorers.map(explorer => explorer.url),
+          blockExplorerUrls: (_onlineData$explorers = onlineData.explorers) === null || _onlineData$explorers === void 0 ? void 0 : _onlineData$explorers.map(explorer => explorer.url),
           nativeCurrency: onlineData.nativeCurrency,
           requestId: id
         };
@@ -518,7 +519,7 @@ export default class KoniTabs {
           params: [chainData]
         });
       } else {
-        throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'This network is currently not supported');
+        throw new EvmProviderError(EvmProviderErrorType.NETWORK_NOT_SUPPORTED, 'This network is currently not supported');
       }
     }
     return null;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.23-0",
+  "version": "1.3.25-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1076,6 +1076,11 @@
       "require": "./cjs/services/earning-service/handlers/native-staking/base-para.js",
       "default": "./services/earning-service/handlers/native-staking/base-para.js"
     },
+    "./services/earning-service/handlers/native-staking/dtao": {
+      "types": "./services/earning-service/handlers/native-staking/dtao.d.ts",
+      "require": "./cjs/services/earning-service/handlers/native-staking/dtao.js",
+      "default": "./services/earning-service/handlers/native-staking/dtao.js"
+    },
     "./services/earning-service/handlers/native-staking/mythos": {
       "types": "./services/earning-service/handlers/native-staking/mythos.d.ts",
       "require": "./cjs/services/earning-service/handlers/native-staking/mythos.js",
@@ -1146,6 +1151,11 @@
       "require": "./cjs/services/fee-service/utils/index.js",
       "default": "./services/fee-service/utils/index.js"
     },
+    "./services/fee-service/utils/tokenPayFee": {
+      "types": "./services/fee-service/utils/tokenPayFee.d.ts",
+      "require": "./cjs/services/fee-service/utils/tokenPayFee.js",
+      "default": "./services/fee-service/utils/tokenPayFee.js"
+    },
     "./services/history-service": {
       "types": "./services/history-service/index.d.ts",
       "require": "./cjs/services/history-service/index.js",
@@ -2655,12 +2665,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.101",
-    "@subwallet/extension-base": "^1.3.23-0",
-    "@subwallet/extension-chains": "^1.3.23-0",
-    "@subwallet/extension-dapp": "^1.3.23-0",
-    "@subwallet/extension-inject": "^1.3.23-0",
+    "@subwallet/extension-base": "^1.3.25-0",
+    "@subwallet/extension-chains": "^1.3.25-0",
+    "@subwallet/extension-dapp": "^1.3.25-0",
+    "@subwallet/extension-inject": "^1.3.25-0",
     "@subwallet/keyring": "^0.1.9",
-    "@subwallet/subwallet-api-sdk": "^1.3.23-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.25-0",
     "@subwallet/ui-keyring": "^0.1.9",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.23-0'
+  version: '1.3.25-0'
 };

package/page/index.js

@@ -61,7 +61,7 @@ export function handleResponse(data) {
     // eslint-disable-next-line @typescript-eslint/ban-types
     handler.subscriber(data.subscription);
   } else if (data.error) {
-    handler.reject(new ProviderError(ProviderErrorType.INTERNAL_ERROR, data.error, data.errorCode));
+    handler.reject(new ProviderError(ProviderErrorType.INTERNAL_ERROR, data.error, data.errorCode, data.errorCode));
   } else {
     handler.resolve(data.response);
   }

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -15,7 +15,7 @@ import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/cont
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/contract-handler/wasm/utils';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getAssetExistentialDeposit, _getChainExistentialDeposit, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getTokenTypesSupportedByChain, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
-import { getTaoToAlphaMapping } from '@subwallet/extension-base/services/earning-service/handlers/native-staking/tao';
+import { getTaoToAlphaMapping } from '@subwallet/extension-base/services/earning-service/handlers/native-staking/dtao';
 import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { subscribeERC20Interval } from "../evm.js";
@@ -131,7 +131,7 @@ const subscribeWithSystemAccountPallet = async ({
     });
   }
   let bittensorStakingBalances = new Array(addresses.length).fill(new BigN(0));
-  if (['bittensor'].includes(chainInfo.slug)) {
+  if (['bittensor', 'bittensor_testnet'].includes(chainInfo.slug)) {
     bittensorStakingBalances = await Promise.all(addresses.map(async address => {
       const stakeInfo = (await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkey(address)).toJSON();
       const price = await getTaoToAlphaMapping(substrateApi);

package/services/balance-service/transfer/smart-contract.d.ts

@@ -9,9 +9,10 @@ interface TransferEvmProps extends TransactionFee {
     transferAll: boolean;
     value: string;
     evmApi: _EvmApi;
+    fallbackFee?: boolean;
 }
-export declare function getEVMTransactionObject({ chain, evmApi, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferEvmProps): Promise<[TransactionConfig, string]>;
-export declare function getERC20TransactionObject({ assetAddress, evmApi, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferERC20Props): Promise<[TransactionConfig, string]>;
+export declare function getEVMTransactionObject({ chain, evmApi, fallbackFee, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferEvmProps): Promise<[TransactionConfig, string, string]>;
+export declare function getERC20TransactionObject({ assetAddress, chain, evmApi, fallbackFee, feeCustom: _feeCustom, feeInfo: _feeInfo, feeOption, from, to, transferAll, value }: TransferERC20Props): Promise<[TransactionConfig, string, string]>;
 interface TransferERC20Props extends TransactionFee {
     assetAddress: string;
     chain: string;
@@ -21,6 +22,7 @@ interface TransferERC20Props extends TransactionFee {
     to: string;
     transferAll: boolean;
     value: string;
+    fallbackFee?: boolean;
 }
 export declare function getERC721Transaction(web3Api: _EvmApi, chain: string, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string, _feeInfo: FeeInfo): Promise<TransactionConfig>;
 export declare function getPSP34TransferExtrinsic(substrateApi: _SubstrateApi, senderAddress: string, recipientAddress: string, params: Record<string, any>): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult> | null>;

package/services/balance-service/transfer/smart-contract.js

@@ -12,6 +12,7 @@ import { t } from 'i18next';
 export async function getEVMTransactionObject({
   chain,
   evmApi,
+  fallbackFee,
   feeCustom: _feeCustom,
   feeInfo: _feeInfo,
   feeOption,
@@ -23,13 +24,22 @@ export async function getEVMTransactionObject({
   const feeCustom = _feeCustom;
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
+  let errorOnEstimateFee = '';
   const transactionObject = {
     to: to,
     value: value,
     from: from,
     ...feeCombine
   };
-  const gasLimit = await evmApi.api.eth.estimateGas(transactionObject);
+  const gasLimit = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
+    console.log('Cannot estimate fee with native transfer on', chain, e);
+    if (fallbackFee) {
+      errorOnEstimateFee = e.message;
+      return 21000;
+    } else {
+      throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
+    }
+  });
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (feeCombine.maxFeePerGas) {
@@ -43,11 +53,13 @@ export async function getEVMTransactionObject({
     const numberReplace = 18 - 12;
     transactionObject.value = transactionObject.value.substring(0, transactionObject.value.length - 6) + new Array(numberReplace).fill('0').join('');
   }
-  return [transactionObject, transactionObject.value.toString()];
+  return [transactionObject, transactionObject.value.toString(), errorOnEstimateFee];
 }
 export async function getERC20TransactionObject({
   assetAddress,
+  chain,
   evmApi,
+  fallbackFee,
   feeCustom: _feeCustom,
   feeInfo: _feeInfo,
   feeOption,
@@ -60,6 +72,7 @@ export async function getERC20TransactionObject({
   const feeCustom = _feeCustom;
   let freeAmount = new BigN(0);
   let transferValue = value;
+  let errorOnEstimateFee = '';
   if (transferAll) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     const bal = await erc20Contract.methods.balanceOf(from).call();
@@ -74,6 +87,14 @@ export async function getERC20TransactionObject({
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   const gasLimit = await erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
+  }).catch(e => {
+    console.log('Cannot estimate fee with token contract', assetAddress, chain, e);
+    if (fallbackFee) {
+      errorOnEstimateFee = e.message;
+      return 70000;
+    } else {
+      throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
+    }
   });
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
@@ -89,7 +110,7 @@ export async function getERC20TransactionObject({
     transferValue = freeAmount.toFixed(0);
     transactionObject.data = generateTransferData(to, transferValue);
   }
-  return [transactionObject, transferValue];
+  return [transactionObject, transferValue, errorOnEstimateFee];
 }
 export async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId, _feeInfo) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument

package/services/buy-service/constants/token.js

@@ -20,5 +20,8 @@ export const DEFAULT_SERVICE_INFO = {
   },
   moonpay: {
     ...DEFAULT_BUY_SERVICE
+  },
+  meld: {
+    ...DEFAULT_BUY_SERVICE
   }
 };

package/services/chain-service/index.d.ts

@@ -72,6 +72,7 @@ export declare class ChainService {
     getMultiChainAssetMap(): Record<string, _MultiChainAsset>;
     getSmartContractTokens(): Record<string, _ChainAsset>;
     getAssetHubToken(): Record<string, _ChainAsset>;
+    getHydrationAssetIdMap(chain: string): Record<string, string>;
     getChainInfoMap(): Record<string, _ChainInfo>;
     setChainInfoMap(chainInfoMap: Record<string, _ChainInfo>): void;
     getEvmChainInfoMap(): Record<string, _ChainInfo>;

package/services/chain-service/index.js

@@ -11,7 +11,7 @@ import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-
 import { TonChainHandler } from '@subwallet/extension-base/services/chain-service/handler/TonChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetOriginChain, _getTokenOnChainAssetId, _isAssetAutoEnable, _isAssetCanPayTxFee, _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isLocalToken, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey, randomizeProvider, updateLatestChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { MYTHOS_MIGRATION_KEY } from '@subwallet/extension-base/services/migration-service/scripts';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
 import { addLazy, calculateMetadataHash, fetchStaticData, filterAssetsByChainAndType, getShortMetadata, MODULE_SUPPORT } from '@subwallet/extension-base/utils';
@@ -203,6 +203,17 @@ export class ChainService {
     });
     return assetHubToken;
   }
+  getHydrationAssetIdMap(chain) {
+    const hydrationAssetIdMap = {};
+    Object.values(this.getAssetRegistry()).forEach(asset => {
+      const originChain = _getAssetOriginChain(asset);
+      const assetId = _getTokenOnChainAssetId(asset);
+      if (originChain === chain && assetId !== '-1') {
+        hydrationAssetIdMap[asset.slug] = assetId;
+      }
+    });
+    return hydrationAssetIdMap;
+  }
   getChainInfoMap() {
     return this.dataMap.chainInfoMap;
   }

package/services/earning-service/constants/chains.js

@@ -17,7 +17,7 @@ export const _STAKING_CHAIN_GROUP = {
   lending: ['interlay'],
   krest_network: ['krest_network'],
   manta: ['manta_network'],
-  bittensor: ['bittensor', 'bittensor_devnet'],
+  bittensor: ['bittensor', 'bittensor_testnet'],
   mythos: ['mythos', 'muse_testnet']
 };
 export const TON_CHAINS = ['ton', 'ton_testnet'];