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

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

@@ -41,27 +41,27 @@ var _constants2 = require("@subwallet/extension-base/services/chain-service/cons
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _utils4 = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils5 = require("@subwallet/extension-base/services/fee-service/utils");
+var _tokenPayFee = require("@subwallet/extension-base/services/fee-service/utils/tokenPayFee");
 var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants4 = require("@subwallet/extension-base/services/setting-service/constants");
-var _utils6 = require("@subwallet/extension-base/services/swap-service/handler/asset-hub/utils");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _storage = require("@subwallet/extension-base/storage");
 var _stores = require("@subwallet/extension-base/stores");
 var _types3 = require("@subwallet/extension-base/types");
-var _utils7 = require("@subwallet/extension-base/utils");
+var _utils6 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
 var _types4 = require("@subwallet/keyring/types");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils8 = require("@walletconnect/utils");
+var _utils7 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _types5 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
-var _utils9 = require("../utils");
+var _utils8 = require("../utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -276,7 +276,7 @@ class KoniExtension {
     const accounts = keyringService.context.accounts;
     const transformedAccounts = Object.values(accounts);
     const responseData = {
-      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
+      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils6.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [],
       currentAccountProxy: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId
     };
     const accountProxyMapObservable = keyringService.context.observable.accounts;
@@ -290,7 +290,7 @@ class KoniExtension {
         currentAccount
       } = _ref7;
       const transformedAccounts = Object.values(accountProxies);
-      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils7.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
+      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [(0, _utils6.combineAllAccountProxy)(transformedAccounts), ...transformedAccounts] : [];
       responseData.currentAccountProxy = currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.proxyId;
       console.debug('subscriptionAccountGroups', responseData);
       cb(responseData);
@@ -311,10 +311,10 @@ class KoniExtension {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const combineFunction = async (chainInfoMap, accountProxyMap, _contacts) => {
       const accountProxies = Object.values(accountProxyMap);
-      const contacts = (0, _utils7.transformAddresses)(_contacts);
+      const contacts = (0, _utils6.transformAddresses)(_contacts);
       const chainInfo = chainInfoMap[chain];
       const substrateApi = this.#koniState.chainService.getSubstrateApi(chain);
-      const rs = await (0, _utils7._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
+      const rs = await (0, _utils6._analyzeAddress)(data, accountProxies, contacts, chainInfo, substrateApi);
       return {
         id,
         ...rs
@@ -354,7 +354,7 @@ class KoniExtension {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     let old = '';
     const subscription = this.#koniState.keyringService.context.observable.contacts.subscribe(subjectInfo => {
-      const addresses = (0, _utils7.transformAddresses)(subjectInfo);
+      const addresses = (0, _utils6.transformAddresses)(subjectInfo);
       const _new = JSON.stringify(addresses);
       if (old !== _new) {
         _cb({
@@ -371,7 +371,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.context.contacts;
     return {
-      addresses: (0, _utils7.transformAccounts)(subjectInfo)
+      addresses: (0, _utils6.transformAccounts)(subjectInfo)
     };
   }
 
@@ -384,7 +384,7 @@ class KoniExtension {
       chain
     } = _ref9;
     if ((0, _keyring.isAddress)(accountId)) {
-      const address = (0, _utils7.reformatAddress)(accountId);
+      const address = (0, _utils6.reformatAddress)(accountId);
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address, 'address');
       if (account) {
@@ -430,7 +430,7 @@ class KoniExtension {
       meta
     } = _ref10;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils7.reformatAddress)(address);
+      const _address = (0, _utils6.reformatAddress)(address);
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
@@ -446,7 +446,7 @@ class KoniExtension {
       address
     } = _ref11;
     if ((0, _keyring.isAddress)(address)) {
-      const _address = (0, _utils7.reformatAddress)(address);
+      const _address = (0, _utils6.reformatAddress)(address);
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
@@ -575,7 +575,7 @@ class KoniExtension {
   }
   getPairs() {
     const storedAccounts = this.#koniState.keyringService.context.pairs;
-    return (0, _utils7.transformAccounts)(storedAccounts);
+    return (0, _utils6.transformAccounts)(storedAccounts);
   }
   isAddressValidWithAuthType(address, accountAuthTypes) {
     const type = (0, _keyring.getKeypairTypeByAddress)(address);
@@ -1109,7 +1109,7 @@ class KoniExtension {
       const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address))));
+      cb(histories.filter(item => addresses.some(address => (0, _utils6.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -1118,7 +1118,7 @@ class KoniExtension {
     const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils7.isSameAddress)(item.address, address)));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils6.isSameAddress)(item.address, address)));
   }
   subscribeHistoryByChainAndAddress(_ref29, id, port) {
     let {
@@ -1174,8 +1174,8 @@ class KoniExtension {
       feeCustom,
       feeOption,
       from,
-      nonNativeTokenPayFeeSlug,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1188,7 +1188,9 @@ 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 && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain);
+    const isCustomTokenPayFeeHydration = tokenPayFeeSlug && !(0, _utils4._isNativeTokenBySlug)(tokenPayFeeSlug) && _constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(chain);
     const extrinsicType = isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN;
     let chainType = _KoniTypes.ChainType.SUBSTRATE;
     const transferAmount = {
@@ -1279,6 +1281,13 @@ class KoniExtension {
           to: to,
           substrateApi
         });
+        if (_constants._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 = (0, _tokenPayFee.batchExtrinsicSetFeeHydration)(substrateApi, transaction, feeSetting, hydrationFeeAssetId);
+        }
       }
     } catch (e) {
       const error = e;
@@ -1296,11 +1305,11 @@ 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((0, _utils7.reformatAddress)(from), chain, nonNativeTokenPayFeeSlug);
-        const nonNativeTokenPayFeeBalance = BigInt(nonNativeTokenPayFeeInfo[nonNativeTokenPayFeeSlug].free);
+        const nonNativeTokenPayFeeInfo = await this.#koniState.balanceService.getTokensHasBalance((0, _utils6.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.TransactionError(_types3.BasicTxErrorType.NOT_ENOUGH_BALANCE));
         }
@@ -1352,7 +1361,7 @@ class KoniExtension {
       chain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       chainType,
       transferNativeAmount,
       transaction,
@@ -1372,9 +1381,9 @@ class KoniExtension {
       feeOption,
       from,
       isPassConfirmation,
-      nonNativeTokenPayFeeSlug,
       originNetworkKey,
       to,
+      tokenPayFeeSlug,
       tokenSlug,
       transferAll,
       transferBounceable,
@@ -1394,7 +1403,7 @@ class KoniExtension {
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = (0, _posBridge._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) {
@@ -1434,6 +1443,14 @@ class KoniExtension {
         feeInfo
       };
       extrinsic = await funcCreateExtrinsic(params);
+      if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.hydration.includes(originNetworkKey)) {
+        var _this$koniState$chain2, _substrateApi$api$que2;
+        const hydrationFeeAssetId = tokenPayFeeSlug && ((_this$koniState$chain2 = this.#koniState.chainService.getAssetBySlug(tokenPayFeeSlug).metadata) === null || _this$koniState$chain2 === void 0 ? void 0 : _this$koniState$chain2.assetId);
+        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 = (0, _tokenPayFee.batchExtrinsicSetFeeHydration)(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
+      }
       additionalValidator = async inputTransaction => {
         const {
           value: senderTransferable
@@ -1492,7 +1509,7 @@ class KoniExtension {
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
       transferNativeAmount: (0, _utils4._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings,
-      nonNativeTokenPayFeeSlug,
+      tokenPayFeeSlug,
       isTransferAll: transferAll,
       isTransferLocalTokenAndPayThatTokenAsFee,
       isPassConfirmation,
@@ -1510,49 +1527,52 @@ class KoniExtension {
     } = request;
     const chainService = this.#koniState.chainService;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
-    const address = (0, _utils7.reformatAddress)(_address);
-
-    // ensure nativeTokenInfo and localTokenInfo have multi-location metadata beforehand to improve performance.
+    const address = (0, _utils6.reformatAddress)(_address);
     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 !== _types._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 (!_constants.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 (0, _utils6.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) {
-          tokensCanPayFee.push(tokenCanPayFee);
-        } else {
-          const amount = (0, _utils6.estimateTokensForPool)(feeAmount, reserve);
-          const liquidityError = (0, _utils6.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
-          if (!liquidityError) {
-            tokensCanPayFee.push(tokenCanPayFee);
-          }
+    let tokensCanPayFee = [nativeBalanceInfo];
+    let defaultTokenSlug = nativeBalanceInfo.slug;
+    if (_constants._SUPPORT_TOKEN_PAY_FEE_GROUP.assetHub.includes(chain)) {
+      tokensCanPayFee = await (0, _tokenPayFee.getAssetHubTokensCanPayFee)({
+        substrateApi,
+        chainService,
+        nativeTokenInfo,
+        nativeBalanceInfo,
+        tokensHasBalanceInfoMap,
+        feeAmount
+      });
+    } else if (_constants._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 (0, _tokenPayFee.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 {
@@ -1753,13 +1773,13 @@ class KoniExtension {
       destChain: _destChain,
       feeCustom,
       feeOption,
-      nonNativeTokenPayFeeSlug,
-      token
+      token,
+      tokenPayFeeSlug
     } = request;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(token);
-    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils4._isNativeToken)(transferTokenInfo) && !!nonNativeTokenPayFeeSlug && nonNativeTokenPayFeeSlug === token;
-    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils4._isNativeToken)(transferTokenInfo) && !!nonNativeTokenPayFeeSlug;
+    const isTransferLocalTokenAndPayThatTokenAsFee = !(0, _utils4._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && tokenPayFeeSlug === token;
+    const isTransferNativeTokenAndPayLocalTokenAsFee = (0, _utils4._isNativeToken)(transferTokenInfo) && !!tokenPayFeeSlug && !(0, _utils4._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);
@@ -1768,7 +1788,7 @@ class KoniExtension {
     const extrinsicType = srcChain.slug !== destChain.slug ? _KoniTypes.ExtrinsicType.TRANSFER_XCM : _KoniTypes.ExtrinsicType.TRANSFER_BALANCE;
     const freeBalanceSubject = new _rxjs.Subject();
     const feeSubject = new _rxjs.Subject();
-    const feeChainType = (0, _utils7.detectTransferTxType)(srcToken, srcChain, destChain);
+    const feeChainType = (0, _utils6.detectTransferTxType)(srcToken, srcChain, destChain);
     if (!destToken) {
       throw new Error('Destination token not found');
     }
@@ -1797,7 +1817,7 @@ class KoniExtension {
           fee,
           freeBalance
         } = _ref34;
-        (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
+        (0, _utils6.calculateMaxTransferable)(id, _request, freeBalance, fee).then(cb).catch(console.error);
       }
     });
     const [unsubBalance, freeBalance] = await (async () => {
@@ -1828,7 +1848,7 @@ class KoniExtension {
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return (0, _utils7.calculateMaxTransferable)(id, _request, freeBalance, fee);
+    return (0, _utils6.calculateMaxTransferable)(id, _request, freeBalance, fee);
   }
   async subscribeAddressTransferableBalance(_ref35, id, port) {
     let {
@@ -2093,7 +2113,7 @@ class KoniExtension {
       signed = await pair.evm.signMessage(data, 'personal_sign');
     } else {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
-      const tx = (0, _utils7.createTransactionFromRLP)(message);
+      const tx = (0, _utils6.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
@@ -2118,7 +2138,7 @@ class KoniExtension {
         common
       });
       const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evm.signTransaction(transaction)));
-      signed = (0, _utils7.signatureToHex)({
+      signed = (0, _utils6.signatureToHex)({
         r: ((_signedTranaction$r = signedTranaction.r) === null || _signedTranaction$r === void 0 ? void 0 : _signedTranaction$r.toString(16)) || '',
         s: ((_signedTranaction$s = signedTranaction.s) === null || _signedTranaction$s === void 0 ? void 0 : _signedTranaction$s.toString(16)) || '',
         v: ((_signedTranaction$v = signedTranaction.v) === null || _signedTranaction$v === void 0 ? void 0 : _signedTranaction$v.toString(16)) || ''
@@ -2552,11 +2572,11 @@ class KoniExtension {
     let registry = new _types5.TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      const allRegistry = [(0, _utils9.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils9.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils9.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
+      const allRegistry = [(0, _utils8.setupApiRegistry)(chainInfo, this.#koniState), (0, _utils8.setupDatabaseRegistry)(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), (0, _utils8.setupDappRegistry)(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
       if (allRegistry.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = (0, _utils9.getSuitableRegistry)(allRegistry, payload);
+        registry = (0, _utils8.getSuitableRegistry)(allRegistry, payload);
       }
     }
     const result = request.sign(registry, pair);
@@ -2852,12 +2872,12 @@ class KoniExtension {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
           if (unSupportChains.length) {
-            throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+            throw new Error((0, _utils7.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
           }
           availableNamespaces[key] = namespace;
         }
       } else {
-        throw new Error((0, _utils8.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+        throw new Error((0, _utils7.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
     Object.entries(optionalNamespaces).forEach(_ref55 => {
@@ -2892,7 +2912,7 @@ class KoniExtension {
           const [_namespace] = address.split(':');
           return _namespace === key;
         });
-        const chains = (0, _utils7.uniqueStringArray)(namespace.chains);
+        const chains = (0, _utils6.uniqueStringArray)(namespace.chains);
         namespaces[key] = {
           accounts,
           methods: namespace.methods,
@@ -2980,7 +3000,7 @@ 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(_constants2._DEFAULT_MANTA_ZK_CHAIN);
       this.#koniState.chainService.setMantaZkAssetSettings(true);
       const mnemonic = this.keyringExportMnemonic({
@@ -2999,7 +3019,7 @@ 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');
@@ -3030,32 +3050,32 @@ 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 || !_utils7.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 || !_utils6.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
       });
@@ -3094,7 +3114,7 @@ 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 = (0, _subscriptions.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 => {
@@ -3105,7 +3125,7 @@ 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
@@ -3290,7 +3310,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils7.reformatAddress)(address),
+          address: (0, _utils6.reformatAddress)(address),
           type: _types3.ProcessType.EARNING,
           combineInfo,
           currentStepId: step.stepId,
@@ -3763,7 +3783,7 @@ class KoniExtension {
         };
         await this.#koniState.transactionService.createProcessIfNeed({
           id: processId,
-          address: (0, _utils7.reformatAddress)(address),
+          address: (0, _utils6.reformatAddress)(address),
           type: _types3.ProcessType.SWAP,
           currentStepId: step.stepId,
           combineInfo,
@@ -3998,7 +4018,7 @@ class KoniExtension {
     if (!pair) {
       throw new Error('Pair not found');
     }
-    const signMode = (0, _utils7.getAccountSignMode)(address, pair.meta);
+    const signMode = (0, _utils6.getAccountSignMode)(address, pair.meta);
     if (signMode !== _types3.AccountSignMode.PASSWORD) {
       throw new Error('Account can not use this feature');
     }

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

@@ -131,8 +131,8 @@ 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/cjs/koni/background/handlers/Tabs.js

@@ -171,7 +171,7 @@ 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

package/cjs/packageInfo.js

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

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

@@ -23,6 +23,7 @@ async function getEVMTransactionObject(_ref) {
   let {
     chain,
     evmApi,
+    fallbackFee,
     feeCustom: _feeCustom,
     feeInfo: _feeInfo,
     feeOption,
@@ -34,13 +35,22 @@ async function getEVMTransactionObject(_ref) {
   const feeCustom = _feeCustom;
   const feeInfo = _feeInfo;
   const feeCombine = (0, _utils3.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) {
@@ -54,12 +64,14 @@ async function getEVMTransactionObject(_ref) {
     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];
 }
 async function getERC20TransactionObject(_ref2) {
   let {
     assetAddress,
+    chain,
     evmApi,
+    fallbackFee,
     feeCustom: _feeCustom,
     feeInfo: _feeInfo,
     feeOption,
@@ -72,6 +84,7 @@ async function getERC20TransactionObject(_ref2) {
   const feeCustom = _feeCustom;
   let freeAmount = new _bignumber.default(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();
@@ -86,6 +99,14 @@ async function getERC20TransactionObject(_ref2) {
   // 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 = (0, _utils3.combineEthFee)(feeInfo, feeOption, feeCustom);
@@ -101,7 +122,7 @@ async function getERC20TransactionObject(_ref2) {
     transferValue = freeAmount.toFixed(0);
     transactionObject.data = generateTransferData(to, transferValue);
   }
-  return [transactionObject, transferValue];
+  return [transactionObject, transferValue, errorOnEstimateFee];
 }
 async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId, _feeInfo) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument

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

@@ -219,6 +219,17 @@ class ChainService {
     });
     return assetHubToken;
   }
+  getHydrationAssetIdMap(chain) {
+    const hydrationAssetIdMap = {};
+    Object.values(this.getAssetRegistry()).forEach(asset => {
+      const originChain = (0, _utils._getAssetOriginChain)(asset);
+      const assetId = (0, _utils._getTokenOnChainAssetId)(asset);
+      if (originChain === chain && assetId !== '-1') {
+        hydrationAssetIdMap[asset.slug] = assetId;
+      }
+    });
+    return hydrationAssetIdMap;
+  }
   getChainInfoMap() {
     return this.dataMap.chainInfoMap;
   }