@subwallet/extension-base 1.2.2-0 → 1.2.3-1

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

@@ -8,45 +8,42 @@ exports.default = exports.SEED_LENGTHS = exports.SEED_DEFAULT_LENGTH = void 0;
 exports.isJsonPayload = isJsonPayload;
 var _common = require("@ethereumjs/common");
 var _tx = require("@ethereumjs/tx");
-var _types = require("@subwallet/chain-list/types");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
 var _subscriptions = require("@subwallet/extension-base/background/handlers/subscriptions");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _constants = require("@subwallet/extension-base/constants");
+var _transfer = require("@subwallet/extension-base/core/logic-validation/transfer");
 var _defaults = require("@subwallet/extension-base/defaults");
 var _domain = require("@subwallet/extension-base/koni/api/dotsama/domain");
 var _parseTransaction = require("@subwallet/extension-base/koni/api/dotsama/parseTransaction");
-var _transfer = require("@subwallet/extension-base/koni/api/dotsama/transfer");
-var _transfer2 = require("@subwallet/extension-base/koni/api/nft/transfer");
+var _transfer2 = require("@subwallet/extension-base/koni/api/dotsama/transfer");
+var _transfer3 = require("@subwallet/extension-base/koni/api/nft/transfer");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/bonding/paraChain");
 var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
-var _transfer3 = require("@subwallet/extension-base/koni/api/tokens/evm/transfer");
+var _transfer4 = require("@subwallet/extension-base/koni/api/tokens/evm/transfer");
 var _wasm = require("@subwallet/extension-base/koni/api/tokens/wasm");
 var _xcm = require("@subwallet/extension-base/koni/api/xcm");
 var _utils = require("@subwallet/extension-base/koni/api/yield/helper/utils");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
-var _types2 = require("@subwallet/extension-base/services/chain-service/types");
+var _types = require("@subwallet/extension-base/services/chain-service/types");
 var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
 var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants4 = require("@subwallet/extension-base/services/setting-service/constants");
 var _constants5 = require("@subwallet/extension-base/services/wallet-connect-service/constants");
 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 _utils4 = require("@subwallet/extension-base/utils");
+var _types2 = require("@subwallet/extension-base/types");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
-var _number = require("@subwallet/extension-base/utils/number");
 var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
