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

package/koni/background/handlers/Extension.js

@@ -3,29 +3,27 @@
 
 import { Common } from '@ethereumjs/common';
 import { LegacyTransaction } from '@ethereumjs/tx';
-import { _AssetType } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingTxErrorType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, LATEST_SESSION, XCM_FEE_RATIO, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
+import { AccountExternalErrorCode, BasicTxErrorType, CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingTxErrorType, StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, LATEST_SESSION, XCM_FEE_RATIO } from '@subwallet/extension-base/constants';
+import { additionalValidateTransfer, additionalValidateXcmTransfer, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { resolveAzeroAddressToDomain, resolveAzeroDomainToAddress } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
-import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
+import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic, getTransferMockTxFee } from '@subwallet/extension-base/koni/api/dotsama/transfer';
 import { getNftTransferExtrinsic, isRecipientSelf } from '@subwallet/extension-base/koni/api/nft/transfer';
 import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrinsic, getNominationPoolsInfo, getUnbondingExtrinsic, getValidatorsInfo, validateBondingCondition, validateUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getTuringCancelCompoundingExtrinsic, getTuringCompoundExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
 import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic, validatePoolBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject } from '@subwallet/extension-base/koni/api/tokens/evm/transfer';
 import { getPSP34TransferExtrinsic } from '@subwallet/extension-base/koni/api/tokens/wasm';
-import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
+import { createXcmExtrinsic, getXcmMockTxFee } from '@subwallet/extension-base/koni/api/xcm';
 import { YIELD_EXTRINSIC_TYPES } from '@subwallet/extension-base/koni/api/yield/helper/utils';
 import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
 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 { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
@@ -35,15 +33,14 @@ import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
-import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { TypeRegistry } from '@polkadot/types';
-import { assert, BN, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
-import { addressToEvm, base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
+import { assert, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
+import { base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 function getSuri(seed, type) {
   return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
@@ -1542,39 +1539,6 @@ export default 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 = keyring.getPair(from);
-    let transferValue;
-    if (!transferAll) {
-      if (value === undefined) {
-        errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Transfer amount is required')));
-      }
-      if (value) {
-        transferValue = new BN(value);
-      }
-    }
-    const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    if (!tokenInfo) {
-      errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Not found token from registry')));
-    }
-    if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenEvmSmartContract(tokenInfo) && _getContractAddressOfToken(tokenInfo).length === 0) {
-      errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Not found ERC20 address for this token')));
-    }
-    return [errors, keypair, transferValue, tokenInfo];
-  }
   async makeTransfer(inputData) {
     const {
       from,
@@ -1584,45 +1548,41 @@ export default class KoniExtension {
       transferAll,
       value
     } = inputData;
-    const [errors,,, tokenInfo] = this.validateTransfer(tokenSlug, from, to, value, transferAll);
+    const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(tokenSlug);
+    const [errors,,] = 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 ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN;
     let chainType = ChainType.SUBSTRATE;
-    const tokenBaseAmount = {
-      value: '0',
-      symbol: tokenInfo.symbol,
-      decimals: tokenInfo.decimals || 0
-    };
     const transferAmount = {
-      ...tokenBaseAmount
+      value: '0',
+      symbol: _getAssetSymbol(transferTokenInfo),
+      decimals: _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 (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(tokenInfo)) {
-        // TODO: review this
+      if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(transferTokenInfo)) {
         chainType = 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 (_isTokenEvmSmartContract(tokenInfo) || _isLocalToken(tokenInfo)) {
-          [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
+        if (_isTokenEvmSmartContract(transferTokenInfo) || _isLocalToken(transferTokenInfo)) {
+          [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(transferTokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
         } else {
           [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, from, to, txVal, !!transferAll, evmApi);
         }
-      } else if (_isMantaZkAsset(tokenInfo)) {
-        // TODO
+      } else if (_isMantaZkAsset(transferTokenInfo)) {
         transaction = undefined;
         transferAmount.value = '0';
       } else {
@@ -1632,7 +1592,7 @@ export default class KoniExtension {
           value: value || '0',
           from: from,
           networkKey,
-          tokenInfo,
+          tokenInfo: transferTokenInfo,
           to: to,
           substrateApi
         });
@@ -1645,46 +1605,33 @@ export default 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 BigN(balance).minus(transferAmount.value).lt(minAmount)) {
-          inputTransaction.warnings.push(new TransactionWarning(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 BigN(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
-        const atLeast = new BigN(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
-        const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter, {
-          maxNumberFormat: tokenInfo.decimals || 6
-        });
-        inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
-          replace: {
-            amount: atLeastStr,
-            symbol: tokenInfo.symbol
-          }
-        })));
-      }
+      const [warning, error] = additionalValidateTransfer(transferTokenInfo, extrinsicType, receiverTransferTokenTransferable, transferAmount.value, senderTransferTokenTransferable);
+      warning && inputTransaction.warnings.push(warning);
+      error && inputTransaction.errors.push(error);
     };
     return this.#koniState.transactionService.handleTransaction({
       errors,
@@ -1695,24 +1642,13 @@ export default class KoniExtension {
       transferNativeAmount,
       transaction,
       data: inputData,
-      extrinsicType: isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN,
+      extrinsicType,
       ignoreWarnings: transferAll,
       isTransferAll: isTransferNativeToken ? transferAll : false,
       edAsWarning: isTransferNativeToken,
       additionalValidator: additionalValidator
     });
   }
-  validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
-    const errors = [];
-    const keypair = keyring.getPair(sender);
-    const transferValue = new BN(sendingValue);
-    const originTokenInfo = this.#koniState.getAssetBySlug(sendingTokenSlug);
-    const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, sendingTokenSlug);
-    if (!destinationTokenInfo) {
-      errors.push(new TransactionError(TransferTxErrorType.INVALID_TOKEN, t('Not found token from registry')));
-    }
-    return [errors, keypair, transferValue, originTokenInfo, destinationTokenInfo];
-  }
   async makeCrossChainTransfer(inputData) {
     const {
       destinationNetworkKey,
@@ -1722,7 +1658,9 @@ export default 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] = validateXcmTransferRequest(destinationTokenInfo, from, value);
     let extrinsic = null;
     if (errors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
@@ -1741,37 +1679,16 @@ export default class KoniExtension {
         substrateApi
       });
       additionalValidator = async inputTransaction => {
-        const destMinAmount = destinationTokenInfo.minAmount || '0';
-        const atLeast = new BigN(destMinAmount).multipliedBy(XCM_MIN_AMOUNT_RATIO);
-
-        // Check ed for receiver
-        if (new BigN(value).lt(atLeast)) {
-          const atLeastStr = formatNumber(atLeast, destinationTokenInfo.decimals || 0, balanceFormatter, {
-            maxNumberFormat: destinationTokenInfo.decimals || 6
-          });
-          inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, 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 === _AssetType.NATIVE;
-
-        // Check ed for sender
-        if (!isTransferNativeToken) {
-          const {
-            value: balance
-          } = await this.getAddressFreeBalance({
-            address: from,
-            networkKey: originNetworkKey,
-            token: originTokenInfo.slug
-          });
-          if (new BigN(balance).minus(value).lt(srcMinAmount)) {
-            inputTransaction.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
-          }
-        }
+        const {
+          value: senderTransferable
+        } = await this.getAddressTransferableBalance({
+          address: from,
+          networkKey: originNetworkKey,
+          token: originTokenInfo.slug
+        });
+        const [warning, error] = additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, value, senderTransferable);
+        error && inputTransaction.errors.push(error);
+        warning && inputTransaction.warnings.push(warning);
       };
       eventsHandler = eventEmitter => {
         eventEmitter.on('send', () => {
@@ -1790,9 +1707,6 @@ export default class KoniExtension {
         });
       };
     }
-
-    // this.addContact(to);
-
     return await this.#koniState.transactionService.handleTransaction({
       url: EXTENSION_REQUEST_URL,
       address: from,
@@ -1896,8 +1810,9 @@ export default class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressFreeBalance({
+  async getAddressTransferableBalance({
     address,
+    extrinsicType,
     networkKey,
     token
   }) {
@@ -1907,100 +1822,75 @@ export default 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({
+  async getMaxTransferable({
     address,
     destChain,
     isXcmTransfer,
     networkKey,
     token
   }) {
-    const freeBalance = await this.getAddressFreeBalance({
-      address,
-      networkKey,
-      token
-    });
     const tokenInfo = token ? this.#koniState.chainService.getAssetBySlug(token) : this.#koniState.chainService.getNativeTokenInfo(networkKey);
     if (!_isNativeToken(tokenInfo)) {
-      return freeBalance;
+      return await this.getAddressTransferableBalance({
+        extrinsicType: ExtrinsicType.TRANSFER_TOKEN,
+        address,
+        networkKey,
+        token
+      });
     } else {
-      const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
-      let estimatedFee;
-      let maxTransferable = new BigN(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 BigN(tokenInfo.minAmount || '0').multipliedBy(XCM_MIN_AMOUNT_RATIO));
-            const desChainInfo = chainInfoMap[destChain];
-            const orgChainInfo = chainInfoMap[networkKey];
-            const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(desChainInfo) && !_isChainEvmCompatible(orgChainInfo) ? u8aToHex(addressToEvm(address)) : address;
-            const mockTx = await 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 (_isChainEvmCompatible(chainInfo) && _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 calculateGasFeeParams(web3, networkKey);
-            if (priority.baseGasFee) {
-              const maxFee = priority.maxFeePerGas;
-              estimatedFee = maxFee.multipliedBy(gasLimit).toFixed(0);
-            } else {
-              estimatedFee = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
-            }
-          } else {
-            var _paymentInfo$partialF2;
-            const [mockTx] = await 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 BigN(estimatedFee).multipliedBy(isXcmTransfer ? XCM_FEE_RATIO : 1));
       return {
-        ...freeBalance,
-        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0'
+        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0',
+        decimals: tokenInfo.decimals,
+        symbol: tokenInfo.symbol
       };
     }
   }
-  async subscribeAddressFreeBalance({
+  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([getXcmMockTxFee(substrateApi, chainInfoMap, address, originTokenInfo, destinationTokenInfo), this.getAddressTransferableBalance({
+        extrinsicType: ExtrinsicType.TRANSFER_XCM,
+        address,
+        networkKey: originTokenInfo.originChain,
+        token: originTokenInfo.slug
+      })]);
+      const bnMaxTransferable = new BigN(value);
+      const estimatedFee = bnMockFee.multipliedBy(XCM_FEE_RATIO); // multiply by weight to account for destination chain fee
+
+      return bnMaxTransferable.minus(estimatedFee);
+    }
+    return new BigN(0);
+  }
+  async getNativeTokenMaxTransferable(tokenInfo, networkKey, address) {
+    const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+    const api = _isChainEvmCompatible(chainInfo) && _isTokenTransferredByEvm(tokenInfo) ? this.#koniState.chainService.getEvmApi(networkKey) : this.#koniState.chainService.getSubstrateApi(networkKey);
+    const [mockTxFee, {
+      value
+    }] = await Promise.all([getTransferMockTxFee(address, chainInfo, tokenInfo, api), this.getAddressTransferableBalance({
+      extrinsicType: ExtrinsicType.TRANSFER_BALANCE,
+      address,
+      networkKey,
+      token: tokenInfo.slug
+    })]);
+    const bnMaxTransferable = new BigN(value);
+    return bnMaxTransferable.minus(mockTxFee);
+  }
+  async subscribeAddressTransferableBalance({
     address,
+    extrinsicType,
     networkKey,
     token
   }, id, port) {
@@ -2015,7 +1905,7 @@ export default 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);
@@ -4414,13 +4304,13 @@ export default 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)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.2.3-0",
+  "version": "1.2.3-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -129,6 +129,31 @@
       "require": "./cjs/constants/storage.js",
       "default": "./constants/storage.js"
     },
+    "./core/logic-validation/earning": {
+      "types": "./core/logic-validation/earning.d.ts",
+      "require": "./cjs/core/logic-validation/earning.js",
+      "default": "./core/logic-validation/earning.js"
+    },
+    "./core/logic-validation/swap": {
+      "types": "./core/logic-validation/swap.d.ts",
+      "require": "./cjs/core/logic-validation/swap.js",
+      "default": "./core/logic-validation/swap.js"
+    },
+    "./core/logic-validation/transfer": {
+      "types": "./core/logic-validation/transfer.d.ts",
+      "require": "./cjs/core/logic-validation/transfer.js",
+      "default": "./core/logic-validation/transfer.js"
+    },
+    "./core/substrate/nominationpools-pallet": {
+      "types": "./core/substrate/nominationpools-pallet.d.ts",
+      "require": "./cjs/core/substrate/nominationpools-pallet.js",
+      "default": "./core/substrate/nominationpools-pallet.js"
+    },
+    "./core/substrate/system-pallet": {
+      "types": "./core/substrate/system-pallet.d.ts",
+      "require": "./cjs/core/substrate/system-pallet.js",
+      "default": "./core/substrate/system-pallet.js"
+    },
     "./defaults": {
       "types": "./defaults.d.ts",
       "require": "./cjs/defaults.js",
@@ -1891,17 +1916,17 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.65",
-    "@subwallet/extension-base": "^1.2.3-0",
-    "@subwallet/extension-chains": "^1.2.3-0",
-    "@subwallet/extension-dapp": "^1.2.3-0",
-    "@subwallet/extension-inject": "^1.2.3-0",
+    "@subwallet/chain-list": "0.2.66",
+    "@subwallet/extension-base": "^1.2.3-1",
+    "@subwallet/extension-chains": "^1.2.3-1",
+    "@subwallet/extension-dapp": "^1.2.3-1",
+    "@subwallet/extension-inject": "^1.2.3-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "^2.11.3",
-    "@walletconnect/types": "^2.11.3",
-    "@walletconnect/utils": "^2.11.3",
+    "@walletconnect/sign-client": "^2.13.1",
+    "@walletconnect/types": "^2.13.1",
+    "@walletconnect/utils": "^2.13.1",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",

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.2.3-0'
+  version: '1.2.3-1'
 };

package/services/balance-service/helpers/group.js

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
-import { sumBN } from '@subwallet/extension-base/utils';
-import BN from 'bn.js';
+import BigN from 'bignumber.js';
 
 /**
  * Group the balance of {token} from {items} into {address}
@@ -14,33 +13,11 @@ import BN from 'bn.js';
  */
 export const groupBalance = (items, address, token) => {
   const states = items.map(item => item.state);
-  const result = {
+  return {
     address,
     tokenSlug: token,
-    free: sumBN(items.map(item => new BN(item.free))).toString(),
-    locked: sumBN(items.map(item => new BN(item.locked))).toString(),
+    free: BigN.sum.apply(null, items.map(item => item.free)).toFixed(),
+    locked: BigN.sum.apply(null, items.map(item => item.locked)).toFixed(),
     state: states.every(item => item === APIItemState.NOT_SUPPORT) ? APIItemState.NOT_SUPPORT : states.some(item => item === APIItemState.READY) ? APIItemState.READY : APIItemState.PENDING
   };
-  for (const item of items) {
-    if (item.substrateInfo) {
-      if (!result.substrateInfo) {
-        result.substrateInfo = {
-          ...item.substrateInfo
-        };
-      } else {
-        const old = {
-          ...result.substrateInfo
-        };
-        const _new = {
-          ...item.substrateInfo
-        };
-        result.substrateInfo = {
-          reserved: new BN(old.reserved || '0').add(new BN(_new.reserved || '0')).toString(),
-          feeFrozen: new BN(old.feeFrozen || '0').add(new BN(_new.feeFrozen || '0')).toString(),
-          miscFrozen: new BN(old.miscFrozen || '0').add(new BN(_new.miscFrozen || '0')).toString()
-        };
-      }
-    }
-  }
-  return result;
 };

package/services/balance-service/helpers/subscribe/index.d.ts

@@ -1,4 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountJson } from '@subwallet/extension-base/background/types';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { BalanceItem } from '@subwallet/extension-base/types';
@@ -12,4 +13,4 @@ import { BalanceItem } from '@subwallet/extension-base/types';
  * @returns {AccountJson|null}  - Account info or null if not found
  */
 export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;
-export declare function subscribeBalance(addresses: string[], chains: string[], tokens: string[], _chainAssetMap: Record<string, _ChainAsset>, _chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem[]) => void): () => void;
+export declare function subscribeBalance(addresses: string[], chains: string[], tokens: string[], _chainAssetMap: Record<string, _ChainAsset>, _chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem[]) => void, extrinsicType?: ExtrinsicType): () => void;