-var _utils5 = require("@walletconnect/utils");
+var _utils4 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
-var _types4 = require("@polkadot/types");
+var _types3 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -566,7 +563,7 @@ class KoniExtension {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     let old = '';
     const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
-      const addresses = (0, _utils4.convertSubjectInfoToAddresses)(subjectInfo);
+      const addresses = (0, _utils3.convertSubjectInfoToAddresses)(subjectInfo);
       const _new = JSON.stringify(addresses);
       if (old !== _new) {
         _cb({
@@ -581,7 +578,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.addresses;
     return {
-      addresses: (0, _utils4.convertSubjectInfoToAddresses)(subjectInfo)
+      addresses: (0, _utils3.convertSubjectInfoToAddresses)(subjectInfo)
     };
   }
   saveRecentAccount(_ref22) {
@@ -590,7 +587,7 @@ class KoniExtension {
       chain
     } = _ref22;
     if ((0, _utilCrypto.isAddress)(accountId)) {
-      const address = (0, _utils4.reformatAddress)(accountId);
+      const address = (0, _utils3.reformatAddress)(accountId);
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address, 'address');
       if (account) {
@@ -632,7 +629,7 @@ class KoniExtension {
       meta
     } = _ref23;
     if ((0, _utilCrypto.isAddress)(address)) {
-      const _address = (0, _utils4.reformatAddress)(address);
+      const _address = (0, _utils3.reformatAddress)(address);
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
@@ -644,7 +641,7 @@ class KoniExtension {
       address
     } = _ref24;
     if ((0, _utilCrypto.isAddress)(address)) {
-      const _address = (0, _utils4.reformatAddress)(address);
+      const _address = (0, _utils3.reformatAddress)(address);
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
@@ -1574,7 +1571,7 @@ class KoniExtension {
       const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.some(address => (0, _utils4.isSameAddress)(item.address, address))));
+      cb(histories.filter(item => addresses.some(address => (0, _utils3.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
@@ -1583,7 +1580,7 @@ class KoniExtension {
     const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils4.isSameAddress)(item.address, address)));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils3.isSameAddress)(item.address, address)));
   }
   subscribeHistoryByChainAndAddress(_ref46, id, port) {
     let {
@@ -1601,39 +1598,6 @@ class KoniExtension {
       items: subscribeHistoriesResponse.value
     };
   }
-
-  // Save address to contact
-  // private addContact (to: string) {
-  //   const toAddress = reformatAddress(to);
-  //   const account = keyring.getAccount(toAddress);
-  //   const contact = keyring.getAddress(toAddress);
-  //
-  //   if (!account && (!contact || contact.meta.isRecent)) {
-  //     keyring.saveAddress(toAddress, {});
-  //   }
-  // }
-
-  validateTransfer(tokenSlug, from, to, value, transferAll) {
-    const errors = [];
-    const keypair = _uiKeyring.keyring.getPair(from);
-    let transferValue;
-    if (!transferAll) {
-      if (value === undefined) {
-        errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Transfer amount is required')));
-      }
-      if (value) {
-        transferValue = new _util.BN(value);
-      }
-    }
-    const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    if (!tokenInfo) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found token from registry')));
-    }
-    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils2._isTokenEvmSmartContract)(tokenInfo) && (0, _utils2._getContractAddressOfToken)(tokenInfo).length === 0) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found ERC20 address for this token')));
-    }
-    return [errors, keypair, transferValue, tokenInfo];
-  }
   async makeTransfer(inputData) {
     const {
       from,
@@ -1643,55 +1607,51 @@ class KoniExtension {
       transferAll,
       value
     } = inputData;
-    const [errors,,, tokenInfo] = this.validateTransfer(tokenSlug, from, to, value, transferAll);
+    const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(tokenSlug);
+    const [errors,,] = (0, _transfer.validateTransferRequest)(transferTokenInfo, from, to, value, transferAll);
     const warnings = [];
     const evmApiMap = this.#koniState.getEvmApiMap();
     const chainInfo = this.#koniState.getChainInfo(networkKey);
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(networkKey);
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
+    const extrinsicType = isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN;
     let chainType = _KoniTypes.ChainType.SUBSTRATE;
-    const tokenBaseAmount = {
-      value: '0',
-      symbol: tokenInfo.symbol,
-      decimals: tokenInfo.decimals || 0
-    };
     const transferAmount = {
-      ...tokenBaseAmount
+      value: '0',
+      symbol: (0, _utils2._getAssetSymbol)(transferTokenInfo),
+      decimals: (0, _utils2._getAssetDecimals)(transferTokenInfo)
     };
     let transaction;
-
-    // Get native token amount
-    const freeBalance = await this.getAddressFreeBalance({
+    const transferTokenAvailable = await this.getAddressTransferableBalance({
       address: from,
       networkKey,
-      token: tokenSlug
+      token: tokenSlug,
+      extrinsicType
     });
     try {
-      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils2._isTokenTransferredByEvm)(tokenInfo)) {
-        // TODO: review this
+      if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils2._isTokenTransferredByEvm)(transferTokenInfo)) {
         chainType = _KoniTypes.ChainType.EVM;
-        const txVal = transferAll ? freeBalance.value : value || '0';
+        const txVal = transferAll ? transferTokenAvailable.value : value || '0';
         const evmApi = evmApiMap[networkKey];
 
         // Estimate with EVM API
-        if ((0, _utils2._isTokenEvmSmartContract)(tokenInfo) || (0, _utils2._isLocalToken)(tokenInfo)) {
-          [transaction, transferAmount.value] = await (0, _transfer3.getERC20TransactionObject)((0, _utils2._getContractAddressOfToken)(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
+        if ((0, _utils2._isTokenEvmSmartContract)(transferTokenInfo) || (0, _utils2._isLocalToken)(transferTokenInfo)) {
+          [transaction, transferAmount.value] = await (0, _transfer4.getERC20TransactionObject)((0, _utils2._getContractAddressOfToken)(transferTokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
         } else {
-          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApi);
+          [transaction, transferAmount.value] = await (0, _transfer4.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApi);
         }
-      } else if ((0, _utils2._isMantaZkAsset)(tokenInfo)) {
-        // TODO
+      } else if ((0, _utils2._isMantaZkAsset)(transferTokenInfo)) {
         transaction = undefined;
         transferAmount.value = '0';
       } else {
         const substrateApi = this.#koniState.getSubstrateApi(networkKey);
-        [transaction, transferAmount.value] = await (0, _transfer.createTransferExtrinsic)({
+        [transaction, transferAmount.value] = await (0, _transfer2.createTransferExtrinsic)({
           transferAll: !!transferAll,
           value: value || '0',
           from: from,
           networkKey,
-          tokenInfo,
+          tokenInfo: transferTokenInfo,
           to: to,
           substrateApi
         });
@@ -1704,46 +1664,33 @@ class KoniExtension {
       throw error;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
-
-    // this.addContact(to);
-
     const additionalValidator = async inputTransaction => {
-      const minAmount = tokenInfo.minAmount || '0';
+      let senderTransferTokenTransferable;
 
       // Check ed for sender
       if (!isTransferNativeToken) {
         const {
-          value: balance
-        } = await this.getAddressFreeBalance({
+          value
+        } = await this.getAddressTransferableBalance({
           address: from,
           networkKey,
-          token: tokenSlug
+          token: tokenSlug,
+          extrinsicType
         });
-        if (new _bignumber.default(balance).minus(transferAmount.value).lt(minAmount)) {
-          inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
-        }
+        senderTransferTokenTransferable = value;
       }
       const {
-        value: receiverBalance
-      } = await this.getAddressFreeBalance({
+        value: receiverTransferTokenTransferable
+      } = await this.getAddressTransferableBalance({
         address: to,
         networkKey,
-        token: tokenSlug
-      });
+        token: tokenSlug,
+        extrinsicType
+      }); // todo: shouldn't be just transferable, locked also counts
 
-      // Check ed for receiver
-      if (new _bignumber.default(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
-        const atLeast = new _bignumber.default(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
-        const atLeastStr = (0, _number.formatNumber)(atLeast, tokenInfo.decimals || 0, _number.balanceFormatter, {
-          maxNumberFormat: tokenInfo.decimals || 6
-        });
-        inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
-          replace: {
-            amount: atLeastStr,
-            symbol: tokenInfo.symbol
-          }
-        })));
-      }
+      const [warning, error] = (0, _transfer.additionalValidateTransfer)(transferTokenInfo, extrinsicType, receiverTransferTokenTransferable, transferAmount.value, senderTransferTokenTransferable);
+      warning && inputTransaction.warnings.push(warning);
+      error && inputTransaction.errors.push(error);
     };
     return this.#koniState.transactionService.handleTransaction({
       errors,
@@ -1754,24 +1701,13 @@ class KoniExtension {
       transferNativeAmount,
       transaction,
       data: inputData,
-      extrinsicType: isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN,
+      extrinsicType,
       ignoreWarnings: transferAll,
       isTransferAll: isTransferNativeToken ? transferAll : false,
       edAsWarning: isTransferNativeToken,
       additionalValidator: additionalValidator
     });
   }
-  validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
-    const errors = [];
-    const keypair = _uiKeyring.keyring.getPair(sender);
-    const transferValue = new _util.BN(sendingValue);
-    const originTokenInfo = this.#koniState.getAssetBySlug(sendingTokenSlug);
-    const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, sendingTokenSlug);
-    if (!destinationTokenInfo) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.INVALID_TOKEN, (0, _i18next.t)('Not found token from registry')));
-    }
-    return [errors, keypair, transferValue, originTokenInfo, destinationTokenInfo];
-  }
   async makeCrossChainTransfer(inputData) {
     const {
       destinationNetworkKey,
@@ -1781,7 +1717,9 @@ class KoniExtension {
       tokenSlug,
       value
     } = inputData;
-    const [errors, fromKeyPair,, originTokenInfo, destinationTokenInfo] = this.validateCrossChainTransfer(destinationNetworkKey, tokenSlug, from, value);
+    const originTokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
+    const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, tokenSlug);
+    const [errors, fromKeyPair] = (0, _transfer.validateXcmTransferRequest)(destinationTokenInfo, from, value);
     let extrinsic = null;
     if (errors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
@@ -1800,37 +1738,16 @@ class KoniExtension {
         substrateApi
       });
       additionalValidator = async inputTransaction => {
-        const destMinAmount = destinationTokenInfo.minAmount || '0';
-        const atLeast = new _bignumber.default(destMinAmount).multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO);
-
-        // Check ed for receiver
-        if (new _bignumber.default(value).lt(atLeast)) {
-          const atLeastStr = (0, _number.formatNumber)(atLeast, destinationTokenInfo.decimals || 0, _number.balanceFormatter, {
-            maxNumberFormat: destinationTokenInfo.decimals || 6
-          });
-          inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
-            replace: {
-              amount: atLeastStr,
-              symbol: originTokenInfo.symbol
-            }
-          })));
-        }
-        const srcMinAmount = originTokenInfo.minAmount || '0';
-        const isTransferNativeToken = originTokenInfo.assetType === _types._AssetType.NATIVE;
-
-        // Check ed for sender
-        if (!isTransferNativeToken) {
-          const {
-            value: balance
-          } = await this.getAddressFreeBalance({
-            address: from,
-            networkKey: originNetworkKey,
-            token: originTokenInfo.slug
-          });
-          if (new _bignumber.default(balance).minus(value).lt(srcMinAmount)) {
-            inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
-          }
-        }
+        const {
+          value: senderTransferable
+        } = await this.getAddressTransferableBalance({
+          address: from,
+          networkKey: originNetworkKey,
+          token: originTokenInfo.slug
+        });
+        const [warning, error] = (0, _transfer.additionalValidateXcmTransfer)(originTokenInfo, destinationTokenInfo, value, senderTransferable);
+        error && inputTransaction.errors.push(error);
+        warning && inputTransaction.warnings.push(warning);
       };
       eventsHandler = eventEmitter => {
         eventEmitter.on('send', () => {
@@ -1849,9 +1766,6 @@ class KoniExtension {
         });
       };
     }
-
-    // this.addContact(to);
-
     return await this.#koniState.transactionService.handleTransaction({
       url: _constants3.EXTENSION_REQUEST_URL,
       address: from,
@@ -1877,7 +1791,7 @@ class KoniExtension {
     } = inputData;
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
-    const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
+    const transaction = await (0, _transfer4.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
 
     // this.addContact(recipientAddress);
 
@@ -1957,9 +1871,10 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressFreeBalance(_ref49) {
+  async getAddressTransferableBalance(_ref49) {
     let {
       address,
+      extrinsicType,
       networkKey,
       token
     } = _ref49;
@@ -1969,9 +1884,9 @@ class KoniExtension {
         return await this.#koniState.getMantaPayZkBalance(address, tokenInfo);
       }
     }
-    return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
+    return await this.#koniState.balanceService.getTransferableBalance(address, networkKey, token, extrinsicType);
   }
-  async transferGetMaxTransferable(_ref50) {
+  async getMaxTransferable(_ref50) {
     let {
       address,
       destChain,
@@ -1979,92 +1894,67 @@ class KoniExtension {
       networkKey,
       token
     } = _ref50;
-    const freeBalance = await this.getAddressFreeBalance({
-      address,
-      networkKey,
-      token
-    });
     const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
     if (!(0, _utils2._isNativeToken)(tokenInfo)) {
-      return freeBalance;
+      return await this.getAddressTransferableBalance({
+        extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_TOKEN,
+        address,
+        networkKey,
+        token
+      });
     } else {
-      const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
-      let estimatedFee;
-      let maxTransferable = new _bignumber.default(freeBalance.value);
-      try {
-        if (isXcmTransfer) {
-          const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
-          const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
-          if (!destinationTokenInfo) {
-            estimatedFee = '0';
-          } else {
-            maxTransferable = maxTransferable.minus(new _bignumber.default(tokenInfo.minAmount || '0').multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO));
-            const desChainInfo = chainInfoMap[destChain];
-            const orgChainInfo = chainInfoMap[networkKey];
-            const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils2._isChainEvmCompatible)(desChainInfo) && !(0, _utils2._isChainEvmCompatible)(orgChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
-            const mockTx = await (0, _xcm.createXcmExtrinsic)({
-              chainInfoMap,
-              destinationTokenInfo,
-              originTokenInfo: tokenInfo,
-              recipient: recipient,
-              sendingValue: '1000000000000000000',
-              substrateApi
-            });
-            try {
-              var _paymentInfo$partialF;
-              const paymentInfo = await mockTx.paymentInfo(address);
-              estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
-            } catch (e) {
-              estimatedFee = tokenInfo.minAmount || '0';
-            }
-          }
-        } else {
-          const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
-          if ((0, _utils2._isChainEvmCompatible)(chainInfo) && (0, _utils2._isTokenTransferredByEvm)(tokenInfo)) {
-            const web3 = this.#koniState.chainService.getEvmApi(networkKey);
-            const transaction = {
-              value: 0,
-              to: '0x0000000000000000000000000000000000000000',
-              // null address
-              from: address
-            };
-            const gasLimit = await web3.api.eth.estimateGas(transaction);
-            const priority = await (0, _utils3.calculateGasFeeParams)(web3, networkKey);
-            if (priority.baseGasFee) {
-              const maxFee = priority.maxFeePerGas;
-              estimatedFee = maxFee.multipliedBy(gasLimit).toFixed(0);
-            } else {
-              estimatedFee = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
-            }
-          } else {
-            var _paymentInfo$partialF2;
-            const [mockTx] = await (0, _transfer.createTransferExtrinsic)({
-              from: address,
-              networkKey,
-              substrateApi,
-              to: address,
-              tokenInfo,
-              transferAll: true,
-              value: '1000000000000000000'
-            });
-            const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
-            estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
-          }
-        }
-      } catch (e) {
-        estimatedFee = '0';
-        console.warn('Unable to estimate fee', e);
+      let maxTransferable;
+      if (isXcmTransfer) {
+        maxTransferable = await this.getXcmMaxTransferable(tokenInfo, destChain, address);
+      } else {
+        // regular transfer with native token
+        maxTransferable = await this.getNativeTokenMaxTransferable(tokenInfo, networkKey, address);
       }
-      maxTransferable = maxTransferable.minus(new _bignumber.default(estimatedFee).multipliedBy(isXcmTransfer ? _constants.XCM_FEE_RATIO : 1));
       return {
-        ...freeBalance,
-        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0'
+        value: maxTransferable.gt(_utils3.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
+        decimals: tokenInfo.decimals,
+        symbol: tokenInfo.symbol
       };
     }
   }
-  async subscribeAddressFreeBalance(_ref51, id, port) {
+  async getXcmMaxTransferable(originTokenInfo, destChain, address) {
+    const substrateApi = this.#koniState.chainService.getSubstrateApi(originTokenInfo.originChain);
+    const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
+    const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
+    if (destinationTokenInfo) {
+      const [bnMockFee, {
+        value
+      }] = await Promise.all([(0, _xcm.getXcmMockTxFee)(substrateApi, chainInfoMap, address, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
+        extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
+        address,
+        networkKey: originTokenInfo.originChain,
+        token: originTokenInfo.slug
+      })]);
+      const bnMaxTransferable = new _bignumber.default(value);
+      const estimatedFee = bnMockFee.multipliedBy(_constants.XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
+
+      return bnMaxTransferable.minus(estimatedFee);
+    }
+    return new _bignumber.default(0);
+  }
+  async getNativeTokenMaxTransferable(tokenInfo, networkKey, address) {
+    const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+    const api = (0, _utils2._isChainEvmCompatible)(chainInfo) && (0, _utils2._isTokenTransferredByEvm)(tokenInfo) ? this.#koniState.chainService.getEvmApi(networkKey) : this.#koniState.chainService.getSubstrateApi(networkKey);
+    const [mockTxFee, {
+      value
+    }] = await Promise.all([(0, _transfer2.getTransferMockTxFee)(address, chainInfo, tokenInfo, api), this.getAddressTransferableBalance({
+      extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_BALANCE,
+      address,
+      networkKey,
+      token: tokenInfo.slug
+    })]);
+    const bnMaxTransferable = new _bignumber.default(value);
+    return bnMaxTransferable.minus(mockTxFee);
+  }
+  async subscribeAddressTransferableBalance(_ref51, id, port) {
     let {
       address,
+      extrinsicType,
       networkKey,
       token
     } = _ref51;
@@ -2079,7 +1969,7 @@ class KoniExtension {
       // eslint-disable-next-line node/no-callback-literal
       cb(convertData(data));
     };
-    const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, _cb);
+    const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTransferableBalance(address, networkKey, token, extrinsicType, _cb);
     this.createUnsubscriptionHandle(id, unsub);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
@@ -2092,7 +1982,7 @@ class KoniExtension {
       networkKey
     } = _ref52;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
-    return await (0, _transfer.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
+    return await (0, _transfer2.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
   async transferCheckSupporting(_ref53) {
     let {
@@ -2100,7 +1990,7 @@ class KoniExtension {
       tokenSlug
     } = _ref53;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    return await (0, _transfer.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
+    return await (0, _transfer2.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
   transferGetExistentialDeposit(_ref54) {
     let {
@@ -2115,13 +2005,13 @@ class KoniExtension {
       recipientAddress,
       senderAddress
     } = inputData;
-    const isSendingSelf = (0, _transfer2.isRecipientSelf)(senderAddress, recipientAddress);
+    const isSendingSelf = (0, _transfer3.isRecipientSelf)(senderAddress, recipientAddress);
 
     // TODO: do better to detect tokenType
     const isPSP34 = params === null || params === void 0 ? void 0 : params.isPsp34;
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
-    const extrinsic = !isPSP34 ? await (0, _transfer2.getNftTransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await (0, _wasm.getPSP34TransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {});
+    const extrinsic = !isPSP34 ? await (0, _transfer3.getNftTransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await (0, _wasm.getPSP34TransferExtrinsic)(networkKey, apiProps, senderAddress, recipientAddress, params || {});
 
     // this.addContact(recipientAddress);
 
@@ -2575,7 +2465,7 @@ class KoniExtension {
       signed = await pair.evmSigner.signMessage(data, 'personal_sign');
     } else {
       var _signedTranaction$r, _signedTranaction$s, _signedTranaction$v;
-      const tx = (0, _utils4.createTransactionFromRLP)(message);
+      const tx = (0, _utils3.createTransactionFromRLP)(message);
       if (!tx) {
         throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
@@ -2600,7 +2490,7 @@ class KoniExtension {
         common
       });
       const signedTranaction = _tx.LegacyTransaction.fromSerializedTx((0, _util.hexToU8a)(pair.evmSigner.signTransaction(transaction)));
-      signed = (0, _utils4.signatureToHex)({
+      signed = (0, _utils3.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)) || ''
@@ -2728,7 +2618,7 @@ class KoniExtension {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS)]);
     }
     const chain = poolHandler.chain;
-    const stakingType = poolHandler.type === _types3.YieldPoolType.NOMINATION_POOL ? _KoniTypes.StakingType.POOLED : _KoniTypes.StakingType.NOMINATED;
+    const stakingType = poolHandler.type === _types2.YieldPoolType.NOMINATION_POOL ? _KoniTypes.StakingType.POOLED : _KoniTypes.StakingType.NOMINATED;
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _bonding.getClaimRewardExtrinsic)(substrateApi, chain, address, stakingType, bondReward);
     return await this.#koniState.transactionService.handleTransaction({
@@ -3076,7 +2966,7 @@ class KoniExtension {
     const {
       payload
     } = request;
-    let registry = new _types4.TypeRegistry();
+    let registry = new _types3.TypeRegistry();
     let isEvm = false;
     if (isJsonPayload(payload)) {
       /**
@@ -3521,12 +3411,12 @@ class KoniExtension {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
           if (unSupportChains.length) {
-            throw new Error((0, _utils5.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+            throw new Error((0, _utils4.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
           }
           availableNamespaces[key] = namespace;
         }
       } else {
-        throw new Error((0, _utils5.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+        throw new Error((0, _utils4.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
     Object.entries(optionalNamespaces).forEach(_ref86 => {
@@ -3558,7 +3448,7 @@ class KoniExtension {
       let [key, namespace] = _ref87;
       if (namespace.chains) {
         const accounts = [];
-        const chains = (0, _utils4.uniqueStringArray)(namespace.chains);
+        const chains = (0, _utils3.uniqueStringArray)(namespace.chains);
         chains.forEach(chain => {
           accounts.push(...selectedAccounts.filter(address => (0, _utilCrypto.isEthereumAddress)(address) === (key === _constants5.WALLET_CONNECT_EIP155_NAMESPACE)).map(address => `${chain}:${address}`));
         });
@@ -3659,7 +3549,7 @@ class KoniExtension {
       const {
         connectionStatus
       } = this.#koniState.chainService.getChainStatusByKey(_constants2._DEFAULT_MANTA_ZK_CHAIN);
-      if (connectionStatus !== _types2._ChainConnectionStatus.CONNECTED) {
+      if (connectionStatus !== _types._ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
       }
@@ -3700,7 +3590,7 @@ 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 || !_utils4.MODULE_SUPPORT.MANTA_ZK) {
+    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 || !_utils3.MODULE_SUPPORT.MANTA_ZK) {
       return;
     }
     this.#skipAutoLock = true;
@@ -4523,13 +4413,13 @@ class KoniExtension {
       case 'pri(transfer.getExistentialDeposit)':
         return this.transferGetExistentialDeposit(request);
       case 'pri(transfer.getMaxTransferable)':
-        return this.transferGetMaxTransferable(request);
+        return this.getMaxTransferable(request);
       case 'pri(transfer.subscribeMaxTransferable)':
-        return this.transferGetMaxTransferable(request);
+        return this.getMaxTransferable(request);
       case 'pri(freeBalance.get)':
-        return this.getAddressFreeBalance(request);
+        return this.getAddressTransferableBalance(request);
       case 'pri(freeBalance.subscribe)':
-        return this.subscribeAddressFreeBalance(request, id, port);
+        return this.subscribeAddressTransferableBalance(request, id, port);
       case 'pri(subscription.cancel)':
         return this.cancelSubscription(request);
       case 'pri(chainService.recoverSubstrateApi)':